(cluster-api) : Updating cluster-api-operator subchart to v0.15.1

Signed-off-by: Archisman <[email protected]>
Obmondo · Jan 10, 2025 · 1f947ee · 1f947ee
1 parent 377a47a
commit 1f947ee
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 14 deletions.
diff --git a/argocd-helm-charts/cluster-api/Chart.lock b/argocd-helm-charts/cluster-api/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: cluster-api-operator
   repository: https://kubernetes-sigs.github.io/cluster-api-operator
-  version: 0.15.0
-digest: sha256:c0eb1039d4f06b3d4ac665bda44d7ddea5a35e8941b33ffd98b4f93d65dfcc6a
-generated: "2024-12-23T10:16:27.343783076+05:30"
+  version: 0.15.1
+digest: sha256:b67be77e1939879144c8a8eca8b16cc218ad7265629c6de3d23eccc4a47e16a7
+generated: "2025-01-09T21:22:39.951437+05:30"
diff --git a/argocd-helm-charts/cluster-api/Chart.yaml b/argocd-helm-charts/cluster-api/Chart.yaml
@@ -3,5 +3,5 @@ name: cluster-api
 version: 1.0.0
 dependencies:
   - name: cluster-api-operator
-    version: 0.15.0
+    version: 0.15.1
     repository: https://kubernetes-sigs.github.io/cluster-api-operator
diff --git a/argocd-helm-charts/cluster-api/charts/cluster-api-operator/Chart.yaml b/argocd-helm-charts/cluster-api/charts/cluster-api-operator/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: 0.15.0
+appVersion: 0.15.1
 description: Cluster API Operator
 name: cluster-api-operator
 type: application
-version: 0.15.0
+version: 0.15.1
diff --git a/argocd-helm-charts/cluster-api/charts/cluster-api-operator/templates/deployment.yaml b/argocd-helm-charts/cluster-api/charts/cluster-api-operator/templates/deployment.yaml
@@ -65,9 +65,6 @@ spec:
         {{- if .Values.healthAddr }}
         - --health-addr={{ .Values.healthAddr }}
         {{- end }}
-        {{- if .Values.metricsBindAddr }}
-        - --metrics-bind-addr={{ .Values.metricsBindAddr }}
-        {{- end }}
         {{- if .Values.diagnosticsAddress }}
         - --diagnostics-address={{ .Values.diagnosticsAddress }}
         {{- end }}
@@ -100,9 +97,15 @@ spec:
         - containerPort: 9443
           name: webhook-server
           protocol: TCP
-        - containerPort: {{ ( split ":" $.Values.metricsBindAddr)._1 | int }}
+          {{- if $.Values.diagnosticsAddress }}
+          {{- $diagnosticsPort := $.Values.diagnosticsAddress }}
+          {{- if contains ":" $diagnosticsPort -}}
+          {{ $diagnosticsPort = ( split ":" $.Values.diagnosticsAddress)._1 | int }}
+          {{- end }}
+        - containerPort: {{ $diagnosticsPort | int }}
           name: metrics
           protocol: TCP
+          {{- end }}
         {{- with .Values.resources.manager }}
         resources:
         {{- toYaml . | nindent 12 }}
@@ -120,6 +123,30 @@ spec:
         {{- toYaml . | nindent 12 }}
         {{- end }}
         terminationMessagePolicy: FallbackToLogsOnError
+        {{- $healthAddr := $.Values.healthAddr }}
+        {{- if contains ":" $healthAddr -}}
+        {{ $healthAddr = ( split ":" $.Values.healthAddr)._1 | int }}
+        {{- end }}
+        livenessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /healthz
+            port: {{ $healthAddr | default 9440 }}
+            scheme: HTTP
+          initialDelaySeconds: 15
+          periodSeconds: 20
+          successThreshold: 1
+          timeoutSeconds: 1
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /readyz
+            port: {{ $healthAddr | default 9440 }}
+            scheme: HTTP
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 1
       terminationGracePeriodSeconds: 10
       {{- with .Values.volumes }}
       volumes:

diff --git a/argocd-helm-charts/cluster-api/charts/cluster-api-operator/values.yaml b/argocd-helm-charts/cluster-api/charts/cluster-api-operator/values.yaml
@@ -19,13 +19,12 @@ leaderElection:
 image:
   manager:
     repository: registry.k8s.io/capi-operator/cluster-api-operator
-    tag: v0.15.0
+    tag: v0.15.1
     pullPolicy: IfNotPresent
 env:
   manager: []
-healthAddr: ":8081"
-metricsBindAddr: "127.0.0.1:8080"
-diagnosticsAddress: "8443"
+diagnosticsAddress: ":8443"
+healthAddr: ":9440"
 insecureDiagnostics: false
 watchConfigSecret: false
 imagePullSecrets: {}