Merge pull request #16914 from rifelpet/cilium-1-16-3

Upgrade Cilium to v1.16.3
kubernetes · Oct 24, 2024 · daea619 · daea619
2 parents f3cb5ad + 3a3af99
commit daea619
Show file tree

Hide file tree

Showing 28 changed files with 162 additions and 79 deletions.
diff --git a/pkg/model/components/cilium.go b/pkg/model/components/cilium.go
@@ -40,7 +40,7 @@ func (b *CiliumOptionsBuilder) BuildOptions(o *kops.Cluster) error {
 	}
 
 	if c.Version == "" {
-		c.Version = "v1.16.2"
+		c.Version = "v1.16.3"
 	}
 
 	if c.EnableEndpointHealthChecking == nil {

diff --git a/...tion/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content b/...tion/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content
@@ -226,7 +226,7 @@ spec:
       sidecarIstioProxyImage: cilium/istio_proxy
       toFqdnsDnsRejectResponseCode: refused
       tunnel: disabled
-      version: v1.16.2
+      version: v1.16.3
   nodeTerminationHandler:
     cpuRequest: 50m
     deleteSQSMsgIfNodeNotFound: false

diff --git a/.../minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/.../minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
@@ -106,7 +106,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.16
     manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
-    manifestHash: bb7751360889bc5bc3963dbe393b3c18674bc212cf4a8fed6e47ca5758cf8158
+    manifestHash: 0c83f79dd943a154662cf1734b14afd5b3f57f945e26f5805ea263fc9cd7c733
     name: networking.cilium.io
     needsRollingUpdate: all
     selector:

diff --git a/.../data/aws_s3_object_minimal-ipv6.example.com-addons-networking.cilium.io-k8s-1.16_content b/.../data/aws_s3_object_minimal-ipv6.example.com-addons-networking.cilium.io-k8s-1.16_content
@@ -217,6 +217,14 @@ rules:
   - list
   - watch
   - delete
+- apiGroups:
+  - ""
+  resourceNames:
+  - cilium-config
+  resources:
+  - configmaps
+  verbs:
+  - patch
 - apiGroups:
   - ""
   resources:
@@ -573,7 +581,7 @@ spec:
           value: api.internal.minimal-ipv6.example.com
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
@@ -691,7 +699,7 @@ spec:
           value: api.internal.minimal-ipv6.example.com
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: config
         terminationMessagePolicy: FallbackToLogsOnError
@@ -710,7 +718,7 @@ spec:
           value: /run/cilium/cgroupv2
         - name: BIN_PATH
           value: /opt/cni/bin
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: mount-cgroup
         securityContext:
@@ -737,7 +745,7 @@ spec:
         env:
         - name: BIN_PATH
           value: /opt/cni/bin
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: apply-sysctl-overwrites
         securityContext:
@@ -761,7 +769,7 @@ spec:
         - /bin/bash
         - -c
         - --
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: mount-bpf-fs
         securityContext:
@@ -796,7 +804,7 @@ spec:
           value: api.internal.minimal-ipv6.example.com
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: clean-cilium-state
         securityContext:
@@ -821,7 +829,7 @@ spec:
           name: cilium-run
       - command:
         - /install-plugin.sh
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: install-cni-binaries
         resources:
@@ -984,7 +992,7 @@ spec:
           value: api.internal.minimal-ipv6.example.com
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/operator:v1.16.2
+        image: quay.io/cilium/operator:v1.16.3
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/...er/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data b/...er/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data
@@ -153,7 +153,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-warmpool.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 53DAgmSgxkT5LHbVOaS+ALQ9vJKa22trQltoyBX2Vho=
+NodeupConfigHash: hDw7GDccItBvn+jlc6WzJY9fsp/mwxeXHtMTGK8EWnY=
 
 __EOF_KUBE_ENV
 

diff --git a/...gration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content b/...gration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content
@@ -218,7 +218,7 @@ spec:
       sidecarIstioProxyImage: cilium/istio_proxy
       toFqdnsDnsRejectResponseCode: refused
       tunnel: vxlan
-      version: v1.16.2
+      version: v1.16.3
   nodeTerminationHandler:
     cpuRequest: 50m
     deleteSQSMsgIfNodeNotFound: false

diff --git a/...minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content b/...minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content
@@ -99,7 +99,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.16
     manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
-    manifestHash: a6ae74358c641db5a5283506a053e73cbb4e4008036e4fb9274e8978d8f34317
+    manifestHash: e20102c57059c105762a9e526913d54064345c7a6f462bb194481df9491b9e09
     name: networking.cilium.io
     needsRollingUpdate: all
     selector:

diff --git a/...a/aws_s3_object_minimal-warmpool.example.com-addons-networking.cilium.io-k8s-1.16_content b/...a/aws_s3_object_minimal-warmpool.example.com-addons-networking.cilium.io-k8s-1.16_content
@@ -218,6 +218,14 @@ rules:
   - list
   - watch
   - delete
+- apiGroups:
+  - ""
+  resourceNames:
+  - cilium-config
+  resources:
+  - configmaps
+  verbs:
+  - patch
 - apiGroups:
   - ""
   resources:
@@ -574,7 +582,7 @@ spec:
           value: api.internal.minimal-warmpool.example.com
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
@@ -692,7 +700,7 @@ spec:
           value: api.internal.minimal-warmpool.example.com
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: config
         terminationMessagePolicy: FallbackToLogsOnError
@@ -711,7 +719,7 @@ spec:
           value: /run/cilium/cgroupv2
         - name: BIN_PATH
           value: /opt/cni/bin
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: mount-cgroup
         securityContext:
@@ -738,7 +746,7 @@ spec:
         env:
         - name: BIN_PATH
           value: /opt/cni/bin
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: apply-sysctl-overwrites
         securityContext:
@@ -762,7 +770,7 @@ spec:
         - /bin/bash
         - -c
         - --
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: mount-bpf-fs
         securityContext:
@@ -797,7 +805,7 @@ spec:
           value: api.internal.minimal-warmpool.example.com
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: clean-cilium-state
         securityContext:
@@ -822,7 +830,7 @@ spec:
           name: cilium-run
       - command:
         - /install-plugin.sh
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: install-cni-binaries
         resources:
@@ -985,7 +993,7 @@ spec:
           value: api.internal.minimal-warmpool.example.com
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/operator:v1.16.2
+        image: quay.io/cilium/operator:v1.16.3
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/...integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content b/...integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content
@@ -64,7 +64,7 @@ containerdConfig:
 usesLegacyGossip: false
 usesNoneDNS: false
 warmPoolImages:
-- quay.io/cilium/cilium:v1.16.2
-- quay.io/cilium/operator:v1.16.2
+- quay.io/cilium/cilium:v1.16.3
+- quay.io/cilium/operator:v1.16.3
 - registry.k8s.io/kube-proxy:v1.26.0
 - registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.12
diff --git a/...gration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content b/...gration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content
@@ -199,7 +199,7 @@ spec:
       sidecarIstioProxyImage: cilium/istio_proxy
       toFqdnsDnsRejectResponseCode: refused
       tunnel: vxlan
-      version: v1.16.2
+      version: v1.16.3
   nonMasqueradeCIDR: 100.64.0.0/10
   podCIDR: 100.96.0.0/11
   secretStore: memfs://tests/scw-minimal.k8s.local/secrets

diff --git a/...luster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content b/...luster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content
@@ -55,7 +55,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.16
     manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
-    manifestHash: b69c067f22f597071237cf1fe1f3c0ebca9f76da1f3546b5e8e7fcc13e6f0c6b
+    manifestHash: 54bfa4260f0111b78afdae9dd0cded3f0cbb815b3f3104cbfbf71347edd96a4a
     name: networking.cilium.io
     needsRollingUpdate: all
     selector:

diff --git a/...way/data/aws_s3_object_scw-minimal.k8s.local-addons-networking.cilium.io-k8s-1.16_content b/...way/data/aws_s3_object_scw-minimal.k8s.local-addons-networking.cilium.io-k8s-1.16_content
@@ -218,6 +218,14 @@ rules:
   - list
   - watch
   - delete
+- apiGroups:
+  - ""
+  resourceNames:
+  - cilium-config
+  resources:
+  - configmaps
+  verbs:
+  - patch
 - apiGroups:
   - ""
   resources:
@@ -574,7 +582,7 @@ spec:
           value: api.internal.scw-minimal.k8s.local
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
@@ -692,7 +700,7 @@ spec:
           value: api.internal.scw-minimal.k8s.local
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: config
         terminationMessagePolicy: FallbackToLogsOnError
@@ -711,7 +719,7 @@ spec:
           value: /run/cilium/cgroupv2
         - name: BIN_PATH
           value: /opt/cni/bin
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: mount-cgroup
         securityContext:
@@ -738,7 +746,7 @@ spec:
         env:
         - name: BIN_PATH
           value: /opt/cni/bin
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: apply-sysctl-overwrites
         securityContext:
@@ -762,7 +770,7 @@ spec:
         - /bin/bash
         - -c
         - --
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: mount-bpf-fs
         securityContext:
@@ -797,7 +805,7 @@ spec:
           value: api.internal.scw-minimal.k8s.local
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: clean-cilium-state
         securityContext:
@@ -822,7 +830,7 @@ spec:
           name: cilium-run
       - command:
         - /install-plugin.sh
-        image: quay.io/cilium/cilium:v1.16.2
+        image: quay.io/cilium/cilium:v1.16.3
         imagePullPolicy: IfNotPresent
         name: install-cni-binaries
         resources:
@@ -985,7 +993,7 @@ spec:
           value: api.internal.scw-minimal.k8s.local
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/operator:v1.16.2
+        image: quay.io/cilium/operator:v1.16.3
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/...ration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content b/...ration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content
@@ -220,7 +220,7 @@ spec:
       sidecarIstioProxyImage: cilium/istio_proxy
       toFqdnsDnsRejectResponseCode: refused
       tunnel: disabled
-      version: v1.16.2
+      version: v1.16.3
   nodeTerminationHandler:
     cpuRequest: 50m
     deleteSQSMsgIfNodeNotFound: false

diff --git a/...r/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/...r/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
@@ -99,7 +99,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.16
     manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
-    manifestHash: eacf36b5df00f8e7b3244ef7eb019b0f73365645f5da5ffcd6f5a372b8624811
+    manifestHash: cee3b0b1d69ab6822b004ccada95ae75a9964e5edab73b7b9ad7cec349e7313b
     name: networking.cilium.io
     needsRollingUpdate: all
     selector: