From 637e8c46d011508161df1a8f57ca8b30c9a14a15 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Mon, 6 Jan 2025 09:55:48 +0200 Subject: [PATCH 1/2] Update Cilium to v1.16.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 6a6916c798328..b12a70f613e2d 100644 --- 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.3" + c.Version = "v1.16.5" } if c.EnableEndpointHealthChecking == nil { From d76e78f5f3a62164d07bd44e51f18d267d3eefe8 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Mon, 6 Jan 2025 09:58:11 +0200 Subject: [PATCH 2/2] hack/update-expected.sh --- ...ws_s3_object_cluster-completed.spec_content | 2 +- ...l-ipv6.example.com-addons-bootstrap_content | 2 +- ...ddons-networking.cilium.io-k8s-1.16_content | 16 ++++++++-------- ...odes.minimal-warmpool.example.com_user_data | 2 +- ...ws_s3_object_cluster-completed.spec_content | 2 +- ...rmpool.example.com-addons-bootstrap_content | 2 +- ...ddons-networking.cilium.io-k8s-1.16_content | 16 ++++++++-------- .../aws_s3_object_nodeupconfig-nodes_content | 4 ++-- ...ws_s3_object_cluster-completed.spec_content | 2 +- ...-minimal.k8s.local-addons-bootstrap_content | 2 +- ...ddons-networking.cilium.io-k8s-1.16_content | 16 ++++++++-------- ...ws_s3_object_cluster-completed.spec_content | 2 +- ...cilium.example.com-addons-bootstrap_content | 2 +- ...ddons-networking.cilium.io-k8s-1.16_content | 16 ++++++++-------- ...ws_s3_object_cluster-completed.spec_content | 2 +- ...cilium.example.com-addons-bootstrap_content | 2 +- ...ddons-networking.cilium.io-k8s-1.16_content | 16 ++++++++-------- ...ws_s3_object_cluster-completed.spec_content | 2 +- ...cilium.example.com-addons-bootstrap_content | 2 +- ...ddons-networking.cilium.io-k8s-1.16_content | 18 +++++++++--------- ...ws_s3_object_cluster-completed.spec_content | 2 +- ...vanced.example.com-addons-bootstrap_content | 2 +- ...ddons-networking.cilium.io-k8s-1.16_content | 16 ++++++++-------- .../cilium/manifest.yaml | 2 +- .../metrics-server/insecure-1.19/manifest.yaml | 2 +- .../metrics-server/secure-1.19/manifest.yaml | 2 +- 26 files changed, 77 insertions(+), 77 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 2c7a2ffea8866..4daf5ff42e0e2 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 @@ -227,7 +227,7 @@ spec: sidecarIstioProxyImage: cilium/istio_proxy toFqdnsDnsRejectResponseCode: refused tunnel: disabled - version: v1.16.3 + version: v1.16.5 nodeTerminationHandler: cpuRequest: 50m deleteSQSMsgIfNodeNotFound: 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 d265c44f6358a..9e7f0d1e80e8f 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.15.yaml - manifestHash: 3dec2f27921f9e61bd722d058ec85a68e459d1fe3f09055ef9d8b03acf1a55dd + manifestHash: ec67d5e19b40dc4ec1c07fe956904c93630ef98a1f93cfd9c6eb9004c8e050ea 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 2e4070cde68df..3b37162a2ad56 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 @@ -582,7 +582,7 @@ spec: value: api.internal.minimal-ipv6.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -700,7 +700,7 @@ spec: value: api.internal.minimal-ipv6.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: config terminationMessagePolicy: FallbackToLogsOnError @@ -719,7 +719,7 @@ spec: value: /run/cilium/cgroupv2 - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: mount-cgroup securityContext: @@ -746,7 +746,7 @@ spec: env: - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: apply-sysctl-overwrites securityContext: @@ -770,7 +770,7 @@ spec: - /bin/bash - -c - -- - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: mount-bpf-fs securityContext: @@ -805,7 +805,7 @@ spec: value: api.internal.minimal-ipv6.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -830,7 +830,7 @@ spec: name: cilium-run - command: - /install-plugin.sh - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: install-cni-binaries resources: @@ -993,7 +993,7 @@ spec: value: api.internal.minimal-ipv6.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/operator:v1.16.3 + image: quay.io/cilium/operator:v1.16.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 c0ebc717328d0..3823f68cdf66f 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal-warmpool.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: hDw7GDccItBvn+jlc6WzJY9fsp/mwxeXHtMTGK8EWnY= +NodeupConfigHash: CrKN+2s86J9XP6beZL08+/dOp8xaeEYWKVhWt2hLo68= __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 ac75a5fa17b61..b70c35128617e 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 @@ -219,7 +219,7 @@ spec: sidecarIstioProxyImage: cilium/istio_proxy toFqdnsDnsRejectResponseCode: refused tunnel: vxlan - version: v1.16.3 + version: v1.16.5 nodeTerminationHandler: cpuRequest: 50m deleteSQSMsgIfNodeNotFound: 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 262399b27a641..ba2ae05f72ebc 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.15.yaml - manifestHash: bc7f7e8765ce60f4a51faa622445f05312d6f6ff5c2cdae2bbc2b7fdaabf35fa + manifestHash: 79c3afa98cfb90c97da58bbc799657538111c520785c9191ceabcacd65890cd3 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 f13f88cafb2da..ef3b67c1f828f 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 @@ -583,7 +583,7 @@ spec: value: api.internal.minimal-warmpool.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -701,7 +701,7 @@ spec: value: api.internal.minimal-warmpool.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: config terminationMessagePolicy: FallbackToLogsOnError @@ -720,7 +720,7 @@ spec: value: /run/cilium/cgroupv2 - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: mount-cgroup securityContext: @@ -747,7 +747,7 @@ spec: env: - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: apply-sysctl-overwrites securityContext: @@ -771,7 +771,7 @@ spec: - /bin/bash - -c - -- - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: mount-bpf-fs securityContext: @@ -806,7 +806,7 @@ spec: value: api.internal.minimal-warmpool.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -831,7 +831,7 @@ spec: name: cilium-run - command: - /install-plugin.sh - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: install-cni-binaries resources: @@ -994,7 +994,7 @@ spec: value: api.internal.minimal-warmpool.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/operator:v1.16.3 + image: quay.io/cilium/operator:v1.16.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 1424a52b07c2f..88cfca103438e 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 @@ -64,7 +64,7 @@ containerdConfig: usesLegacyGossip: false usesNoneDNS: false warmPoolImages: -- quay.io/cilium/cilium:v1.16.3 -- quay.io/cilium/operator:v1.16.3 +- quay.io/cilium/cilium:v1.16.5 +- quay.io/cilium/operator:v1.16.5 - registry.k8s.io/kube-proxy:v1.26.0 - registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.12 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 857d2dccaae70..b5096f5f4568b 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 @@ -200,7 +200,7 @@ spec: sidecarIstioProxyImage: cilium/istio_proxy toFqdnsDnsRejectResponseCode: refused tunnel: vxlan - version: v1.16.3 + version: v1.16.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 5b36954851743..8ff915459a0a2 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.15.yaml - manifestHash: b09e39b605118cc04f98b48d24b0fa6c88487b04a0108574a61692c222f68e1b + manifestHash: b8ff520e1fab86258a9119be0ce2e56d2975f8658db16d6fb74ebd5a62daa24d 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 04d9fd7d83d8c..f9f134df6bb78 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 @@ -583,7 +583,7 @@ spec: value: api.internal.scw-minimal.k8s.local - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -701,7 +701,7 @@ spec: value: api.internal.scw-minimal.k8s.local - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: config terminationMessagePolicy: FallbackToLogsOnError @@ -720,7 +720,7 @@ spec: value: /run/cilium/cgroupv2 - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: mount-cgroup securityContext: @@ -747,7 +747,7 @@ spec: env: - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: apply-sysctl-overwrites securityContext: @@ -771,7 +771,7 @@ spec: - /bin/bash - -c - -- - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: mount-bpf-fs securityContext: @@ -806,7 +806,7 @@ spec: value: api.internal.scw-minimal.k8s.local - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -831,7 +831,7 @@ spec: name: cilium-run - command: - /install-plugin.sh - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: install-cni-binaries resources: @@ -994,7 +994,7 @@ spec: value: api.internal.scw-minimal.k8s.local - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/operator:v1.16.3 + image: quay.io/cilium/operator:v1.16.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 6ee353486dee7..262f5fdac94ae 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 @@ -221,7 +221,7 @@ spec: sidecarIstioProxyImage: cilium/istio_proxy toFqdnsDnsRejectResponseCode: refused tunnel: disabled - version: v1.16.3 + version: v1.16.5 nodeTerminationHandler: cpuRequest: 50m deleteSQSMsgIfNodeNotFound: 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 16a72837cdf0f..400e74292b0ee 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.15.yaml - manifestHash: f7612a95ce7e6eb6c7f4aff40ef362372345b45c4697b46ef78f5518d279e566 + manifestHash: adccc130fb74a2aaf5784d76e54f1798aff3fd51e4e1aea1ed3a567d37d79a5f 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 55cf6eec3c684..865f53e73c81e 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 @@ -585,7 +585,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent lifecycle: postStart: @@ -728,7 +728,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: config terminationMessagePolicy: FallbackToLogsOnError @@ -747,7 +747,7 @@ spec: value: /run/cilium/cgroupv2 - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: mount-cgroup securityContext: @@ -774,7 +774,7 @@ spec: env: - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: apply-sysctl-overwrites securityContext: @@ -798,7 +798,7 @@ spec: - /bin/bash - -c - -- - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: mount-bpf-fs securityContext: @@ -833,7 +833,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -858,7 +858,7 @@ spec: name: cilium-run - command: - /install-plugin.sh - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: install-cni-binaries resources: @@ -1021,7 +1021,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/operator:v1.16.3 + image: quay.io/cilium/operator:v1.16.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 9bd83a3457546..bd7754a1334d2 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 @@ -229,7 +229,7 @@ spec: sidecarIstioProxyImage: cilium/istio_proxy toFqdnsDnsRejectResponseCode: refused tunnel: vxlan - version: v1.16.3 + version: v1.16.5 nodeTerminationHandler: cpuRequest: 50m deleteSQSMsgIfNodeNotFound: 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 6b580fc27d422..a67ab91a65101 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.15.yaml - manifestHash: 36722e061be4bc322c060c5b28ebe41678b94361e32327bf652b53ef316972f0 + manifestHash: bb8ab0eb9b524b3d24f1c4d6ce49f16897cf7160d4e8551b2100833d592a5fca 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 d2a8e064ce607..6096f705d9dcc 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 @@ -586,7 +586,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -704,7 +704,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: config terminationMessagePolicy: FallbackToLogsOnError @@ -723,7 +723,7 @@ spec: value: /run/cilium/cgroupv2 - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: mount-cgroup securityContext: @@ -750,7 +750,7 @@ spec: env: - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: apply-sysctl-overwrites securityContext: @@ -774,7 +774,7 @@ spec: - /bin/bash - -c - -- - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: mount-bpf-fs securityContext: @@ -809,7 +809,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -834,7 +834,7 @@ spec: name: cilium-run - command: - /install-plugin.sh - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: install-cni-binaries resources: @@ -1001,7 +1001,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/operator:v1.16.3 + image: quay.io/cilium/operator:v1.16.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 af5330ec0515d..d17ff2fe0870f 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 @@ -226,7 +226,7 @@ spec: sidecarIstioProxyImage: cilium/istio_proxy toFqdnsDnsRejectResponseCode: refused tunnel: vxlan - version: v1.16.3 + version: v1.16.5 nodeTerminationHandler: cpuRequest: 50m deleteSQSMsgIfNodeNotFound: 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 c27b43fc5a0b3..e1fa127132864 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 @@ -155,7 +155,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: networking.cilium.io/k8s-1.16-v1.15.yaml - manifestHash: ac9d01d0a3554b4774f2fd65840adaaae75b8512fcba39a487b80741e99de7c1 + manifestHash: a634b1417a8cda30b27d6167bad863baccffcd5944662aa73f2afee23c3f6d0d 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 7138afed8bff8..e091f89583a32 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 @@ -837,7 +837,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -966,7 +966,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: config terminationMessagePolicy: FallbackToLogsOnError @@ -985,7 +985,7 @@ spec: value: /run/cilium/cgroupv2 - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: mount-cgroup securityContext: @@ -1012,7 +1012,7 @@ spec: env: - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: apply-sysctl-overwrites securityContext: @@ -1036,7 +1036,7 @@ spec: - /bin/bash - -c - -- - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: mount-bpf-fs securityContext: @@ -1071,7 +1071,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -1096,7 +1096,7 @@ spec: name: cilium-run - command: - /install-plugin.sh - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: install-cni-binaries resources: @@ -1273,7 +1273,7 @@ spec: value: api.internal.privatecilium.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/operator:v1.16.3 + image: quay.io/cilium/operator:v1.16.5 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -1377,7 +1377,7 @@ spec: - serve command: - hubble-relay - image: quay.io/cilium/hubble-relay:v1.16.3 + image: quay.io/cilium/hubble-relay:v1.16.5 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 12 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 edb18900b7c4f..05c44540aca87 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 @@ -233,7 +233,7 @@ spec: sidecarIstioProxyImage: cilium/istio_proxy toFqdnsDnsRejectResponseCode: refused tunnel: disabled - version: v1.16.3 + version: v1.16.5 nodeTerminationHandler: cpuRequest: 50m deleteSQSMsgIfNodeNotFound: 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 55db92767aee1..d96cc5275a15c 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.15.yaml - manifestHash: 8c601006d81de04e5d79a68f6bb155eb0ef45ca3d53305dbc2c0a1d458092426 + manifestHash: bc3bc87fdbfa9e1721539e67523eb0803e59acc35f5a98189e915bcfc0e4a12f 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 e63ad9263c5ab..a22d9514eb5c0 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 @@ -595,7 +595,7 @@ spec: value: api.internal.privateciliumadvanced.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent lifecycle: postStart: @@ -744,7 +744,7 @@ spec: value: api.internal.privateciliumadvanced.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: config terminationMessagePolicy: FallbackToLogsOnError @@ -763,7 +763,7 @@ spec: value: /run/cilium/cgroupv2 - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: mount-cgroup securityContext: @@ -790,7 +790,7 @@ spec: env: - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: apply-sysctl-overwrites securityContext: @@ -814,7 +814,7 @@ spec: - /bin/bash - -c - -- - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: mount-bpf-fs securityContext: @@ -849,7 +849,7 @@ spec: value: api.internal.privateciliumadvanced.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -874,7 +874,7 @@ spec: name: cilium-run - command: - /install-plugin.sh - image: quay.io/cilium/cilium:v1.16.3 + image: quay.io/cilium/cilium:v1.16.5 imagePullPolicy: IfNotPresent name: install-cni-binaries resources: @@ -1048,7 +1048,7 @@ spec: value: api.internal.privateciliumadvanced.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/operator:v1.16.3 + image: quay.io/cilium/operator:v1.16.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 c963772bbbbd3..a6cc5e4e523bc 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.15.yaml - manifestHash: 45bddd141fefbbd61619eb858684854c1a4a92239f00098495ff97fe97201aef + manifestHash: 75f56f20d00fdfff26d59fcf430cba0679639a4625ce0907de47509f1a8de67a 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 fa1837f61df6d..f439f0d554f0e 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.15.yaml - manifestHash: 45bddd141fefbbd61619eb858684854c1a4a92239f00098495ff97fe97201aef + manifestHash: 75f56f20d00fdfff26d59fcf430cba0679639a4625ce0907de47509f1a8de67a 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 178a380cac6ae..dbb7dfb4dca17 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.15.yaml - manifestHash: 45bddd141fefbbd61619eb858684854c1a4a92239f00098495ff97fe97201aef + manifestHash: 75f56f20d00fdfff26d59fcf430cba0679639a4625ce0907de47509f1a8de67a name: networking.cilium.io needsRollingUpdate: all selector: