From 61296a5465eea9c04414b8badda89de3cb949e00 Mon Sep 17 00:00:00 2001 From: Dario Tranchitella Date: Wed, 7 Aug 2024 19:06:50 +0200 Subject: [PATCH 1/2] fix(helm): restoring default value for etcd auto compaction retention Signed-off-by: Dario Tranchitella --- charts/kamaji/README.md | 1 - charts/kamaji/templates/etcd_sts.yaml | 2 +- charts/kamaji/values.yaml | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/charts/kamaji/README.md b/charts/kamaji/README.md index 89a7d078..3d71b563 100644 --- a/charts/kamaji/README.md +++ b/charts/kamaji/README.md @@ -91,7 +91,6 @@ Here the values you can override: | datastore.tlsConfig.clientCertificate.privateKey.name | string | `nil` | Name of the Secret containing the client certificate private key required to establish the mandatory SSL/TLS connection to the datastore. | | datastore.tlsConfig.clientCertificate.privateKey.namespace | string | `nil` | Namespace of the Secret containing the client certificate private key required to establish the mandatory SSL/TLS connection to the datastore. | | datastore.tlsConfig.enabled | bool | `true` | | -| etcd.compactionInterval | int | `0` | ETCD Compaction interval (e.g. "5m0s"). (default: "0" (disabled)) | | etcd.deploy | bool | `true` | Install an etcd with enabled multi-tenancy along with Kamaji | | etcd.image | object | `{"pullPolicy":"IfNotPresent","repository":"quay.io/coreos/etcd","tag":"v3.5.6"}` | Install specific etcd image | | etcd.livenessProbe | object | `{"failureThreshold":8,"httpGet":{"path":"/health?serializable=true","port":2381,"scheme":"HTTP"},"initialDelaySeconds":10,"periodSeconds":10,"timeoutSeconds":15}` | The livenessProbe for the etcd container | diff --git a/charts/kamaji/templates/etcd_sts.yaml b/charts/kamaji/templates/etcd_sts.yaml index 293a411d..516873bf 100644 --- a/charts/kamaji/templates/etcd_sts.yaml +++ b/charts/kamaji/templates/etcd_sts.yaml @@ -61,7 +61,7 @@ spec: - --peer-cert-file=/etc/etcd/pki/peer.pem - --peer-key-file=/etc/etcd/pki/peer-key.pem - --auto-compaction-mode=periodic - - --auto-compaction-retention= {{ .Values.etcd.compactionInterval }} + - --auto-compaction-retention=5m - --snapshot-count=10000 - --quota-backend-bytes=8589934592 - --v=8 diff --git a/charts/kamaji/values.yaml b/charts/kamaji/values.yaml index 03d4f635..7bb0d907 100644 --- a/charts/kamaji/values.yaml +++ b/charts/kamaji/values.yaml @@ -80,8 +80,6 @@ etcd: etcd-0: etcd-0.etcd.kamaji-system.svc.cluster.local etcd-1: etcd-1.etcd.kamaji-system.svc.cluster.local etcd-2: etcd-2.etcd.kamaji-system.svc.cluster.local - # -- ETCD Compaction interval (e.g. "5m0s"). (default: "0" (disabled)) - compactionInterval: 0 # -- The address the probe endpoint binds to. (default ":8081") healthProbeBindAddress: ":8081" From f171c003d936a5a112d620db76c07f00c94f032a Mon Sep 17 00:00:00 2001 From: Dario Tranchitella Date: Wed, 7 Aug 2024 19:51:56 +0200 Subject: [PATCH 2/2] fix(gh): running e2e upon helm chart changes Signed-off-by: Dario Tranchitella --- .github/workflows/e2e.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index f0b2c547..e0d0661d 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -6,6 +6,7 @@ on: paths: - '.github/workflows/e2e.yml' - 'api/**' + - 'charts/kamaji/**' - 'controllers/**' - 'e2e/*' - 'Dockerfile' @@ -19,6 +20,7 @@ on: paths: - '.github/workflows/e2e.yml' - 'api/**' + - 'charts/kamaji/**' - 'controllers/**' - 'e2e/*' - 'Dockerfile'