From 527783562074223068acf46ebe5aa26029571e0c Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Thu, 4 Jan 2024 06:49:21 +0200 Subject: [PATCH 1/2] Update to Cilium 1.14.5 --- pkg/model/components/cilium.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/model/components/cilium.go b/pkg/model/components/cilium.go index 6b12303c79..431a1b6e56 100644 --- 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.3" + c.Version = "v1.14.5" } if c.EnableEndpointHealthChecking == nil { From 7f109ec9482f9a641731c54a258d98ce18106ea8 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Thu, 4 Jan 2024 06:56:47 +0200 Subject: [PATCH 2/2] hack/update-expected.sh --- .../aws_s3_object_cluster-completed.spec_content | 2 +- ...mal-ipv6.example.com-addons-bootstrap_content | 2 +- ...-addons-networking.cilium.io-k8s-1.16_content | 14 +++++++------- ..._nodes.minimal-warmpool.example.com_user_data | 2 +- .../aws_s3_object_cluster-completed.spec_content | 2 +- ...warmpool.example.com-addons-bootstrap_content | 2 +- ...-addons-networking.cilium.io-k8s-1.16_content | 14 +++++++------- .../aws_s3_object_nodeupconfig-nodes_content | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 2 +- ...cw-minimal.k8s.local-addons-bootstrap_content | 2 +- ...-addons-networking.cilium.io-k8s-1.16_content | 14 +++++++------- .../aws_s3_object_cluster-completed.spec_content | 2 +- ...tecilium.example.com-addons-bootstrap_content | 2 +- ...-addons-networking.cilium.io-k8s-1.16_content | 14 +++++++------- .../aws_s3_object_cluster-completed.spec_content | 2 +- ...tecilium.example.com-addons-bootstrap_content | 2 +- ...-addons-networking.cilium.io-k8s-1.16_content | 14 +++++++------- .../aws_s3_object_cluster-completed.spec_content | 2 +- ...tecilium.example.com-addons-bootstrap_content | 2 +- ...-addons-networking.cilium.io-k8s-1.16_content | 16 ++++++++-------- .../aws_s3_object_cluster-completed.spec_content | 2 +- ...advanced.example.com-addons-bootstrap_content | 2 +- ...-addons-networking.cilium.io-k8s-1.16_content | 14 +++++++------- .../bootstrapchannelbuilder/cilium/manifest.yaml | 2 +- .../metrics-server/insecure-1.19/manifest.yaml | 2 +- .../metrics-server/secure-1.19/manifest.yaml | 2 +- 26 files changed, 70 insertions(+), 70 deletions(-) diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content index 465fc518e0..501b25459c 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/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.3 + version: v1.14.5 nodeTerminationHandler: cpuRequest: 50m enableRebalanceDraining: false diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index bf955b0290..ad9ee7fb35 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/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.14.yaml - manifestHash: 5e9537b8396c3b141b62b590b619883148d224463969f32eddd9af9601e7b79e + manifestHash: cbf85fa595d03844fafb8ec97ec50991e23707cd08ab01002633d86a3cb2994d name: networking.cilium.io needsRollingUpdate: all selector: diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.cilium.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.cilium.io-k8s-1.16_content index 96533389f8..f76eba310a 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.cilium.io-k8s-1.16_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/operator:v1.14.5 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data index ca7185ba70..28470cfb43 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/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: F51JcVCcbKNvYtbcbv5fdY4BtjPvuu+FhXbTduo/jQk= +NodeupConfigHash: 6kTfJQ6yLcxGIGsuwVUBRcHKggh7GlzSCb7AnSvJIO0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content index 0c99e5f212..3b4fa9f362 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/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.3 + version: v1.14.5 nodeTerminationHandler: cpuRequest: 50m enableRebalanceDraining: false diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content index 81c10807db..fd872d86f1 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/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.14.yaml - manifestHash: d939c9dc17f34da1cf748f890373d6c0d474f5a08e022306c2feaa9f116f2781 + manifestHash: 2f93b30904260d1ec3b6767a3a9588da2bb210358d1b04896e4278351bc2d931 name: networking.cilium.io needsRollingUpdate: all selector: diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-networking.cilium.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-networking.cilium.io-k8s-1.16_content index 75f3628afa..572179c0c4 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-networking.cilium.io-k8s-1.16_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/operator:v1.14.5 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content index b6f5541a51..b5ce8e1996 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/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.3 -- quay.io/cilium/operator:v1.14.3 +- quay.io/cilium/cilium:v1.14.5 +- quay.io/cilium/operator:v1.14.5 - 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_scaleway/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content index 1efebf0d00..de1f729559 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/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.3 + version: v1.14.5 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://tests/scw-minimal.k8s.local/secrets diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content index d64d84c7b6..4026d37bdc 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content +++ b/tests/integration/update_cluster/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.14.yaml - manifestHash: 5ecc7aca559459d06d6474991ec3b6e034f75834c971213fec620aeafe31eb71 + manifestHash: 10c38ce4e002e3ec8ce1b5b8295345b6ac0ea3c119f9d58b916bf38f1bd1b9e1 name: networking.cilium.io needsRollingUpdate: all selector: diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-networking.cilium.io-k8s-1.16_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-networking.cilium.io-k8s-1.16_content index e78ea075fc..7c0e6ff0dc 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-networking.cilium.io-k8s-1.16_content +++ b/tests/integration/update_cluster/minimal_scaleway/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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/cilium:v1.14.5 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.3 + image: quay.io/cilium/operator:v1.14.5 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content index e5b5d2c70c..911672d2a9 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/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.3 + version: v1.14.5 nodeTerminationHandler: cpuRequest: 50m enableRebalanceDraining: false diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content index b605ef3a14..db5b3ba7ee 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/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.14.yaml - manifestHash: dc0ffacc5b54ff7ce6d48ad648b291624ae47bbd80cbdd5268f48bc866a6cf3e + manifestHash: ae82c21f5fc8e0885ceedf83050da9d0c733d50cedd7d145a806294338ec25f1 name: networking.cilium.io needsRollingUpdate: all selector: diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content index 1eb13148b5..e4d80b537b 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content @@ -553,7 +553,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent lifecycle: postStart: @@ -675,7 +675,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: config terminationMessagePolicy: FallbackToLogsOnError @@ -694,7 +694,7 @@ spec: value: /run/cilium/cgroupv2 - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: mount-cgroup securityContext: @@ -715,7 +715,7 @@ spec: env: - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: apply-sysctl-overwrites securityContext: @@ -745,7 +745,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -762,7 +762,7 @@ spec: name: cilium-run - command: - /install-plugin.sh - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: install-cni-binaries resources: @@ -917,7 +917,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/operator:v1.14.3 + image: quay.io/cilium/operator:v1.14.5 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content index 14098c5667..38fe4e6ebe 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content @@ -228,7 +228,7 @@ spec: sidecarIstioProxyImage: cilium/istio_proxy toFqdnsDnsRejectResponseCode: refused tunnel: vxlan - version: v1.14.3 + version: v1.14.5 nodeTerminationHandler: cpuRequest: 50m enableRebalanceDraining: false diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content index afbfd3f33d..8fbd27fd12 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecilium/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.14.yaml - manifestHash: 0d92f3aaa5fcfde3239fba0d07f4d264580c460d4a5e9c2463f8e2b20434c479 + manifestHash: 25e0a4c6c9a226bb3a53cfb812bea651cd454f3ea8de08a6035e9a5bcebd3e7f name: networking.cilium.io needsRollingUpdate: all selector: diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content index d942bc1c28..31014e9fd1 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content @@ -555,7 +555,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -652,7 +652,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: config terminationMessagePolicy: FallbackToLogsOnError @@ -671,7 +671,7 @@ spec: value: /run/cilium/cgroupv2 - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: mount-cgroup securityContext: @@ -692,7 +692,7 @@ spec: env: - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: apply-sysctl-overwrites securityContext: @@ -722,7 +722,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -739,7 +739,7 @@ spec: name: cilium-run - command: - /install-plugin.sh - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: install-cni-binaries resources: @@ -898,7 +898,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/operator:v1.14.3 + image: quay.io/cilium/operator:v1.14.5 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content index ae96af29df..080f7eaf9d 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content @@ -229,7 +229,7 @@ spec: sidecarIstioProxyImage: cilium/istio_proxy toFqdnsDnsRejectResponseCode: refused tunnel: vxlan - version: v1.14.3 + version: v1.14.5 nodeTerminationHandler: cpuRequest: 50m enableRebalanceDraining: false diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content index bff8b07063..4c95b4e8e8 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content @@ -162,7 +162,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.cilium.io/k8s-1.16-v1.14.yaml - manifestHash: 3d77641c2e3c89adfb55bf74f41d865e0af29ff859eb75b2795cbe915d73b827 + manifestHash: b1031b2a99a5d029d69e119fed152af22f194927b03631d87baf1cc97fd07e20 name: networking.cilium.io needsPKI: true needsRollingUpdate: all diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content index d1a728fedf..121a739394 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content @@ -774,7 +774,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -878,7 +878,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: config terminationMessagePolicy: FallbackToLogsOnError @@ -897,7 +897,7 @@ spec: value: /run/cilium/cgroupv2 - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: mount-cgroup securityContext: @@ -918,7 +918,7 @@ spec: env: - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: apply-sysctl-overwrites securityContext: @@ -948,7 +948,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -965,7 +965,7 @@ spec: name: cilium-run - command: - /install-plugin.sh - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: install-cni-binaries resources: @@ -1127,7 +1127,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/operator:v1.14.3 + image: quay.io/cilium/operator:v1.14.5 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -1221,7 +1221,7 @@ spec: - serve command: - hubble-relay - image: quay.io/cilium/hubble-relay:v1.14.3 + image: quay.io/cilium/hubble-relay:v1.14.5 imagePullPolicy: IfNotPresent livenessProbe: tcpSocket: diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content index 441e6bf0f6..7cbed2bf50 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content @@ -232,7 +232,7 @@ spec: sidecarIstioProxyImage: cilium/istio_proxy toFqdnsDnsRejectResponseCode: refused tunnel: disabled - version: v1.14.3 + version: v1.14.5 nodeTerminationHandler: cpuRequest: 50m enableRebalanceDraining: false diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content index 0963e63c22..2d8e6dd449 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.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.14.yaml - manifestHash: 1dc85a0c4d6148f60695875f169977272f69564eb1ee8a5cf6c4c7687376449d + manifestHash: e58b7a1c93353dabd67ee86769b6408009712bbe5747739c7950995a34c68f02 name: networking.cilium.io needsRollingUpdate: all selector: diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-networking.cilium.io-k8s-1.16_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-networking.cilium.io-k8s-1.16_content index 65c81dd427..47a15c28fd 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-networking.cilium.io-k8s-1.16_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-networking.cilium.io-k8s-1.16_content @@ -564,7 +564,7 @@ spec: value: api.internal.privateciliumadvanced.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent lifecycle: postStart: @@ -692,7 +692,7 @@ spec: value: api.internal.privateciliumadvanced.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: config terminationMessagePolicy: FallbackToLogsOnError @@ -711,7 +711,7 @@ spec: value: /run/cilium/cgroupv2 - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: mount-cgroup securityContext: @@ -732,7 +732,7 @@ spec: env: - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: apply-sysctl-overwrites securityContext: @@ -762,7 +762,7 @@ spec: value: api.internal.privateciliumadvanced.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -779,7 +779,7 @@ spec: name: cilium-run - command: - /install-plugin.sh - image: quay.io/cilium/cilium:v1.14.3 + image: quay.io/cilium/cilium:v1.14.5 imagePullPolicy: IfNotPresent name: install-cni-binaries resources: @@ -945,7 +945,7 @@ spec: value: api.internal.privateciliumadvanced.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/operator:v1.14.3 + image: quay.io/cilium/operator:v1.14.5 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml index af41c28557..0f532a7741 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -99,7 +99,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.cilium.io/k8s-1.16-v1.14.yaml - manifestHash: 2f32492b13ce87032e506c9b7977b78214ee645513c92b6fa7668df8022fd183 + manifestHash: bea39c087cdd515eee7f7a490bf94c8f16c493db8d528312775f3afb46ede821 name: networking.cilium.io needsRollingUpdate: all selector: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml index 2df820cb92..7bd317f3bf 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.cilium.io/k8s-1.16-v1.14.yaml - manifestHash: 2f32492b13ce87032e506c9b7977b78214ee645513c92b6fa7668df8022fd183 + manifestHash: bea39c087cdd515eee7f7a490bf94c8f16c493db8d528312775f3afb46ede821 name: networking.cilium.io needsRollingUpdate: all selector: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml index 906df3959c..9920d95627 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml @@ -170,7 +170,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.cilium.io/k8s-1.16-v1.14.yaml - manifestHash: 2f32492b13ce87032e506c9b7977b78214ee645513c92b6fa7668df8022fd183 + manifestHash: bea39c087cdd515eee7f7a490bf94c8f16c493db8d528312775f3afb46ede821 name: networking.cilium.io needsRollingUpdate: all selector: