From 83c88db90a2bb276cac85fd4e34d0e0ab1eb4bb9 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 18 Feb 2024 10:28:26 +0200 Subject: [PATCH 1/2] Update Cilium to v1.15.1 --- 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 63bc7b6f0c..43848f1e29 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.15.0" + c.Version = "v1.15.1" } if c.EnableEndpointHealthChecking == nil { From 01ea66eed72ea7f79b1f1856b7f0ffdcfaae2304 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 18 Feb 2024 10:28:36 +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 b6168f55ea..039179b6d6 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.15.0 + version: v1.15.1 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 acb40144d6..65ab1af6c7 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: bcc977da60fb16ad50f906d51d4bf623e99fc253286d71690e526f4101d94f27 + manifestHash: c8b592a42037ad510e2476ce3a1fe3fe5eb49e2621dad03d5e22a9f8d6825667 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 c7280760b7..a2c6b10e5d 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/operator:v1.15.1 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 ff287fb411..aeaae14cfc 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: 5Ce/EF8HWNsDqPr1g5h9y/CqYhDGQ0fIaojWkfmYM/o= +NodeupConfigHash: Dca9wuHA2/QNufM5APEthC5vivIhYS6HXTKC+iK1v0U= __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 d1e869fb2a..2f6be4e5fa 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.15.0 + version: v1.15.1 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 ad971514bf..aa89f4cc92 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: d706711e81a214a90815115470eb9f0c6ee8d5aa67402b64178dfed3802a692f + manifestHash: 27b40483c350fc3eb8bf909b1b5cf2edb10c85bf4fc7686f1d0db31769a51c2c 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 6990ca16e3..f3edbaf4cf 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/operator:v1.15.1 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 b86d244b52..9390ddfd86 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.15.0 -- quay.io/cilium/operator:v1.15.0 +- quay.io/cilium/cilium:v1.15.1 +- quay.io/cilium/operator:v1.15.1 - 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 494b4482bb..f70bd0d5b7 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.15.0 + version: v1.15.1 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 194ec11a4d..0d86160cc8 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: 96ff7a35d4c953b7cba928eb52b7ce5265782e18eeadf258f78f372c22abe97a + manifestHash: b40a043b3cb5282cafece2a3eb7f049b36b4a623c1de5b2dc4d69fc913207fd4 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 25fc47c3e8..a807478cc3 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/operator:v1.15.1 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 da24fe3af0..5a44729049 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.15.0 + version: v1.15.1 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 64ffbec3d8..44b45017a5 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: 175fd5607aa768302886721f5a20a84184f680b7e557a65d2846dac93adcc5dc + manifestHash: ff73e7af2bde49f7acb479adeffc7c60993db0e2a14361dbca66aaed6e79d3ab 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 76555406d4..de836db212 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/operator:v1.15.1 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 ec8084a193..7cf08c9563 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.15.0 + version: v1.15.1 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 1ed8020954..7c531b983d 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: 1d4124ce424cd174dfa1f478d073535158bf7f9f145675105f8005528ee3c3db + manifestHash: d7d8df1b7e50a817b2d079b577c2980779211f5cc496483e837b5b59c243cd4f 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 a40278588c..9fe4da9072 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/operator:v1.15.1 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 6cbb70716b..8215fb5ef7 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.15.0 + version: v1.15.1 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 fc933150aa..c78e833ac1 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.15.yaml - manifestHash: f7c5f2689c97258b25dbfd34f2c015bad0b809feaa48dfce07440c1549e0ebc5 + manifestHash: 5fad2dab386a798c97f20e265bed32076f2e94c6667be36d890354809d60251c 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 a684d16204..a6b2231889 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/cilium:v1.15.1 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.15.0 + image: quay.io/cilium/operator:v1.15.1 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -1221,7 +1221,7 @@ spec: - serve command: - hubble-relay - image: quay.io/cilium/hubble-relay:v1.15.0 + image: quay.io/cilium/hubble-relay:v1.15.1 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 a2dc4bd872..979ea051a6 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.15.0 + version: v1.15.1 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 a257b0b64c..7f1a2c90c7 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: 4ad29cbfd6b1ed71d0e656493c0d23fa06883574faafa169319055c28f88997f + manifestHash: 83c43850cc495cbbbc9eb5cd6e1ea3c0654fd90f8643701ecf6cba67bb455a0e 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 3c724cb782..862077978a 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 @@ -563,7 +563,7 @@ spec: value: api.internal.privateciliumadvanced.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.15.0 + image: quay.io/cilium/cilium:v1.15.1 imagePullPolicy: IfNotPresent lifecycle: postStart: @@ -691,7 +691,7 @@ spec: value: api.internal.privateciliumadvanced.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.15.0 + image: quay.io/cilium/cilium:v1.15.1 imagePullPolicy: IfNotPresent name: config terminationMessagePolicy: FallbackToLogsOnError @@ -710,7 +710,7 @@ spec: value: /run/cilium/cgroupv2 - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.15.0 + image: quay.io/cilium/cilium:v1.15.1 imagePullPolicy: IfNotPresent name: mount-cgroup securityContext: @@ -731,7 +731,7 @@ spec: env: - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.15.0 + image: quay.io/cilium/cilium:v1.15.1 imagePullPolicy: IfNotPresent name: apply-sysctl-overwrites securityContext: @@ -761,7 +761,7 @@ spec: value: api.internal.privateciliumadvanced.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.15.0 + image: quay.io/cilium/cilium:v1.15.1 imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -778,7 +778,7 @@ spec: name: cilium-run - command: - /install-plugin.sh - image: quay.io/cilium/cilium:v1.15.0 + image: quay.io/cilium/cilium:v1.15.1 imagePullPolicy: IfNotPresent name: install-cni-binaries resources: @@ -944,7 +944,7 @@ spec: value: api.internal.privateciliumadvanced.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/operator:v1.15.0 + image: quay.io/cilium/operator:v1.15.1 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 ba2d5f1e52..de813807a6 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: 5487313f24c613cab9c2aa5683dfcdfe869fec16cb6775435d55310c28a28c54 + manifestHash: 042ca6f4883c4c288280aa3c51eca611fc5a1cac155cace282075e2242b975b8 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 3bcf4d6a61..564baa94fb 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: 5487313f24c613cab9c2aa5683dfcdfe869fec16cb6775435d55310c28a28c54 + manifestHash: 042ca6f4883c4c288280aa3c51eca611fc5a1cac155cace282075e2242b975b8 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 66b91d0956..77001015d3 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: 5487313f24c613cab9c2aa5683dfcdfe869fec16cb6775435d55310c28a28c54 + manifestHash: 042ca6f4883c4c288280aa3c51eca611fc5a1cac155cace282075e2242b975b8 name: networking.cilium.io needsRollingUpdate: all selector: