diff --git a/charts/flagger/templates/deployment.yaml b/charts/flagger/templates/deployment.yaml index a854be46..4301c453 100644 --- a/charts/flagger/templates/deployment.yaml +++ b/charts/flagger/templates/deployment.yaml @@ -48,10 +48,10 @@ spec: - name: {{ .Values.image.pullSecret }} {{- end }} volumes: - {{- if .Values.istio.kubeconfig.secretName }} + {{- if .Values.controlplane.kubeconfig.secretName }} - name: kubeconfig secret: - secretName: "{{ .Values.istio.kubeconfig.secretName }}" + secretName: "{{ .Values.controlplane.kubeconfig.secretName }}" {{- end }} {{- if .Values.podPriorityClassName }} priorityClassName: {{ .Values.podPriorityClassName }} @@ -63,9 +63,9 @@ spec: {{ toYaml .Values.securityContext.context | indent 12 }} {{- end }} volumeMounts: - {{- if .Values.istio.kubeconfig.secretName }} + {{- if .Values.controlplane.kubeconfig.secretName }} - name: kubeconfig - mountPath: "/tmp/istio-host" + mountPath: "/tmp/controlplane" {{- end }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} @@ -132,8 +132,8 @@ spec: {{- if .Values.kubeconfigBurst }} - -kubeconfig-burst={{ .Values.kubeconfigBurst }} {{- end }} - {{- if .Values.istio.kubeconfig.secretName }} - - -kubeconfig-service-mesh=/tmp/istio-host/{{ .Values.istio.kubeconfig.key }} + {{- if .Values.controlplane.kubeconfig.secretName }} + - -kubeconfig-service-mesh=/tmp/controlplane/{{ .Values.controlplane.kubeconfig.key }} {{- end }} {{- if .Values.threadiness }} - -threadiness={{ .Values.threadiness }} diff --git a/charts/flagger/values.yaml b/charts/flagger/values.yaml index 30b5693c..f42b7d42 100644 --- a/charts/flagger/values.yaml +++ b/charts/flagger/values.yaml @@ -151,13 +151,12 @@ prometheus: kubeconfigQPS: "" kubeconfigBurst: "" -# Istio multi-cluster service mesh (shared control plane single-network) -# https://istio.io/docs/setup/install/multicluster/shared-vpn/ -istio: +# Multi-cluster service mesh (shared control plane single-network) +controlplane: kubeconfig: - # istio.kubeconfig.secretName: The name of the secret containing the Istio control plane kubeconfig + # controlplane.kubeconfig.secretName: The name of the secret containing the mesh control plane kubeconfig secretName: "" - # istio.kubeconfig.key: The name of secret data key that contains the Istio control plane kubeconfig + # controlplane.kubeconfig.key: The name of secret data key that contains the mesh control plane kubeconfig key: "kubeconfig" podDisruptionBudget: diff --git a/docs/gitbook/install/flagger-install-on-kubernetes.md b/docs/gitbook/install/flagger-install-on-kubernetes.md index 1729cdcf..d970f500 100644 --- a/docs/gitbook/install/flagger-install-on-kubernetes.md +++ b/docs/gitbook/install/flagger-install-on-kubernetes.md @@ -43,8 +43,8 @@ helm upgrade -i flagger flagger/flagger \ --set crd.create=false \ --set meshProvider=istio \ --set metricsServer=http://istio-cluster-prometheus:9090 \ ---set istio.kubeconfig.secretName=istio-kubeconfig \ ---set istio.kubeconfig.key=kubeconfig +--set controlplane.kubeconfig.secretName=istio-kubeconfig \ +--set controlplane.kubeconfig.key=kubeconfig ``` Note that the Istio kubeconfig must be stored in a Kubernetes secret with a data key named `kubeconfig`.