Skip to content

Commit

Permalink
helm: allow to override the CA cert on a clustermesh peer basis
Browse files Browse the repository at this point in the history
This commit extends the helm chart to enable overriding the CA certificate
of a specific clustermesh peer. This is required in case different CAs are
used across the mesh, since it otherwise defaults to the local one.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
  • Loading branch information
giorio94 authored and pchaigno committed Mar 10, 2023
1 parent a019680 commit 46ecd9a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ data:
{{ .name }}: {{ include "clustermesh-config-generate-etcd-cfg" (list . $.Values.clustermesh.config.domain) | b64enc }}
{{- /* The parenthesis around .tls are required, since it can be null: https://stackoverflow.com/a/68807258 */}}
{{- if and (.tls).cert (.tls).key }}
{{ .name }}.etcd-client-ca.crt: {{ $.Values.clustermesh.apiserver.tls.ca.cert }}
{{ .name }}.etcd-client-ca.crt: {{ .tls.caCert | default $.Values.clustermesh.apiserver.tls.ca.cert }}
{{ .name }}.etcd-client.key: {{ .tls.key }}
{{ .name }}.etcd-client.crt: {{ .tls.cert }}
{{- end }}
Expand Down
1 change: 1 addition & 0 deletions install/kubernetes/cilium/values.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions install/kubernetes/cilium/values.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -2290,6 +2290,7 @@ clustermesh:
# tls:
# cert: ""
# key: ""
# caCert: ""

apiserver:
# -- Clustermesh API server image.
Expand Down

0 comments on commit 46ecd9a

Please sign in to comment.