Merge pull request #16315 from zadjadr/chore/cilium-1.15

Update to cilium 1.15
kubernetes · Feb 3, 2024 · 90fa037 · 90fa037
2 parents 1867006 + f3574c9
commit 90fa037
Show file tree

Hide file tree

Showing 38 changed files with 94 additions and 97 deletions.
diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go
@@ -1260,8 +1260,8 @@ func validateNetworkingCilium(cluster *kops.Cluster, v *kops.CiliumNetworkingSpe
 			allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Could not parse as semantic version"))
 		}
 
-		if version.Minor != 14 {
-			allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only version 1.14 is supported"))
+		if version.Minor != 15 {
+			allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only version 1.15 is supported"))
 		}
 
 		if v.Hubble != nil && fi.ValueOf(v.Hubble.Enabled) {

diff --git a/pkg/apis/kops/validation/validation_test.go b/pkg/apis/kops/validation/validation_test.go
@@ -1023,7 +1023,7 @@ func Test_Validate_Cilium(t *testing.T) {
 		},
 		{
 			Cilium: kops.CiliumNetworkingSpec{
-				Version: "v1.14.3",
+				Version: "v1.15.0",
 				Ingress: &kops.CiliumIngressSpec{
 					Enabled:                 fi.PtrTo(true),
 					DefaultLoadBalancerMode: "bad-value",
@@ -1033,7 +1033,7 @@ func Test_Validate_Cilium(t *testing.T) {
 		},
 		{
 			Cilium: kops.CiliumNetworkingSpec{
-				Version: "v1.14.3",
+				Version: "v1.15.0",
 				Ingress: &kops.CiliumIngressSpec{
 					Enabled:                 fi.PtrTo(true),
 					DefaultLoadBalancerMode: "dedicated",
@@ -1042,7 +1042,7 @@ func Test_Validate_Cilium(t *testing.T) {
 		},
 		{
 			Cilium: kops.CiliumNetworkingSpec{
-				Version: "v1.14.3",
+				Version: "v1.15.0",
 				Hubble: &kops.HubbleSpec{
 					Enabled: fi.PtrTo(true),
 				},

diff --git a/pkg/model/components/cilium.go b/pkg/model/components/cilium.go
@@ -40,7 +40,7 @@ func (b *CiliumOptionsBuilder) BuildOptions(o interface{}) error {
 	}
 
 	if c.Version == "" {
-		c.Version = "v1.14.5"
+		c.Version = "v1.15.0"
 	}
 
 	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.14.5
+      version: v1.15.0
   nodeTerminationHandler:
     cpuRequest: 50m
     enableRebalanceDraining: 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
@@ -105,8 +105,8 @@ spec:
       k8s-addon: storage-aws.addons.k8s.io
     version: 9.99.0
   - id: k8s-1.16
-    manifest: networking.cilium.io/k8s-1.16-v1.14.yaml
-    manifestHash: cbf85fa595d03844fafb8ec97ec50991e23707cd08ab01002633d86a3cb2994d
+    manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
+    manifestHash: bcc977da60fb16ad50f906d51d4bf623e99fc253286d71690e526f4101d94f27
     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
@@ -550,7 +550,7 @@ spec:
           value: api.internal.minimal-ipv6.example.com
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
@@ -647,7 +647,7 @@ spec:
           value: api.internal.minimal-ipv6.example.com
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         name: config
         terminationMessagePolicy: FallbackToLogsOnError
@@ -666,7 +666,7 @@ spec:
           value: /run/cilium/cgroupv2
         - name: BIN_PATH
           value: /opt/cni/bin
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         name: mount-cgroup
         securityContext:
@@ -687,7 +687,7 @@ spec:
         env:
         - name: BIN_PATH
           value: /opt/cni/bin
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         name: apply-sysctl-overwrites
         securityContext:
@@ -717,7 +717,7 @@ spec:
           value: api.internal.minimal-ipv6.example.com
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         name: clean-cilium-state
         securityContext:
@@ -734,7 +734,7 @@ spec:
           name: cilium-run
       - command:
         - /install-plugin.sh
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         name: install-cni-binaries
         resources:
@@ -889,7 +889,7 @@ spec:
           value: api.internal.minimal-ipv6.example.com
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/operator:v1.14.5
+        image: quay.io/cilium/operator:v1.15.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf b/tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf
@@ -944,7 +944,7 @@ resource "aws_s3_object" "minimal-ipv6-example-com-addons-limit-range-addons-k8s
 resource "aws_s3_object" "minimal-ipv6-example-com-addons-networking-cilium-io-k8s-1-16" {
   bucket                 = "testingBucket"
   content                = file("${path.module}/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.cilium.io-k8s-1.16_content")
-  key                    = "clusters.example.com/minimal-ipv6.example.com/addons/networking.cilium.io/k8s-1.16-v1.14.yaml"
+  key                    = "clusters.example.com/minimal-ipv6.example.com/addons/networking.cilium.io/k8s-1.16-v1.15.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }

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
@@ -151,7 +151,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-warmpool.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 6kTfJQ6yLcxGIGsuwVUBRcHKggh7GlzSCb7AnSvJIO0=
+NodeupConfigHash: 5Ce/EF8HWNsDqPr1g5h9y/CqYhDGQ0fIaojWkfmYM/o=
 
 __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.14.5
+      version: v1.15.0
   nodeTerminationHandler:
     cpuRequest: 50m
     enableRebalanceDraining: 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
@@ -98,8 +98,8 @@ spec:
       k8s-addon: storage-aws.addons.k8s.io
     version: 9.99.0
   - id: k8s-1.16
-    manifest: networking.cilium.io/k8s-1.16-v1.14.yaml
-    manifestHash: 2f93b30904260d1ec3b6767a3a9588da2bb210358d1b04896e4278351bc2d931
+    manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
+    manifestHash: d706711e81a214a90815115470eb9f0c6ee8d5aa67402b64178dfed3802a692f
     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
@@ -551,7 +551,7 @@ spec:
           value: api.internal.minimal-warmpool.example.com
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
@@ -648,7 +648,7 @@ spec:
           value: api.internal.minimal-warmpool.example.com
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         name: config
         terminationMessagePolicy: FallbackToLogsOnError
@@ -667,7 +667,7 @@ spec:
           value: /run/cilium/cgroupv2
         - name: BIN_PATH
           value: /opt/cni/bin
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         name: mount-cgroup
         securityContext:
@@ -688,7 +688,7 @@ spec:
         env:
         - name: BIN_PATH
           value: /opt/cni/bin
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         name: apply-sysctl-overwrites
         securityContext:
@@ -718,7 +718,7 @@ spec:
           value: api.internal.minimal-warmpool.example.com
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         name: clean-cilium-state
         securityContext:
@@ -735,7 +735,7 @@ spec:
           name: cilium-run
       - command:
         - /install-plugin.sh
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         name: install-cni-binaries
         resources:
@@ -890,7 +890,7 @@ spec:
           value: api.internal.minimal-warmpool.example.com
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/operator:v1.14.5
+        image: quay.io/cilium/operator:v1.15.0
         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
@@ -60,7 +60,7 @@ containerdConfig:
 usesLegacyGossip: false
 usesNoneDNS: false
 warmPoolImages:
-- quay.io/cilium/cilium:v1.14.5
-- quay.io/cilium/operator:v1.14.5
+- quay.io/cilium/cilium:v1.15.0
+- quay.io/cilium/operator:v1.15.0
 - registry.k8s.io/kube-proxy:v1.26.0
 - registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6
diff --git a/tests/integration/update_cluster/minimal-warmpool/kubernetes.tf b/tests/integration/update_cluster/minimal-warmpool/kubernetes.tf
@@ -712,7 +712,7 @@ resource "aws_s3_object" "minimal-warmpool-example-com-addons-limit-range-addons
 resource "aws_s3_object" "minimal-warmpool-example-com-addons-networking-cilium-io-k8s-1-16" {
   bucket                 = "testingBucket"
   content                = file("${path.module}/data/aws_s3_object_minimal-warmpool.example.com-addons-networking.cilium.io-k8s-1.16_content")
-  key                    = "clusters.example.com/minimal-warmpool.example.com/addons/networking.cilium.io/k8s-1.16-v1.14.yaml"
+  key                    = "clusters.example.com/minimal-warmpool.example.com/addons/networking.cilium.io/k8s-1.16-v1.15.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }

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.14.5
+      version: v1.15.0
   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
@@ -54,8 +54,8 @@ spec:
       k8s-addon: scaleway-csi-driver.addons.k8s.io
     version: 9.99.0
   - id: k8s-1.16
-    manifest: networking.cilium.io/k8s-1.16-v1.14.yaml
-    manifestHash: 10c38ce4e002e3ec8ce1b5b8295345b6ac0ea3c119f9d58b916bf38f1bd1b9e1
+    manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
+    manifestHash: 96ff7a35d4c953b7cba928eb52b7ce5265782e18eeadf258f78f372c22abe97a
     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
@@ -551,7 +551,7 @@ spec:
           value: api.internal.scw-minimal.k8s.local
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
@@ -648,7 +648,7 @@ spec:
           value: api.internal.scw-minimal.k8s.local
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         name: config
         terminationMessagePolicy: FallbackToLogsOnError
@@ -667,7 +667,7 @@ spec:
           value: /run/cilium/cgroupv2
         - name: BIN_PATH
           value: /opt/cni/bin
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         name: mount-cgroup
         securityContext:
@@ -688,7 +688,7 @@ spec:
         env:
         - name: BIN_PATH
           value: /opt/cni/bin
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         name: apply-sysctl-overwrites
         securityContext:
@@ -718,7 +718,7 @@ spec:
           value: api.internal.scw-minimal.k8s.local
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         name: clean-cilium-state
         securityContext:
@@ -735,7 +735,7 @@ spec:
           name: cilium-run
       - command:
         - /install-plugin.sh
-        image: quay.io/cilium/cilium:v1.14.5
+        image: quay.io/cilium/cilium:v1.15.0
         imagePullPolicy: IfNotPresent
         name: install-cni-binaries
         resources:
@@ -890,7 +890,7 @@ spec:
           value: api.internal.scw-minimal.k8s.local
         - name: KUBERNETES_SERVICE_PORT
           value: "443"
-        image: quay.io/cilium/operator:v1.14.5
+        image: quay.io/cilium/operator:v1.15.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/tests/integration/update_cluster/minimal_scaleway/kubernetes.tf b/tests/integration/update_cluster/minimal_scaleway/kubernetes.tf
@@ -149,7 +149,7 @@ resource "aws_s3_object" "scw-minimal-k8s-local-addons-limit-range-addons-k8s-io
 resource "aws_s3_object" "scw-minimal-k8s-local-addons-networking-cilium-io-k8s-1-16" {
   bucket                 = "testingBucket"
   content                = file("${path.module}/data/aws_s3_object_scw-minimal.k8s.local-addons-networking.cilium.io-k8s-1.16_content")
-  key                    = "tests/scw-minimal.k8s.local/addons/networking.cilium.io/k8s-1.16-v1.14.yaml"
+  key                    = "tests/scw-minimal.k8s.local/addons/networking.cilium.io/k8s-1.16-v1.15.yaml"
   provider               = aws.files
   server_side_encryption = "AES256"
 }

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.14.5
+      version: v1.15.0
   nodeTerminationHandler:
     cpuRequest: 50m
     enableRebalanceDraining: 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
@@ -98,8 +98,8 @@ spec:
       k8s-addon: storage-aws.addons.k8s.io
     version: 9.99.0
   - id: k8s-1.16
-    manifest: networking.cilium.io/k8s-1.16-v1.14.yaml
-    manifestHash: ae82c21f5fc8e0885ceedf83050da9d0c733d50cedd7d145a806294338ec25f1
+    manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
+    manifestHash: 175fd5607aa768302886721f5a20a84184f680b7e557a65d2846dac93adcc5dc
     name: networking.cilium.io
     needsRollingUpdate: all
     selector: