Add Required kustomize changes to remove kube-rbac-proxy

Signed-off-by: Furkat gofurov <furkat.gofurov@suse.com>
kubernetes-sigs · Nov 30, 2023 · 344e72d · 344e72d
1 parent c929997
commit 344e72d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -149,9 +149,10 @@ spec:
       containers:
       - name: manager
         args:
-        - --metrics-bind-addr=:8080
         - --leader-elect
         - --leader-elect-retry-period=5s
+        - "--diagnostics-address=${CAPI_OPERATOR_DIAGNOSTICS_ADDRESS:=:8443}"
+        - "--insecure-diagnostics=${CAPI_OPERATOR_INSECURE_DIAGNOSTICS:=false}"
         - --v=5
         env:...
 ```

diff --git a/hack/charts/cluster-api-operator/templates/deployment.yaml b/hack/charts/cluster-api-operator/templates/deployment.yaml
@@ -63,9 +63,6 @@ spec:
         {{- if .Values.healthAddr }}
         - --health-addr={{ .Values.healthAddr }}
         {{- end }}
-        {{- if .Values.metricsBindAddr }}
-        - --metrics-bind-addr={{ .Values.metricsBindAddr }}
-        {{- 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,7 +27,6 @@ image:
     tag: dev
     pullPolicy: IfNotPresent
 healthAddr: ":8081"
-metricsBindAddr: "127.0.0.1:8080"
 imagePullSecrets: {}
 resources:
   manager:

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