Merge pull request #99 from embik/remove-embedded-etcd

Remove support for embedded etcd in Chart
kcp-dev · Sep 18, 2024 · ce9db7f · ce9db7f
2 parents 3e93a19 + 0c93a27
commit ce9db7f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/charts/kcp/templates/server-deployment.yaml b/charts/kcp/templates/server-deployment.yaml
@@ -115,11 +115,9 @@ spec:
             {{- else if .Values.etcd.enabled }}
             - --etcd-servers=https://{{ include "etcd.fullname" . }}:2379
             {{- end }}
-            {{- if ne .Values.kcp.etcd.serverAddress "embedded" }}
             - --etcd-keyfile=/etc/kcp/tls/etcd-client/tls.key
             - --etcd-certfile=/etc/kcp/tls/etcd-client/tls.crt
             - --etcd-cafile=/etc/etcd/tls/client-ca/tls.crt
-            {{- end }}
             - --client-ca-file=/etc/kcp/tls/client-ca/tls.crt
             - --tls-private-key-file=/etc/kcp/tls/server/tls.key
             - --tls-cert-file=/etc/kcp/tls/server/tls.crt
@@ -218,12 +216,10 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           volumeMounts:
-            {{- if ne .Values.kcp.etcd.serverAddress "embedded" }}
             - name: kcp-etcd-client-cert
               mountPath: /etc/kcp/tls/etcd-client
             - name: etcd-client-ca
               mountPath: /etc/etcd/tls/client-ca
-            {{- end }}
             - name: kcp-ca
               mountPath: /etc/kcp/tls/ca
             {{- if and .Values.kcpFrontProxy.certificateIssuer .Values.kcpFrontProxy.certificateIssuer.secret }}
@@ -267,14 +263,12 @@ spec:
             - name: kcp-config
               mountPath: /etc/kcp/config
       volumes:
-        {{- if ne .Values.kcp.etcd.serverAddress "embedded" }}
         - name: kcp-etcd-client-cert
           secret:
             secretName: {{ include "kcp.fullname" . }}-etcd-client-cert
         - name: etcd-client-ca
           secret:
             secretName: {{ include "etcd.fullname" . }}-client-ca
-        {{- end }}
         - name: kcp-ca
           secret:
             secretName: {{ include "kcp.fullname" . }}-ca

diff --git a/charts/kcp/values.yaml b/charts/kcp/values.yaml
@@ -56,7 +56,7 @@ kcp:
       memory: 20Gi
   volumeClassName: ""
   etcd:
-    # set this if you are using external or embedded etcds.
+    # set this if you are using external etcds. Do not set this to "embedded", it is not supported.
     serverAddress: ""
     clientCertificate:
       # set this to a cert-manager Issuer that knows how to