update CCM for k8s 1.31

gardener · Sep 11, 2024 · f39016e · f39016e
1 parent 4c9d5f5
commit f39016e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/...seed-controlplane/charts/cloud-controller-manager/templates/cloud-controller-manager.yaml b/...seed-controlplane/charts/cloud-controller-manager/templates/cloud-controller-manager.yaml
@@ -37,6 +37,9 @@ spec:
       - name: gcp-cloud-controller-manager
         image: {{ index .Values.images "cloud-controller-manager" }}
         imagePullPolicy: IfNotPresent
+        {{- if le (semver .Values.kubernetesVersion | (semver "1.31.0").Compare) 0 }}
+        command: ["/cloud-controller-manager"]
+        {{- end}}
         args:
         - --allocate-node-cidrs=true
         - --cloud-provider=gce

diff --git a/imagevector/images.yaml b/imagevector/images.yaml
@@ -86,7 +86,21 @@ images:
   sourceRepository: github.com/gardener/cloud-provider-gcp
   repository: europe-docker.pkg.dev/gardener-project/releases/kubernetes/cloud-provider-gcp
   tag: "v1.30.0"
-  targetVersion: ">= 1.30"
+  targetVersion: "1.30.x"
+  labels:
+  - name: 'gardener.cloud/cve-categorisation'
+    value:
+      network_exposure: 'protected'
+      authentication_enforced: false
+      user_interaction: 'gardener-operator'
+      confidentiality_requirement: 'high'
+      integrity_requirement: 'high'
+      availability_requirement: 'low'
+- name: cloud-controller-manager
+  sourceRepository: github.com/kubernetes/cloud-provider-gcp
+  repository: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager
+  tag: "v30.0.0"
+  targetVersion: ">= 1.31"
   labels:
   - name: 'gardener.cloud/cve-categorisation'
     value: