Skip to content

Commit

Permalink
Merge pull request #3785 from my-git9/automated-cherry-pick-of-#3777-…
Browse files Browse the repository at this point in the history
…upstream-release-1.5

Automated cherry pick of #3777: chart: fix karmada search external etcd no volume mount
  • Loading branch information
karmada-bot authored Jul 12, 2023
2 parents c1a5373 + d811883 commit 0b61187
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
8 changes: 8 additions & 0 deletions charts/karmada/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,14 @@ app: {{- include "karmada.name" .}}-search
secret:
secretName: {{ .Values.search.kubeconfig }}
{{- end -}}
- name: etcd-certs
secret:
{{- if eq .Values.etcd.mode "internal" }}
secretName: {{ $name }}-cert
{{- end }}
{{- if eq .Values.etcd.mode "external" }}
secretName: {{ $name }}-external-etcd-cert
{{- end }}
{{- end -}}

{{/*
Expand Down
9 changes: 6 additions & 3 deletions charts/karmada/templates/karmada-search.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ spec:
- name: k8s-certs
mountPath: /etc/kubernetes/pki
readOnly: true
- name: etcd-certs
mountPath: /etc/etcd/pki
readOnly: true
- name: kubeconfig-secret
subPath: kubeconfig
mountPath: /etc/kubeconfig
Expand All @@ -65,9 +68,9 @@ spec:
{{- end }}
{{- if eq .Values.etcd.mode "internal" }}
- --etcd-servers=https://etcd-client.{{ include "karmada.namespace" . }}.svc.{{ .Values.clusterDomain }}:2379
- --etcd-cafile=/etc/kubernetes/pki/server-ca.crt
- --etcd-certfile=/etc/kubernetes/pki/karmada.crt
- --etcd-keyfile=/etc/kubernetes/pki/karmada.key
- --etcd-cafile=/etc/etcd/pki/server-ca.crt
- --etcd-certfile=/etc/etcd/pki/karmada.crt
- --etcd-keyfile=/etc/etcd/pki/karmada.key
{{- end }}
- --tls-cert-file=/etc/kubernetes/pki/karmada.crt
- --tls-private-key-file=/etc/kubernetes/pki/karmada.key
Expand Down

0 comments on commit 0b61187

Please sign in to comment.