Updated configmap mountpoints based on ETCD replicas.

gardener · Aug 9, 2021 · 842e731 · 842e731
1 parent 0482777
commit 842e731
Show file tree

Hide file tree

Showing 6 changed files with 323 additions and 204 deletions.
diff --git a/charts/etcd/templates/etcd-configmap.yaml b/charts/etcd/templates/etcd-configmap.yaml
@@ -53,6 +53,9 @@ data:
     # Initial cluster state ('new' or 'existing').
     initial-cluster-state: {{ .Values.etcd.initialClusterState }}
 
+    # Initial cluster
+    initial-cluster: {{ .Values.etcd.initialCluster }}
+
     {{- if .Values.sharedConfig }}
     # auto-compaction-mode ("periodic" or "revision").
     {{- if .Values.sharedConfig.autoCompactionMode }}

diff --git a/charts/etcd/templates/etcd-statefulset.yaml b/charts/etcd/templates/etcd-statefulset.yaml
@@ -102,7 +102,7 @@ spec:
         - name: {{ .Values.volumeClaimTemplateName }}
           mountPath: /var/etcd/data/
         - name: etcd-config-file
-          mountPath: /var/etcd/config/
+          mountPath: {{ .Values.etcdConfigMountPath }}
 {{- if .Values.etcd.enableTLS }}
         - name: ca-etcd
           mountPath: /var/etcd/ssl/ca
@@ -321,7 +321,7 @@ spec:
         - name: {{ .Values.volumeClaimTemplateName }}
           mountPath: /var/etcd/data
         - name: etcd-config-file
-          mountPath: /var/etcd/config/
+          mountPath: {{ .Values.etcdConfigMountPath }}
 {{- if .Values.etcd.enableTLS }}
         - name: ca-etcd
           mountPath: /var/etcd/ssl/ca

diff --git a/charts/etcd/values.yaml b/charts/etcd/values.yaml
@@ -15,6 +15,7 @@ labels: {}
 etcd:
   initialClusterToken: initial
   initialClusterState: new
+  initialCluster: test
   enableTLS: false
   pullPolicy: IfNotPresent
   metrics: basic
@@ -30,6 +31,7 @@ etcd:
   #username: username
   #password: password
 
+etcdConfigMountPath: "/var/etcd/config/"
 backup:
   port: 8080
   pullPolicy: IfNotPresent