From 00964e867f8cf272057183dd8b3774df18315759 Mon Sep 17 00:00:00 2001 From: bsctl Date: Tue, 9 Aug 2022 16:38:24 +0200 Subject: [PATCH 1/5] feat(helm): improve liveness probe for etcd --- .../kamaji/templates/etcd_job_postdelete.yaml | 2 +- .../templates/etcd_job_postinstall.yaml | 4 +-- helm/kamaji/templates/etcd_sts.yaml | 34 +++++++------------ helm/kamaji/values.yaml | 23 +++++++++++-- 4 files changed, 36 insertions(+), 27 deletions(-) diff --git a/helm/kamaji/templates/etcd_job_postdelete.yaml b/helm/kamaji/templates/etcd_job_postdelete.yaml index ee18b4f6..7f95972b 100644 --- a/helm/kamaji/templates/etcd_job_postdelete.yaml +++ b/helm/kamaji/templates/etcd_job_postdelete.yaml @@ -7,7 +7,7 @@ metadata: annotations: "helm.sh/hook": pre-delete "helm.sh/hook-weight": "-5" - "helm.sh/hook-delete-policy": hook-succeeded + "helm.sh/hook-delete-policy": "hook-succeeded,hook-failed" name: "{{ .Release.Name }}-etcd-teardown" namespace: {{ .Release.Namespace }} spec: diff --git a/helm/kamaji/templates/etcd_job_postinstall.yaml b/helm/kamaji/templates/etcd_job_postinstall.yaml index e2c3b306..c6964581 100644 --- a/helm/kamaji/templates/etcd_job_postinstall.yaml +++ b/helm/kamaji/templates/etcd_job_postinstall.yaml @@ -7,7 +7,7 @@ metadata: annotations: "helm.sh/hook": post-install "helm.sh/hook-weight": "-5" - "helm.sh/hook-delete-policy": hook-succeeded + "helm.sh/hook-delete-policy": "hook-succeeded,hook-failed" name: "{{ .Release.Name }}-etcd-setup" namespace: {{ .Release.Namespace }} spec: @@ -43,7 +43,7 @@ spec: kubectl --namespace={{ .Release.Namespace }} delete secret --ignore-not-found=true {{ include "etcd.caSecretName" . }} {{ include "etcd.clientSecretName" . }} && kubectl --namespace={{ .Release.Namespace }} create secret generic {{ include "etcd.caSecretName" . }} --from-file=/certs/ca.crt --from-file=/certs/ca.key --from-file=/certs/peer-key.pem --from-file=/certs/peer.pem --from-file=/certs/server-key.pem --from-file=/certs/server.pem && kubectl --namespace={{ .Release.Namespace }} create secret tls {{ include "etcd.clientSecretName" . }} --key=/certs/root-client-key.pem --cert=/certs/root-client.pem && - kubectl --namespace={{ .Release.Namespace }} rollout status sts/etcd --timeout=120s + kubectl --namespace={{ .Release.Namespace }} rollout status sts/etcd --timeout=300s volumeMounts: - mountPath: /certs name: certs diff --git a/helm/kamaji/templates/etcd_sts.yaml b/helm/kamaji/templates/etcd_sts.yaml index 49e1195c..01babf05 100644 --- a/helm/kamaji/templates/etcd_sts.yaml +++ b/helm/kamaji/templates/etcd_sts.yaml @@ -24,7 +24,8 @@ spec: secretName: {{ include "etcd.caSecretName" . }} containers: - name: etcd - image: quay.io/coreos/etcd:v3.5.1 + image: {{ .Values.etcd.image.repository }}:{{ .Values.etcd.image.tag | default "v3.5.4" }} + imagePullPolicy: {{ .Values.etcd.image.pullPolicy }} ports: - containerPort: 2379 name: client @@ -42,15 +43,16 @@ spec: - --initial-cluster-state=new - --initial-cluster=etcd-0=https://etcd-0.etcd.$(POD_NAMESPACE).svc.cluster.local:2380,etcd-1=https://etcd-1.etcd.$(POD_NAMESPACE).svc.cluster.local:2380,etcd-2=https://etcd-2.etcd.$(POD_NAMESPACE).svc.cluster.local:2380 - --initial-advertise-peer-urls=https://$(POD_NAME).etcd.$(POD_NAMESPACE).svc.cluster.local:2380 + - --advertise-client-urls=https://$(POD_NAME).etcd.$(POD_NAMESPACE).svc.cluster.local:2379 - --initial-cluster-token=kamaji - --listen-client-urls=https://0.0.0.0:2379 - - --advertise-client-urls={{ include "etcd.endpoints" . }} + - --listen-metrics-urls=http://0.0.0.0:2381 + - --listen-peer-urls=https://0.0.0.0:2380 - --client-cert-auth=true + - --peer-client-cert-auth=true - --trusted-ca-file=/etc/etcd/pki/ca.crt - --cert-file=/etc/etcd/pki/server.pem - --key-file=/etc/etcd/pki/server-key.pem - - --listen-peer-urls=https://0.0.0.0:2380 - - --peer-client-cert-auth=true - --peer-trusted-ca-file=/etc/etcd/pki/ca.crt - --peer-cert-file=/etc/etcd/pki/peer.pem - --peer-key-file=/etc/etcd/pki/peer-key.pem @@ -66,26 +68,14 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + {{- with .Values.etcd.livenessProbe }} livenessProbe: - failureThreshold: 8 - httpGet: - host: 127.0.0.1 - path: /health - port: 2381 - scheme: HTTP - initialDelaySeconds: 10 - periodSeconds: 10 - timeoutSeconds: 15 + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.etcd.startupProbe }} startupProbe: - failureThreshold: 24 - httpGet: - host: 127.0.0.1 - path: /health - port: 2381 - scheme: HTTP - initialDelaySeconds: 10 - periodSeconds: 10 - timeoutSeconds: 15 + {{- toYaml . | nindent 12 }} + {{- end }} volumeClaimTemplates: - metadata: name: data diff --git a/helm/kamaji/values.yaml b/helm/kamaji/values.yaml index 9de4ad40..6f3def1b 100644 --- a/helm/kamaji/values.yaml +++ b/helm/kamaji/values.yaml @@ -19,8 +19,26 @@ extraArgs: [] configPath: "./kamaji.yaml" etcd: - # -- Install an etcd 3.5 with enabled multi-tenancy along with Kamaji + # -- Install an etcd with enabled multi-tenancy along with Kamaji deploy: true + + # -- Install specific etcd image + image: + repository: quay.io/coreos/etcd + tag: "v3.5.4" + pullPolicy: IfNotPresent + + # -- The livenessProbe for the etcd container + livenessProbe: + failureThreshold: 8 + httpGet: + path: /health?serializable=true + port: 2381 + scheme: HTTP + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 15 + serviceAccount: # -- Create a ServiceAccount, required to install and provision the etcd backing storage (default: true) create: true @@ -38,9 +56,10 @@ etcd: # -- Name of the namespace where the secret which contains ETCD client certificates is. (default: "kamaji-system") namespace: kamaji-system # -- (string) Comma-separated list of the endpoints of the etcd cluster's members. - endpoints: "https://etcd-0.etcd.kamaji-system.svc.cluster.local:2379,https://etcd-1.etcd.kamaji-system.svc.cluster.local:2379,https://etcd-2.etcd.kamaji-system.svc.cluster.local:2379" + # endpoints: "https://etcd-0.etcd.kamaji-system.svc.cluster.local:2379,https://etcd-1.etcd.kamaji-system.svc.cluster.local:2379,https://etcd-2.etcd.kamaji-system.svc.cluster.local:2379" # -- ETCD Compaction interval (e.g. "5m0s"). (default: "0" (disabled)) compactionInterval: 0 + # -- Number of committed transactions to trigger a snapshot to disk. # -- The address the probe endpoint binds to. (default ":8081") healthProbeBindAddress: ":8081" From 72941c4bc10be62d6318986f2f82994e1316d9c5 Mon Sep 17 00:00:00 2001 From: bsctl Date: Tue, 9 Aug 2022 17:55:22 +0200 Subject: [PATCH 2/5] fix(helm): improve chart documentation --- helm/README.md | 15 -------- helm/kamaji/Chart.yaml | 8 +++-- helm/kamaji/README.md | 70 ++++++++++++++++++++++++------------ helm/kamaji/README.md.gotmpl | 51 ++++++++++++++++++-------- 4 files changed, 89 insertions(+), 55 deletions(-) delete mode 100644 helm/README.md diff --git a/helm/README.md b/helm/README.md deleted file mode 100644 index 98d423b6..00000000 --- a/helm/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# Deploy with Helm - -## Pre-requisites - -1. Deploy a [multi-tenant Etcd cluster](https://github.com/clastix/kamaji-internal/blob/master/deploy/getting-started-with-kamaji.md#setup-internal-multi-tenant-etcd) - -``` -make -C ../deploy/etcd -``` - -## Install - -``` -helm upgrade --install --namespace kamaji-system --create-namespace kamaji ./kamaji -``` diff --git a/helm/kamaji/Chart.yaml b/helm/kamaji/Chart.yaml index 7316f3e4..199f807a 100644 --- a/helm/kamaji/Chart.yaml +++ b/helm/kamaji/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: kamaji -description: A Kubernetes distribution aimed to build and operate a Managed Kubernetes service with a fraction of operational burde. +description: Kamaji is a tool aimed to build and operate a Managed Kubernetes Service with a fraction of the operational burden. With Kamaji, you can deploy and operate hundreds of Kubernetes clusters as a hyper-scaler. # A chart can be either an 'application' or a 'library' chart. # @@ -23,8 +23,8 @@ version: 0.1.1 # It is recommended to use it with quotes. appVersion: 0.1.0 -home: https://github.com/clastix/kamaji-internal/tree/master/helm/kamaji -sources: ["https://github.com/clastix/kamaji-internal"] +home: https://github.com/clastix/kamaji +sources: ["https://github.com/clastix/kamaji"] kubeVersion: ">=1.18" maintainers: - email: iam@mendrugory.com @@ -33,3 +33,5 @@ maintainers: name: Dario Tranchitella - email: me@maxgio.it name: Massimiliano Giovagnoli +- email: me@bsctl.io + name: Adriano Pezzuto diff --git a/helm/kamaji/README.md b/helm/kamaji/README.md index 6da384ee..21bdcdf5 100644 --- a/helm/kamaji/README.md +++ b/helm/kamaji/README.md @@ -2,26 +2,7 @@ ![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square) -A Kubernetes distribution aimed to build and operate a Managed Kubernetes service with a fraction of operational burde. - -**Homepage:** - -### Pre-requisites - -Kamaji requires a [multi-tenant etcd cluster](https://github.com/clastix/kamaji-internal/blob/master/deploy/getting-started-with-kamaji.md#setup-internal-multi-tenant-etcd) cluster. -The installation and provisioning processes are already put in place by the Helm Chart starting from v0.1.1 in order to streamline the local test. - -> For production use an externally managed etcd is highly recommended, the etcd addon offered by this chart is not considered production-grade. - -If you'd like to use an externally managed etcd instance, you can specify the overrides and by setting the value `etcd.deploy=false`. - -### Install Kamaji - -To install the chart with the release name `kamaji`: - -```console -helm upgrade --install --namespace kamaji-system --create-namespace kamaji . -``` +Kamaji is a tool aimed to build and operate a Managed Kubernetes Service with a fraction of the operational burden. With Kamaji, you can deploy and operate hundreds of Kubernetes clusters as a hyper-scaler. ## Maintainers @@ -30,15 +11,57 @@ helm upgrade --install --namespace kamaji-system --create-namespace kamaji . | Gonzalo Gabriel Jiménez Fuentes | | | | Dario Tranchitella | | | | Massimiliano Giovagnoli | | | +| Adriano Pezzuto | | | ## Source Code -* +* ## Requirements Kubernetes: `>=1.18` +[Kamaji](https://github.com/clastix/kamaji) requires a [multi-tenant `etcd`](https://github.com/clastix/kamaji-internal/blob/master/deploy/getting-started-with-kamaji.md#setup-internal-multi-tenant-etcd) cluster. +This Helm Chart starting from v0.1.1 provides the installation of an internal `etcd` in order to streamline the local test. If you'd like to use an externally managed etcd instance, you can specify the overrides and by setting the value `etcd.deploy=false`. + +> For production use an externally managed `etcd` is highly recommended, the `etcd` addon offered by this Chart is not considered production-grade. + +## Install Kamaji + +To install the Chart with the release name `kamaji`: + + helm upgrade --install --namespace kamaji-system --create-namespace kamaji + +Show the status: + + helm status kamaji -n kamaji-system + +Upgrade the Chart + + helm upgrade kamaji -n kamaji-system . + +Uninstall the Chart + + helm uninstall kamaji -n kamaji-system + +## Customize the installation + +There are two methods for specifying overrides of values during Chart installation: `--values` and `--set`. + +The `--values` option is the preferred method because it allows you to keep your overrides in a YAML file, rather than specifying them all on the command line. Create a copy of the YAML file `values.yaml` and add your overrides to it. + +Specify your overrides file when you install the Chart: + + helm upgrade kamaji --install --namespace kamaji-system --create-namespace kamaji --values myvalues.yaml + +The values in your overrides file `myvalues.yaml` will override their counterparts in the Chart's values.yaml file. Any values in `values.yaml` that weren’t overridden will keep their defaults. + +If you only need to make minor customizations, you can specify them on the command line by using the `--set` option. For example: + + helm upgrade kamaji --install --namespace kamaji-system --create-namespace kamaji --set etcd.deploy=false + +Here the values you can override: + ## Values | Key | Type | Default | Description | @@ -46,12 +69,13 @@ Kubernetes: `>=1.18` | affinity | object | `{}` | Kubernetes affinity rules to apply to Kamaji controller pods | | configPath | string | `"./kamaji.yaml"` | Configuration file path alternative. (default "./kamaji.yaml") | | etcd.compactionInterval | int | `0` | ETCD Compaction interval (e.g. "5m0s"). (default: "0" (disabled)) | -| etcd.deploy | bool | `true` | Install an etcd 3.5 with enabled multi-tenancy along with Kamaji | +| 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.4"}` | 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 | | etcd.overrides.caSecret.name | string | `"etcd-certs"` | Name of the secret which contains CA's certificate and private key. (default: "etcd-certs") | | etcd.overrides.caSecret.namespace | string | `"kamaji-system"` | Namespace of the secret which contains CA's certificate and private key. (default: "kamaji-system") | | etcd.overrides.clientSecret.name | string | `"root-client-certs"` | Name of the secret which contains ETCD client certificates. (default: "root-client-certs") | | etcd.overrides.clientSecret.namespace | string | `"kamaji-system"` | Name of the namespace where the secret which contains ETCD client certificates is. (default: "kamaji-system") | -| etcd.overrides.endpoints | string | `"https://etcd-0.etcd.kamaji-system.svc.cluster.local:2379,https://etcd-1.etcd.kamaji-system.svc.cluster.local:2379,https://etcd-2.etcd.kamaji-system.svc.cluster.local:2379"` | (string) Comma-separated list of the endpoints of the etcd cluster's members. | | etcd.serviceAccount.create | bool | `true` | Create a ServiceAccount, required to install and provision the etcd backing storage (default: true) | | etcd.serviceAccount.name | string | `""` | Define the ServiceAccount name to use during the setup and provision of the etcd backing storage (default: "") | | extraArgs | list | `[]` | A list of extra arguments to add to the kamaji controller default ones | diff --git a/helm/kamaji/README.md.gotmpl b/helm/kamaji/README.md.gotmpl index 80f3b6a0..a91e684c 100644 --- a/helm/kamaji/README.md.gotmpl +++ b/helm/kamaji/README.md.gotmpl @@ -5,29 +5,52 @@ {{ template "chart.description" . }} -{{ template "chart.homepageLine" . }} +{{ template "chart.maintainersSection" . }} -### Pre-requisites +{{ template "chart.sourcesSection" . }} -Kamaji requires a [multi-tenant etcd cluster](https://github.com/clastix/kamaji-internal/blob/master/deploy/getting-started-with-kamaji.md#setup-internal-multi-tenant-etcd) cluster. -The installation and provisioning processes are already put in place by the Helm Chart starting from v0.1.1 in order to streamline the local test. +{{ template "chart.requirementsSection" . }} -> For production use an externally managed etcd is highly recommended, the etcd addon offered by this chart is not considered production-grade. +[Kamaji](https://github.com/clastix/kamaji) requires a [multi-tenant `etcd`](https://github.com/clastix/kamaji-internal/blob/master/deploy/getting-started-with-kamaji.md#setup-internal-multi-tenant-etcd) cluster. +This Helm Chart starting from v0.1.1 provides the installation of an internal `etcd` in order to streamline the local test. If you'd like to use an externally managed etcd instance, you can specify the overrides and by setting the value `etcd.deploy=false`. -If you'd like to use an externally managed etcd instance, you can specify the overrides and by setting the value `etcd.deploy=false`. +> For production use an externally managed `etcd` is highly recommended, the `etcd` addon offered by this Chart is not considered production-grade. -### Install Kamaji +## Install Kamaji -To install the chart with the release name `kamaji`: +To install the Chart with the release name `kamaji`: -```console -helm upgrade --install --namespace kamaji-system --create-namespace kamaji . -``` -{{ template "chart.maintainersSection" . }} + helm upgrade --install --namespace kamaji-system --create-namespace kamaji -{{ template "chart.sourcesSection" . }} +Show the status: -{{ template "chart.requirementsSection" . }} + helm status kamaji -n kamaji-system + +Upgrade the Chart + + helm upgrade kamaji -n kamaji-system . + +Uninstall the Chart + + helm uninstall kamaji -n kamaji-system + +## Customize the installation + +There are two methods for specifying overrides of values during Chart installation: `--values` and `--set`. + +The `--values` option is the preferred method because it allows you to keep your overrides in a YAML file, rather than specifying them all on the command line. Create a copy of the YAML file `values.yaml` and add your overrides to it. + +Specify your overrides file when you install the Chart: + + helm upgrade kamaji --install --namespace kamaji-system --create-namespace kamaji --values myvalues.yaml + +The values in your overrides file `myvalues.yaml` will override their counterparts in the Chart's values.yaml file. Any values in `values.yaml` that weren’t overridden will keep their defaults. + +If you only need to make minor customizations, you can specify them on the command line by using the `--set` option. For example: + + helm upgrade kamaji --install --namespace kamaji-system --create-namespace kamaji --set etcd.deploy=false + +Here the values you can override: {{ template "chart.valuesSection" . }} From eb1c545cafdd8891c2a781b0dd17d954609261f8 Mon Sep 17 00:00:00 2001 From: bsctl Date: Wed, 10 Aug 2022 23:48:21 +0200 Subject: [PATCH 3/5] fix(helm): restore etcd endpoints --- helm/kamaji/README.md | 1 + helm/kamaji/values.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/helm/kamaji/README.md b/helm/kamaji/README.md index 21bdcdf5..b09836c8 100644 --- a/helm/kamaji/README.md +++ b/helm/kamaji/README.md @@ -76,6 +76,7 @@ Here the values you can override: | etcd.overrides.caSecret.namespace | string | `"kamaji-system"` | Namespace of the secret which contains CA's certificate and private key. (default: "kamaji-system") | | etcd.overrides.clientSecret.name | string | `"root-client-certs"` | Name of the secret which contains ETCD client certificates. (default: "root-client-certs") | | etcd.overrides.clientSecret.namespace | string | `"kamaji-system"` | Name of the namespace where the secret which contains ETCD client certificates is. (default: "kamaji-system") | +| etcd.overrides.endpoints | string | `"https://etcd-0.etcd.kamaji-system.svc.cluster.local:2379,https://etcd-1.etcd.kamaji-system.svc.cluster.local:2379,https://etcd-2.etcd.kamaji-system.svc.cluster.local:2379"` | (string) Comma-separated list of the endpoints of the etcd cluster's members. | | etcd.serviceAccount.create | bool | `true` | Create a ServiceAccount, required to install and provision the etcd backing storage (default: true) | | etcd.serviceAccount.name | string | `""` | Define the ServiceAccount name to use during the setup and provision of the etcd backing storage (default: "") | | extraArgs | list | `[]` | A list of extra arguments to add to the kamaji controller default ones | diff --git a/helm/kamaji/values.yaml b/helm/kamaji/values.yaml index 6f3def1b..14877e19 100644 --- a/helm/kamaji/values.yaml +++ b/helm/kamaji/values.yaml @@ -56,7 +56,7 @@ etcd: # -- Name of the namespace where the secret which contains ETCD client certificates is. (default: "kamaji-system") namespace: kamaji-system # -- (string) Comma-separated list of the endpoints of the etcd cluster's members. - # endpoints: "https://etcd-0.etcd.kamaji-system.svc.cluster.local:2379,https://etcd-1.etcd.kamaji-system.svc.cluster.local:2379,https://etcd-2.etcd.kamaji-system.svc.cluster.local:2379" + endpoints: "https://etcd-0.etcd.kamaji-system.svc.cluster.local:2379,https://etcd-1.etcd.kamaji-system.svc.cluster.local:2379,https://etcd-2.etcd.kamaji-system.svc.cluster.local:2379" # -- ETCD Compaction interval (e.g. "5m0s"). (default: "0" (disabled)) compactionInterval: 0 # -- Number of committed transactions to trigger a snapshot to disk. From 56d0e5d56f752adfb182da38417c12c526422f9f Mon Sep 17 00:00:00 2001 From: bsctl Date: Sat, 13 Aug 2022 18:08:41 +0200 Subject: [PATCH 4/5] feat(helm): improve pvc management --- helm/kamaji/templates/etcd_sts.yaml | 20 +++++++++++++------- helm/kamaji/values.yaml | 7 ++++++- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/helm/kamaji/templates/etcd_sts.yaml b/helm/kamaji/templates/etcd_sts.yaml index 01babf05..fcfd1362 100644 --- a/helm/kamaji/templates/etcd_sts.yaml +++ b/helm/kamaji/templates/etcd_sts.yaml @@ -58,6 +58,8 @@ spec: - --peer-key-file=/etc/etcd/pki/peer-key.pem - --auto-compaction-mode=periodic - --auto-compaction-retention=5m + - --snapshot-count=10000 + - --quota-backend-bytes=8589934592 - --v=8 env: - name: POD_NAME @@ -77,11 +79,15 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} volumeClaimTemplates: - - metadata: - name: data - spec: - accessModes: ["ReadWriteOnce"] - resources: - requests: - storage: 8Gi + - metadata: + name: data + spec: + storageClassName: {{ .Values.etcd.persistence.storageClassName }} + accessModes: + {{- range .Values.etcd.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.etcd.persistence.size }} {{- end }} diff --git a/helm/kamaji/values.yaml b/helm/kamaji/values.yaml index 14877e19..5e4d01f0 100644 --- a/helm/kamaji/values.yaml +++ b/helm/kamaji/values.yaml @@ -44,6 +44,12 @@ etcd: create: true # -- Define the ServiceAccount name to use during the setup and provision of the etcd backing storage (default: "") name: "" + persistence: + size: 10Gi + storageClass: "" + accessModes: + - ReadWriteOnce + overrides: caSecret: # -- Name of the secret which contains CA's certificate and private key. (default: "etcd-certs") @@ -59,7 +65,6 @@ etcd: endpoints: "https://etcd-0.etcd.kamaji-system.svc.cluster.local:2379,https://etcd-1.etcd.kamaji-system.svc.cluster.local:2379,https://etcd-2.etcd.kamaji-system.svc.cluster.local:2379" # -- ETCD Compaction interval (e.g. "5m0s"). (default: "0" (disabled)) compactionInterval: 0 - # -- Number of committed transactions to trigger a snapshot to disk. # -- The address the probe endpoint binds to. (default ":8081") healthProbeBindAddress: ":8081" From b2007e4eb9fd54ac4e35387be5e93c72aec81071 Mon Sep 17 00:00:00 2001 From: bsctl Date: Sat, 13 Aug 2022 18:12:38 +0200 Subject: [PATCH 5/5] fix(helm): readme --- helm/kamaji/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/helm/kamaji/README.md b/helm/kamaji/README.md index b09836c8..8ba382cd 100644 --- a/helm/kamaji/README.md +++ b/helm/kamaji/README.md @@ -77,6 +77,9 @@ Here the values you can override: | etcd.overrides.clientSecret.name | string | `"root-client-certs"` | Name of the secret which contains ETCD client certificates. (default: "root-client-certs") | | etcd.overrides.clientSecret.namespace | string | `"kamaji-system"` | Name of the namespace where the secret which contains ETCD client certificates is. (default: "kamaji-system") | | etcd.overrides.endpoints | string | `"https://etcd-0.etcd.kamaji-system.svc.cluster.local:2379,https://etcd-1.etcd.kamaji-system.svc.cluster.local:2379,https://etcd-2.etcd.kamaji-system.svc.cluster.local:2379"` | (string) Comma-separated list of the endpoints of the etcd cluster's members. | +| etcd.persistence.accessModes[0] | string | `"ReadWriteOnce"` | | +| etcd.persistence.size | string | `"10Gi"` | | +| etcd.persistence.storageClass | string | `""` | | | etcd.serviceAccount.create | bool | `true` | Create a ServiceAccount, required to install and provision the etcd backing storage (default: true) | | etcd.serviceAccount.name | string | `""` | Define the ServiceAccount name to use during the setup and provision of the etcd backing storage (default: "") | | extraArgs | list | `[]` | A list of extra arguments to add to the kamaji controller default ones |