Expose diagnosticsAddress and insecureDiagnostics through helm chart …

…values Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
kubernetes-sigs · Nov 29, 2023 · 5412f2b · 5412f2b
1 parent c6f1066
commit 5412f2b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -20,8 +20,6 @@ spec:
         - /manager
         args:
           - "--leader-elect"
-          - "--diagnostics-address=${CAPI_OPERATOR_DIAGNOSTICS_ADDRESS:=:8443}"
-          - "--insecure-diagnostics=${CAPI_OPERATOR_INSECURE_DIAGNOSTICS:=false}"
         image: controller:latest
         name: manager
         ports:

diff --git a/hack/charts/cluster-api-operator/templates/deployment.yaml b/hack/charts/cluster-api-operator/templates/deployment.yaml
@@ -63,6 +63,12 @@ spec:
         {{- if .Values.healthAddr }}
         - --health-addr={{ .Values.healthAddr }}
         {{- end }}
+        {{- if .Values.diagnosticsAddress }}
+        - --diagnostics-address={{ .Values.diagnosticsAddress }}
+        {{- end }}
+        {{- if .Values.insecureDiagnostics }}
+        - --insecure-diagnostics={{ .Values.insecureDiagnostics }}
+        {{- end }}
         {{- with .Values.leaderElection }}
         - --leader-elect={{ .enabled }}
         {{- if .leaseDuration }}

diff --git a/hack/charts/cluster-api-operator/values.yaml b/hack/charts/cluster-api-operator/values.yaml
@@ -27,6 +27,8 @@ image:
     tag: dev
     pullPolicy: IfNotPresent
 healthAddr: ":8081"
+diagnosticsAddress: "8443"
+insecureDiagnostics: false
 imagePullSecrets: {}
 resources:
   manager:

diff --git a/test/e2e/resources/full-chart-install.yaml b/test/e2e/resources/full-chart-install.yaml
@@ -14091,6 +14091,7 @@ spec:
       - args:
         - --v=2
         - --health-addr=:8081
+        - --diagnostics-address=8443
         - --leader-elect=true
         command:
         - /manager