diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go index 6ac7502ec8f9c..6a7fccc2f319b 100644 --- a/pkg/apis/kops/validation/validation.go +++ b/pkg/apis/kops/validation/validation.go @@ -1260,8 +1260,8 @@ func validateNetworkingCilium(cluster *kops.Cluster, v *kops.CiliumNetworkingSpe allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Could not parse as semantic version")) } - if version.Minor != 14 { - allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only version 1.14 is supported")) + if version.Minor != 15 { + allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only version 1.15 is supported")) } if v.Hubble != nil && fi.ValueOf(v.Hubble.Enabled) { diff --git a/pkg/apis/kops/validation/validation_test.go b/pkg/apis/kops/validation/validation_test.go index d8e8d05b4397d..09da03008496b 100644 --- a/pkg/apis/kops/validation/validation_test.go +++ b/pkg/apis/kops/validation/validation_test.go @@ -1023,7 +1023,7 @@ func Test_Validate_Cilium(t *testing.T) { }, { Cilium: kops.CiliumNetworkingSpec{ - Version: "v1.14.3", + Version: "v1.15.0", Ingress: &kops.CiliumIngressSpec{ Enabled: fi.PtrTo(true), DefaultLoadBalancerMode: "bad-value", @@ -1033,7 +1033,7 @@ func Test_Validate_Cilium(t *testing.T) { }, { Cilium: kops.CiliumNetworkingSpec{ - Version: "v1.14.3", + Version: "v1.15.0", Ingress: &kops.CiliumIngressSpec{ Enabled: fi.PtrTo(true), DefaultLoadBalancerMode: "dedicated", @@ -1042,7 +1042,7 @@ func Test_Validate_Cilium(t *testing.T) { }, { Cilium: kops.CiliumNetworkingSpec{ - Version: "v1.14.3", + Version: "v1.15.0", Hubble: &kops.HubbleSpec{ Enabled: fi.PtrTo(true), }, diff --git a/pkg/model/components/cilium.go b/pkg/model/components/cilium.go index 431a1b6e56b09..63bc7b6f0c51f 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.5" + c.Version = "v1.15.0" } if c.EnableEndpointHealthChecking == nil { 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 af625987c9535..b6168f55ea62a 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.5 + version: v1.15.0 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 9305fe7275a79..acb40144d61bd 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 @@ -105,8 +105,8 @@ spec: k8s-addon: storage-aws.addons.k8s.io version: 9.99.0 - id: k8s-1.16 - manifest: networking.cilium.io/k8s-1.16-v1.14.yaml - manifestHash: cbf85fa595d03844fafb8ec97ec50991e23707cd08ab01002633d86a3cb2994d + manifest: networking.cilium.io/k8s-1.16-v1.15.yaml + manifestHash: bcc977da60fb16ad50f906d51d4bf623e99fc253286d71690e526f4101d94f27 name: networking.cilium.io needsRollingUpdate: all selector: diff --git a/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 f76eba310ad77..c7280760b7e8c 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.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -647,7 +647,7 @@ spec: value: api.internal.minimal-ipv6.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: config terminationMessagePolicy: FallbackToLogsOnError @@ -666,7 +666,7 @@ spec: value: /run/cilium/cgroupv2 - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: mount-cgroup securityContext: @@ -687,7 +687,7 @@ spec: env: - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: apply-sysctl-overwrites securityContext: @@ -717,7 +717,7 @@ spec: value: api.internal.minimal-ipv6.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -734,7 +734,7 @@ spec: name: cilium-run - command: - /install-plugin.sh - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: install-cni-binaries resources: @@ -889,7 +889,7 @@ spec: value: api.internal.minimal-ipv6.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/operator:v1.14.5 + image: quay.io/cilium/operator:v1.15.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf b/tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf index 67b216ce7055a..38bf74e26d6a4 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf @@ -944,7 +944,7 @@ resource "aws_s3_object" "minimal-ipv6-example-com-addons-limit-range-addons-k8s resource "aws_s3_object" "minimal-ipv6-example-com-addons-networking-cilium-io-k8s-1-16" { bucket = "testingBucket" content = file("${path.module}/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.cilium.io-k8s-1.16_content") - key = "clusters.example.com/minimal-ipv6.example.com/addons/networking.cilium.io/k8s-1.16-v1.14.yaml" + key = "clusters.example.com/minimal-ipv6.example.com/addons/networking.cilium.io/k8s-1.16-v1.15.yaml" provider = aws.files server_side_encryption = "AES256" } diff --git a/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 28470cfb43b5b..ff287fb411e14 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: 6kTfJQ6yLcxGIGsuwVUBRcHKggh7GlzSCb7AnSvJIO0= +NodeupConfigHash: 5Ce/EF8HWNsDqPr1g5h9y/CqYhDGQ0fIaojWkfmYM/o= __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 8d1358e0c0ad9..d1e869fb2ab44 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.5 + version: v1.15.0 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 5a71770b7eee5..ad971514bf8ca 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 @@ -98,8 +98,8 @@ spec: k8s-addon: storage-aws.addons.k8s.io version: 9.99.0 - id: k8s-1.16 - manifest: networking.cilium.io/k8s-1.16-v1.14.yaml - manifestHash: 2f93b30904260d1ec3b6767a3a9588da2bb210358d1b04896e4278351bc2d931 + manifest: networking.cilium.io/k8s-1.16-v1.15.yaml + manifestHash: d706711e81a214a90815115470eb9f0c6ee8d5aa67402b64178dfed3802a692f name: networking.cilium.io needsRollingUpdate: all selector: diff --git a/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 572179c0c47a3..6990ca16e36dc 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.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -648,7 +648,7 @@ spec: value: api.internal.minimal-warmpool.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: config terminationMessagePolicy: FallbackToLogsOnError @@ -667,7 +667,7 @@ spec: value: /run/cilium/cgroupv2 - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: mount-cgroup securityContext: @@ -688,7 +688,7 @@ spec: env: - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: apply-sysctl-overwrites securityContext: @@ -718,7 +718,7 @@ spec: value: api.internal.minimal-warmpool.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -735,7 +735,7 @@ spec: name: cilium-run - command: - /install-plugin.sh - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: install-cni-binaries resources: @@ -890,7 +890,7 @@ spec: value: api.internal.minimal-warmpool.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/operator:v1.14.5 + image: quay.io/cilium/operator:v1.15.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/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 b5ce8e19965cc..b86d244b52d21 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.5 -- quay.io/cilium/operator:v1.14.5 +- quay.io/cilium/cilium:v1.15.0 +- quay.io/cilium/operator:v1.15.0 - registry.k8s.io/kube-proxy:v1.26.0 - registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6 diff --git a/tests/integration/update_cluster/minimal-warmpool/kubernetes.tf b/tests/integration/update_cluster/minimal-warmpool/kubernetes.tf index 02768413ed026..ab67a1a2e44d7 100644 --- a/tests/integration/update_cluster/minimal-warmpool/kubernetes.tf +++ b/tests/integration/update_cluster/minimal-warmpool/kubernetes.tf @@ -712,7 +712,7 @@ resource "aws_s3_object" "minimal-warmpool-example-com-addons-limit-range-addons resource "aws_s3_object" "minimal-warmpool-example-com-addons-networking-cilium-io-k8s-1-16" { bucket = "testingBucket" content = file("${path.module}/data/aws_s3_object_minimal-warmpool.example.com-addons-networking.cilium.io-k8s-1.16_content") - key = "clusters.example.com/minimal-warmpool.example.com/addons/networking.cilium.io/k8s-1.16-v1.14.yaml" + key = "clusters.example.com/minimal-warmpool.example.com/addons/networking.cilium.io/k8s-1.16-v1.15.yaml" provider = aws.files server_side_encryption = "AES256" } diff --git a/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 de1f729559535..494b4482bba9a 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.5 + version: v1.15.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://tests/scw-minimal.k8s.local/secrets diff --git a/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 4026d37bdcfec..194ec11a4d191 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 @@ -54,8 +54,8 @@ spec: k8s-addon: scaleway-csi-driver.addons.k8s.io version: 9.99.0 - id: k8s-1.16 - manifest: networking.cilium.io/k8s-1.16-v1.14.yaml - manifestHash: 10c38ce4e002e3ec8ce1b5b8295345b6ac0ea3c119f9d58b916bf38f1bd1b9e1 + manifest: networking.cilium.io/k8s-1.16-v1.15.yaml + manifestHash: 96ff7a35d4c953b7cba928eb52b7ce5265782e18eeadf258f78f372c22abe97a name: networking.cilium.io needsRollingUpdate: all selector: diff --git a/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 7c0e6ff0dcdaf..25fc47c3e8fe3 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.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -648,7 +648,7 @@ spec: value: api.internal.scw-minimal.k8s.local - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: config terminationMessagePolicy: FallbackToLogsOnError @@ -667,7 +667,7 @@ spec: value: /run/cilium/cgroupv2 - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: mount-cgroup securityContext: @@ -688,7 +688,7 @@ spec: env: - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: apply-sysctl-overwrites securityContext: @@ -718,7 +718,7 @@ spec: value: api.internal.scw-minimal.k8s.local - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -735,7 +735,7 @@ spec: name: cilium-run - command: - /install-plugin.sh - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: install-cni-binaries resources: @@ -890,7 +890,7 @@ spec: value: api.internal.scw-minimal.k8s.local - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/operator:v1.14.5 + image: quay.io/cilium/operator:v1.15.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal_scaleway/kubernetes.tf b/tests/integration/update_cluster/minimal_scaleway/kubernetes.tf index 5e1893844f8db..e71149eb5a657 100644 --- a/tests/integration/update_cluster/minimal_scaleway/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_scaleway/kubernetes.tf @@ -149,7 +149,7 @@ resource "aws_s3_object" "scw-minimal-k8s-local-addons-limit-range-addons-k8s-io resource "aws_s3_object" "scw-minimal-k8s-local-addons-networking-cilium-io-k8s-1-16" { bucket = "testingBucket" content = file("${path.module}/data/aws_s3_object_scw-minimal.k8s.local-addons-networking.cilium.io-k8s-1.16_content") - key = "tests/scw-minimal.k8s.local/addons/networking.cilium.io/k8s-1.16-v1.14.yaml" + key = "tests/scw-minimal.k8s.local/addons/networking.cilium.io/k8s-1.16-v1.15.yaml" provider = aws.files server_side_encryption = "AES256" } diff --git a/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 3be3460b61f06..da24fe3af01f3 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.5 + version: v1.15.0 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 12509f1894b98..64ffbec3d80ce 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 @@ -98,8 +98,8 @@ spec: k8s-addon: storage-aws.addons.k8s.io version: 9.99.0 - id: k8s-1.16 - manifest: networking.cilium.io/k8s-1.16-v1.14.yaml - manifestHash: ae82c21f5fc8e0885ceedf83050da9d0c733d50cedd7d145a806294338ec25f1 + manifest: networking.cilium.io/k8s-1.16-v1.15.yaml + manifestHash: 175fd5607aa768302886721f5a20a84184f680b7e557a65d2846dac93adcc5dc name: networking.cilium.io needsRollingUpdate: all selector: 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 e4d80b537baac..76555406d431a 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/operator:v1.15.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/privatecilium-eni/kubernetes.tf b/tests/integration/update_cluster/privatecilium-eni/kubernetes.tf index c0465852d986f..dc1d1273cfb86 100644 --- a/tests/integration/update_cluster/privatecilium-eni/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium-eni/kubernetes.tf @@ -1032,7 +1032,7 @@ resource "aws_s3_object" "privatecilium-example-com-addons-limit-range-addons-k8 resource "aws_s3_object" "privatecilium-example-com-addons-networking-cilium-io-k8s-1-16" { bucket = "testingBucket" content = file("${path.module}/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content") - key = "clusters.example.com/privatecilium.example.com/addons/networking.cilium.io/k8s-1.16-v1.14.yaml" + key = "clusters.example.com/privatecilium.example.com/addons/networking.cilium.io/k8s-1.16-v1.15.yaml" provider = aws.files server_side_encryption = "AES256" } 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 c4c42c9fab2fb..ec8084a193fba 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.5 + version: v1.15.0 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 26b0859a6fa28..1ed8020954476 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 @@ -98,8 +98,8 @@ spec: k8s-addon: storage-aws.addons.k8s.io version: 9.99.0 - id: k8s-1.16 - manifest: networking.cilium.io/k8s-1.16-v1.14.yaml - manifestHash: 25e0a4c6c9a226bb3a53cfb812bea651cd454f3ea8de08a6035e9a5bcebd3e7f + manifest: networking.cilium.io/k8s-1.16-v1.15.yaml + manifestHash: 1d4124ce424cd174dfa1f478d073535158bf7f9f145675105f8005528ee3c3db 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 31014e9fd1521..a40278588cf01 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/operator:v1.15.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/privatecilium/kubernetes.tf b/tests/integration/update_cluster/privatecilium/kubernetes.tf index c0465852d986f..dc1d1273cfb86 100644 --- a/tests/integration/update_cluster/privatecilium/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium/kubernetes.tf @@ -1032,7 +1032,7 @@ resource "aws_s3_object" "privatecilium-example-com-addons-limit-range-addons-k8 resource "aws_s3_object" "privatecilium-example-com-addons-networking-cilium-io-k8s-1-16" { bucket = "testingBucket" content = file("${path.module}/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content") - key = "clusters.example.com/privatecilium.example.com/addons/networking.cilium.io/k8s-1.16-v1.14.yaml" + key = "clusters.example.com/privatecilium.example.com/addons/networking.cilium.io/k8s-1.16-v1.15.yaml" provider = aws.files server_side_encryption = "AES256" } 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 d9d7ebb5cf826..6cbb70716b6d3 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.5 + version: v1.15.0 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 5fdb359c25381..fc933150aa6eb 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 @@ -161,8 +161,8 @@ spec: k8s-addon: storage-aws.addons.k8s.io version: 9.99.0 - id: k8s-1.16 - manifest: networking.cilium.io/k8s-1.16-v1.14.yaml - manifestHash: b1031b2a99a5d029d69e119fed152af22f194927b03631d87baf1cc97fd07e20 + manifest: networking.cilium.io/k8s-1.16-v1.15.yaml + manifestHash: f7c5f2689c97258b25dbfd34f2c015bad0b809feaa48dfce07440c1549e0ebc5 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 121a739394aef..a684d16204143 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/cilium:v1.15.0 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.5 + image: quay.io/cilium/operator:v1.15.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -1221,7 +1221,7 @@ spec: - serve command: - hubble-relay - image: quay.io/cilium/hubble-relay:v1.14.5 + image: quay.io/cilium/hubble-relay:v1.15.0 imagePullPolicy: IfNotPresent livenessProbe: tcpSocket: diff --git a/tests/integration/update_cluster/privatecilium2/kubernetes.tf b/tests/integration/update_cluster/privatecilium2/kubernetes.tf index 718720d0f143d..cfaa629824d91 100644 --- a/tests/integration/update_cluster/privatecilium2/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium2/kubernetes.tf @@ -1048,7 +1048,7 @@ resource "aws_s3_object" "privatecilium-example-com-addons-limit-range-addons-k8 resource "aws_s3_object" "privatecilium-example-com-addons-networking-cilium-io-k8s-1-16" { bucket = "testingBucket" content = file("${path.module}/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content") - key = "clusters.example.com/privatecilium.example.com/addons/networking.cilium.io/k8s-1.16-v1.14.yaml" + key = "clusters.example.com/privatecilium.example.com/addons/networking.cilium.io/k8s-1.16-v1.15.yaml" provider = aws.files server_side_encryption = "AES256" } 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 3269da5b3812a..a2dc4bd8721b5 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.5 + version: v1.15.0 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 ecd131f7a6479..a257b0b64c95c 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 @@ -98,8 +98,8 @@ spec: k8s-addon: storage-aws.addons.k8s.io version: 9.99.0 - id: k8s-1.16 - manifest: networking.cilium.io/k8s-1.16-v1.14.yaml - manifestHash: e58b7a1c93353dabd67ee86769b6408009712bbe5747739c7950995a34c68f02 + manifest: networking.cilium.io/k8s-1.16-v1.15.yaml + manifestHash: 4ad29cbfd6b1ed71d0e656493c0d23fa06883574faafa169319055c28f88997f 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 47a15c28fd72c..3c724cb782829 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 @@ -52,7 +52,6 @@ data: enable-ipv4-masquerade: "true" enable-ipv6: "false" enable-ipv6-masquerade: "false" - enable-k8s-event-handover: "true" enable-l7-proxy: "true" enable-node-port: "true" enable-remote-node-identity: "true" @@ -564,7 +563,7 @@ spec: value: api.internal.privateciliumadvanced.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent lifecycle: postStart: @@ -692,7 +691,7 @@ spec: value: api.internal.privateciliumadvanced.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: config terminationMessagePolicy: FallbackToLogsOnError @@ -711,7 +710,7 @@ spec: value: /run/cilium/cgroupv2 - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: mount-cgroup securityContext: @@ -732,7 +731,7 @@ spec: env: - name: BIN_PATH value: /opt/cni/bin - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: apply-sysctl-overwrites securityContext: @@ -762,7 +761,7 @@ spec: value: api.internal.privateciliumadvanced.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -779,7 +778,7 @@ spec: name: cilium-run - command: - /install-plugin.sh - image: quay.io/cilium/cilium:v1.14.5 + image: quay.io/cilium/cilium:v1.15.0 imagePullPolicy: IfNotPresent name: install-cni-binaries resources: @@ -945,7 +944,7 @@ spec: value: api.internal.privateciliumadvanced.example.com - name: KUBERNETES_SERVICE_PORT value: "443" - image: quay.io/cilium/operator:v1.14.5 + image: quay.io/cilium/operator:v1.15.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf b/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf index f4d12c345475a..b1000212b548e 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf +++ b/tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf @@ -1065,7 +1065,7 @@ resource "aws_s3_object" "privateciliumadvanced-example-com-addons-limit-range-a resource "aws_s3_object" "privateciliumadvanced-example-com-addons-networking-cilium-io-k8s-1-16" { bucket = "testingBucket" content = file("${path.module}/data/aws_s3_object_privateciliumadvanced.example.com-addons-networking.cilium.io-k8s-1.16_content") - key = "clusters.example.com/privateciliumadvanced.example.com/addons/networking.cilium.io/k8s-1.16-v1.14.yaml" + key = "clusters.example.com/privateciliumadvanced.example.com/addons/networking.cilium.io/k8s-1.16-v1.15.yaml" provider = aws.files server_side_encryption = "AES256" } diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.14.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.15.yaml.template similarity index 99% rename from upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.14.yaml.template rename to upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.15.yaml.template index d8837d7456a67..6832d6b9d207c 100644 --- a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.14.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.15.yaml.template @@ -53,8 +53,6 @@ data: trusted-ca-file: '/var/lib/etcd-secrets/etcd-ca.crt' key-file: '/var/lib/etcd-secrets/etcd-client-cilium.key' cert-file: '/var/lib/etcd-secrets/etcd-client-cilium.crt' - - enable-k8s-event-handover: "true" {{ end }} # Identity allocation mode selects how identities are shared between cilium diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/cilium.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/cilium.go index 7ba66ee6c9a6a..da9bdca91e5af 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/cilium.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/cilium.go @@ -35,7 +35,7 @@ func addCiliumAddon(b *BootstrapChannelBuilder, addons *AddonList) error { klog.Infof("found cilium (%q) in addons; won't use builtin", key) } else { id := "k8s-1.16" - location := key + "/" + id + "-v1.14.yaml" + location := key + "/" + id + "-v1.15.yaml" addon := &api.AddonSpec{ Name: fi.PtrTo(key), diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml index 58412afe30beb..ba2d5f1e52cf6 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -98,8 +98,8 @@ spec: k8s-addon: storage-aws.addons.k8s.io version: 9.99.0 - id: k8s-1.16 - manifest: networking.cilium.io/k8s-1.16-v1.14.yaml - manifestHash: bea39c087cdd515eee7f7a490bf94c8f16c493db8d528312775f3afb46ede821 + manifest: networking.cilium.io/k8s-1.16-v1.15.yaml + manifestHash: 5487313f24c613cab9c2aa5683dfcdfe869fec16cb6775435d55310c28a28c54 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 7ccc587378066..3bcf4d6a61749 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 @@ -112,8 +112,8 @@ spec: k8s-addon: storage-aws.addons.k8s.io version: 9.99.0 - id: k8s-1.16 - manifest: networking.cilium.io/k8s-1.16-v1.14.yaml - manifestHash: bea39c087cdd515eee7f7a490bf94c8f16c493db8d528312775f3afb46ede821 + manifest: networking.cilium.io/k8s-1.16-v1.15.yaml + manifestHash: 5487313f24c613cab9c2aa5683dfcdfe869fec16cb6775435d55310c28a28c54 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 b52d91744542c..66b91d0956b21 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 @@ -169,8 +169,8 @@ spec: k8s-addon: storage-aws.addons.k8s.io version: 9.99.0 - id: k8s-1.16 - manifest: networking.cilium.io/k8s-1.16-v1.14.yaml - manifestHash: bea39c087cdd515eee7f7a490bf94c8f16c493db8d528312775f3afb46ede821 + manifest: networking.cilium.io/k8s-1.16-v1.15.yaml + manifestHash: 5487313f24c613cab9c2aa5683dfcdfe869fec16cb6775435d55310c28a28c54 name: networking.cilium.io needsRollingUpdate: all selector: