Merge pull request #17311 from hakman/calico-3.29.2

Update Calico to v3.29.2
kubernetes · Mar 9, 2025 · 0d364e8 · 0d364e8
2 parents e797e75 + 72b946e
commit 0d364e8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/.../minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/.../minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
@@ -99,7 +99,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.25
     manifest: networking.projectcalico.org/k8s-1.25.yaml
-    manifestHash: 55b59a095cb1c3d87680744115ff0f3b8dd2b4112356d8721fc9a9bf33868d04
+    manifestHash: 0b908c4c6d7093e9cafdde3db1b448088de2de8b42f726869176a7ed43767a80
     name: networking.projectcalico.org
     prune:
       kinds:

diff --git a/...s_s3_object_minimal-ipv6.example.com-addons-networking.projectcalico.org-k8s-1.25_content b/...s_s3_object_minimal-ipv6.example.com-addons-networking.projectcalico.org-k8s-1.25_content
@@ -6337,7 +6337,7 @@ spec:
         - configMapRef:
             name: kubernetes-services-endpoint
             optional: true
-        image: docker.io/calico/node:v3.29.1
+        image: docker.io/calico/node:v3.29.2
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
@@ -6417,7 +6417,7 @@ spec:
         - configMapRef:
             name: kubernetes-services-endpoint
             optional: true
-        image: docker.io/calico/cni:v3.29.1
+        image: docker.io/calico/cni:v3.29.2
         imagePullPolicy: IfNotPresent
         name: install-cni
         securityContext:
@@ -6431,7 +6431,7 @@ spec:
         - calico-node
         - -init
         - -best-effort
-        image: docker.io/calico/node:v3.29.1
+        image: docker.io/calico/node:v3.29.2
         imagePullPolicy: IfNotPresent
         name: mount-bpffs
         securityContext:
@@ -6560,7 +6560,7 @@ spec:
           value: node
         - name: DATASTORE_TYPE
           value: kubernetes
-        image: docker.io/calico/kube-controllers:v3.29.1
+        image: docker.io/calico/kube-controllers:v3.29.2
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:

diff --git a/...uster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content b/...uster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content
@@ -99,7 +99,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.25
     manifest: networking.projectcalico.org/k8s-1.25.yaml
-    manifestHash: e41cade1ae0f05c607612802deea3cdfeec1f1d8d7f01becc65f63fb225a5ec8
+    manifestHash: f16968ad43bb21350e5b985ef6137cda40767f6a06509ec9b05e6b1e80b60301
     name: networking.projectcalico.org
     prune:
       kinds:

diff --git a/..._s3_object_privatecalico.example.com-addons-networking.projectcalico.org-k8s-1.25_content b/..._s3_object_privatecalico.example.com-addons-networking.projectcalico.org-k8s-1.25_content
@@ -6332,7 +6332,7 @@ spec:
         - configMapRef:
             name: kubernetes-services-endpoint
             optional: true
-        image: docker.io/calico/node:v3.29.1
+        image: docker.io/calico/node:v3.29.2
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
@@ -6406,7 +6406,7 @@ spec:
         - configMapRef:
             name: kubernetes-services-endpoint
             optional: true
-        image: docker.io/calico/cni:v3.29.1
+        image: docker.io/calico/cni:v3.29.2
         imagePullPolicy: IfNotPresent
         name: upgrade-ipam
         securityContext:
@@ -6441,7 +6441,7 @@ spec:
         - configMapRef:
             name: kubernetes-services-endpoint
             optional: true
-        image: docker.io/calico/cni:v3.29.1
+        image: docker.io/calico/cni:v3.29.2
         imagePullPolicy: IfNotPresent
         name: install-cni
         securityContext:
@@ -6455,7 +6455,7 @@ spec:
         - calico-node
         - -init
         - -best-effort
-        image: docker.io/calico/node:v3.29.1
+        image: docker.io/calico/node:v3.29.2
         imagePullPolicy: IfNotPresent
         name: mount-bpffs
         securityContext:
@@ -6587,7 +6587,7 @@ spec:
           value: node
         - name: DATASTORE_TYPE
           value: kubernetes
-        image: docker.io/calico/kube-controllers:v3.29.1
+        image: docker.io/calico/kube-controllers:v3.29.2
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:

diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.25.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.25.yaml.template
@@ -1,4 +1,4 @@
-# Pulled and modified from: https://raw.githubusercontent.com/projectcalico/calico/v3.29.1/manifests/calico-typha.yaml
+# Pulled and modified from: https://raw.githubusercontent.com/projectcalico/calico/v3.29.2/manifests/calico-typha.yaml
 ---
 {{- if .Networking.Calico.BPFEnabled }}
 # Set these to the IP and port of your API server; In BPF mode, we need to connect directly to the
@@ -6184,7 +6184,7 @@ spec:
         # It can be deleted if this is a fresh installation, or if you have already
         # upgraded to use calico-ipam.
         - name: upgrade-ipam
-          image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/cni:{{ or .Networking.Calico.Version "v3.29.1" }}
+          image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/cni:{{ or .Networking.Calico.Version "v3.29.2" }}
           imagePullPolicy: IfNotPresent
           command: ["/opt/cni/bin/calico-ipam", "-upgrade"]
           envFrom:
@@ -6213,7 +6213,7 @@ spec:
         # This container installs the CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/cni:{{ or .Networking.Calico.Version "v3.29.1" }}
+          image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/cni:{{ or .Networking.Calico.Version "v3.29.2" }}
           imagePullPolicy: IfNotPresent
           command: ["/opt/cni/bin/install"]
           envFrom:
@@ -6256,7 +6256,7 @@ spec:
         # i.e. bpf at /sys/fs/bpf and cgroup2 at /run/calico/cgroup. Calico-node initialisation is executed
         # in best effort fashion, i.e. no failure for errors, to not disrupt pod creation in iptable mode.
         - name: "mount-bpffs"
-          image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/node:{{ or .Networking.Calico.Version "v3.29.1" }}
+          image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/node:{{ or .Networking.Calico.Version "v3.29.2" }}
           imagePullPolicy: IfNotPresent
           command: ["calico-node", "-init", "-best-effort"]
           volumeMounts:
@@ -6282,7 +6282,7 @@ spec:
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/node:{{ or .Networking.Calico.Version "v3.29.1" }}
+          image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/node:{{ or .Networking.Calico.Version "v3.29.2" }}
           imagePullPolicy: IfNotPresent
           envFrom:
           - configMapRef:
@@ -6620,7 +6620,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: calico-kube-controllers
-          image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/kube-controllers:{{ or .Networking.Calico.Version "v3.29.1" }}
+          image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/kube-controllers:{{ or .Networking.Calico.Version "v3.29.2" }}
           imagePullPolicy: IfNotPresent
           env:
             # Choose which controllers to run.
@@ -6714,7 +6714,7 @@ spec:
         seccompProfile:
           type: RuntimeDefault
       containers:
-      - image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/typha:{{ or .Networking.Calico.Version "v3.29.1" }}
+      - image: {{ or .Networking.Calico.Registry "docker.io" }}/calico/typha:{{ or .Networking.Calico.Version "v3.29.2" }}
         imagePullPolicy: IfNotPresent
         name: calico-typha
         ports: