From 4ebda3e955fb0ddbb5265eb8628d4223a6c68c01 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 9 Jan 2024 12:28:32 +0200 Subject: [PATCH 1/6] aws: Update EBS CSI driver to v1.26.1 --- pkg/model/components/awsebscsidriver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/model/components/awsebscsidriver.go b/pkg/model/components/awsebscsidriver.go index 8e1b16a40f..7e652870c8 100644 --- a/pkg/model/components/awsebscsidriver.go +++ b/pkg/model/components/awsebscsidriver.go @@ -43,7 +43,7 @@ func (b *AWSEBSCSIDriverOptionsBuilder) BuildOptions(o interface{}) error { c := aws.EBSCSIDriver if c.Version == nil { - version := "v1.26.0" + version := "v1.26.1" c.Version = &version } From 437f7a83d38520d1e236e2aba195571b3259c3d0 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 9 Jan 2024 12:30:35 +0200 Subject: [PATCH 2/6] aws: Add option to set host network for EBS CSI node driver --- pkg/apis/kops/componentconfig.go | 4 ++++ pkg/apis/kops/v1alpha2/componentconfig.go | 4 ++++ pkg/apis/kops/v1alpha2/zz_generated.conversion.go | 2 ++ pkg/apis/kops/v1alpha3/componentconfig.go | 4 ++++ pkg/apis/kops/v1alpha3/zz_generated.conversion.go | 2 ++ .../aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template | 2 +- 6 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go index 7b828a0d14..d3d8a0bd84 100644 --- a/pkg/apis/kops/componentconfig.go +++ b/pkg/apis/kops/componentconfig.go @@ -913,6 +913,10 @@ type EBSCSIDriverSpec struct { // KubeAPIBurst Burst to use while talking with Kubernetes API server. (default 100) KubeAPIBurst *int32 `json:"kubeAPIBurst,omitempty"` + // HostNetwork can be used for large clusters for faster access to node info via instance metadata. + // Default: false + HostNetwork bool `json:"hostNetwork,omitempty"` + // VolumeAttachLimit is the maximum number of volumes attachable per node. // If specified, the limit applies to all nodes. // If not specified, the value is approximated from the instance type. diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go index 7572f38482..38cca34e45 100644 --- a/pkg/apis/kops/v1alpha2/componentconfig.go +++ b/pkg/apis/kops/v1alpha2/componentconfig.go @@ -980,6 +980,10 @@ type EBSCSIDriverSpec struct { // KubeAPIBurst Burst to use while talking with Kubernetes API server. (default 100) KubeAPIBurst *int32 `json:"kubeAPIBurst,omitempty"` + // HostNetwork can be used for large clusters for faster access to node info via instance metadata. + // Default: false + HostNetwork bool `json:"hostNetwork,omitempty"` + // VolumeAttachLimit is the maximum number of volumes attachable per node. // If specified, the limit applies to all nodes. // If not specified, the value is approximated from the instance type. diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index a204e33004..c56a4bdf9b 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -3482,6 +3482,7 @@ func autoConvert_v1alpha2_EBSCSIDriverSpec_To_kops_EBSCSIDriverSpec(in *EBSCSIDr out.Version = in.Version out.KubeAPIQPS = in.KubeAPIQPS out.KubeAPIBurst = in.KubeAPIBurst + out.HostNetwork = in.HostNetwork out.VolumeAttachLimit = in.VolumeAttachLimit out.PodAnnotations = in.PodAnnotations return nil @@ -3498,6 +3499,7 @@ func autoConvert_kops_EBSCSIDriverSpec_To_v1alpha2_EBSCSIDriverSpec(in *kops.EBS out.Version = in.Version out.KubeAPIQPS = in.KubeAPIQPS out.KubeAPIBurst = in.KubeAPIBurst + out.HostNetwork = in.HostNetwork out.VolumeAttachLimit = in.VolumeAttachLimit out.PodAnnotations = in.PodAnnotations return nil diff --git a/pkg/apis/kops/v1alpha3/componentconfig.go b/pkg/apis/kops/v1alpha3/componentconfig.go index 813c021f56..100c1e47d9 100644 --- a/pkg/apis/kops/v1alpha3/componentconfig.go +++ b/pkg/apis/kops/v1alpha3/componentconfig.go @@ -909,6 +909,10 @@ type EBSCSIDriverSpec struct { // KubeAPIBurst Burst to use while talking with Kubernetes API server. (default 100) KubeAPIBurst *int32 `json:"kubeAPIBurst,omitempty"` + // HostNetwork can be used for large clusters for faster access to node info via instance metadata. + // Default: false + HostNetwork bool `json:"hostNetwork,omitempty"` + // VolumeAttachLimit is the maximum number of volumes attachable per node. // If specified, the limit applies to all nodes. // If not specified, the value is approximated from the instance type. diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go index 08065fac73..bb57356ef1 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go @@ -3745,6 +3745,7 @@ func autoConvert_v1alpha3_EBSCSIDriverSpec_To_kops_EBSCSIDriverSpec(in *EBSCSIDr out.Version = in.Version out.KubeAPIQPS = in.KubeAPIQPS out.KubeAPIBurst = in.KubeAPIBurst + out.HostNetwork = in.HostNetwork out.VolumeAttachLimit = in.VolumeAttachLimit out.PodAnnotations = in.PodAnnotations return nil @@ -3761,6 +3762,7 @@ func autoConvert_kops_EBSCSIDriverSpec_To_v1alpha3_EBSCSIDriverSpec(in *kops.EBS out.Version = in.Version out.KubeAPIQPS = in.KubeAPIQPS out.KubeAPIBurst = in.KubeAPIBurst + out.HostNetwork = in.HostNetwork out.VolumeAttachLimit = in.VolumeAttachLimit out.PodAnnotations = in.PodAnnotations return nil diff --git a/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template b/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template index 6e90eec64f..cf149608ff 100644 --- a/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template +++ b/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template @@ -395,7 +395,7 @@ spec: priorityClassName: system-node-critical tolerations: - operator: Exists - hostNetwork: false + hostNetwork: {{ .HostNetwork }} securityContext: fsGroup: 0 runAsGroup: 0 From 26a424bcd7c1deab755d56d491f67cb782ac4cb0 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 9 Jan 2024 12:31:20 +0200 Subject: [PATCH 3/6] validation: Use constants for validating node labels --- pkg/validation/validate_cluster.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/validation/validate_cluster.go b/pkg/validation/validate_cluster.go index 45f2dcda99..71ead73a06 100644 --- a/pkg/validation/validate_cluster.go +++ b/pkg/validation/validate_cluster.go @@ -340,14 +340,11 @@ func (v *ValidationCluster) validateNodes(cloudGroups map[string]*cloudinstances n := &ValidationNode{ Name: node.Name, - Zone: node.ObjectMeta.Labels["topology.kubernetes.io/zone"], - Hostname: node.ObjectMeta.Labels["kubernetes.io/hostname"], + Zone: node.ObjectMeta.Labels[v1.LabelTopologyZone], + Hostname: node.ObjectMeta.Labels[v1.LabelHostname], Role: role, Status: getNodeReadyStatus(node), } - if n.Zone == "" { - n.Zone = node.ObjectMeta.Labels["failure-domain.beta.kubernetes.io/zone"] - } ready := isNodeReady(node) if ready { From 51a08bea9ac73fe3d204c7fd514edb7f858192a0 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 9 Jan 2024 12:32:56 +0200 Subject: [PATCH 4/6] aws: Wait for zone label to be set before scheduling EBS CSI node driver --- .../aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template b/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template index cf149608ff..8cc0bcbfc4 100644 --- a/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template +++ b/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template @@ -377,6 +377,10 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + {{- if not .HostNetwork }} + - key: topology.kubernetes.io/zone + operator: Exists + {{- end }} - key: eks.amazonaws.com/compute-type operator: NotIn values: From ec25e7887f4bec10a58768d60b47c542f241d6be Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 9 Jan 2024 12:34:15 +0200 Subject: [PATCH 5/6] hack/update-expected.sh --- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...jects.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...rdata.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...ustom.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...ander.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...mplex.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...press.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...inerd.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...inerd.example.com-addons-bootstrap_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...t_123.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...g-iam.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...ingsg.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nallb.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...icies.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...ct_ha.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 3 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 +++++++++---------- ...nimal.example.com-addons-bootstrap_content | 2 +- .../many-addons-ccm/in-v1alpha2.yaml | 1 + ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...ddons.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...l-aws.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...-etcd.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...-ipv6.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...-ipv6.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...-ipv6.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...-ipv6.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...mpool.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...minimal.k8s.local-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...minimal.k8s.local-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...ances.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...ances.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...rname.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...rname.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...ed-ip.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...ubnet.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...alico.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...canal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...ilium.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...ilium.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...ilium.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...anced.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...edns1.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...edns2.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...annel.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...opeio.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...ubnet.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...edvpc.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...-ipv6.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...naged.example.com-addons-bootstrap_content | 2 +- ...s_s3_object_cluster-completed.spec_content | 2 +- ...-csi-driver.addons.k8s.io-k8s-1.17_content | 44 ++++++++++--------- ...nimal.example.com-addons-bootstrap_content | 2 +- .../amazonvpc-containerd/manifest.yaml | 2 +- .../amazonvpc/manifest.yaml | 2 +- .../awscloudcontroller/manifest.yaml | 2 +- .../awsiamauthenticator/crd/manifest.yaml | 2 +- .../mappings/manifest.yaml | 2 +- .../cilium/manifest.yaml | 2 +- .../coredns/manifest.yaml | 2 +- .../insecure-1.19/manifest.yaml | 2 +- .../metrics-server/secure-1.19/manifest.yaml | 2 +- .../service-account-iam/manifest.yaml | 2 +- .../simple/manifest.yaml | 2 +- 213 files changed, 1687 insertions(+), 1553 deletions(-) diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index ad7e952b64..5b86f4102c 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content index ac69c649c4..1ca0a07fc4 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: d2decf1df85e55d98985773b4f52b41bc69eb90cb17bf578f1f03cacaf40048e + manifestHash: 7cbb39a82734339259d6c242405b6dfb9aeadb118b99b640b1d6d65644d0f491 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content index 6957013f4f..0d56d08714 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content index e4460283d1..f597310adb 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 22014f0bdd..5c4411435c 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 47b28f0d75..585adada66 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3435d5b06bf4713803bb1ac266409b7ff67aba0904458ca4588cd2b767e6078e + manifestHash: 16005986140d60fa61ea08c2eb0eb47d114b6ae2f49b8ddb0e5721e31708c37d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content index 5a6703f193..69e15e4bd9 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content @@ -15,7 +15,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 0dffd7026e..3b43eba32d 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1121,7 +1123,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index b582b9dea0..2db1004044 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -170,7 +170,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: ab2da18d481b9d4a7da20bc857317d5e47b111578986bcd4ae48d575f212bee3 + manifestHash: 744427a1464d6ecf9a477e73f25a9f5fbeb5f8f97f917ead3aeb54c23c1bd820 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index aae003eb2c..494070f0b7 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content index 30625043ba..9218357571 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 482a8ea722d0dadc04be99e8093dee971809a10c6eaabbac936dace18fa19750 + manifestHash: 0d4cb331d2acc23da3af5c391773aa91c20d878f521187e5bb51685e189969dd name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content index fd30fe9eac..97f18d7084 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 5cfff35a60..aa18ceaa4f 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content index cf568d949e..2629cbe046 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 33ac4613d490abaacbca9f96e46ff7542b631795a8e8cc8de51ae121da7159e1 + manifestHash: c0c5650e7008546db09dfb9f644ed19106f127bdf3969b14507a66dcfd5b26dd name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content index fd370474f9..5bae309ec7 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index d9cd88813a..de350a8eff 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content index 301ee2ee29..a211a9a1a7 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 54a22209612b192a3d9f2ffc0fd59c6040349de98af141035fe456c656814fdb + manifestHash: e6d29c96c8ca8a8739922e3549528a9e1554d3a27e87d973f7370b7f790f4b49 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content index 87f51ac5e8..a5d935fe53 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content index 57149b7972..45850ff4c7 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content @@ -29,7 +29,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 604eca4ff2..ffb9fa57ff 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content index ec7302ed0a..4e2345fe4a 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content @@ -120,7 +120,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: bc720d4de4a3bb800ba54f2748e6b533d5a13e2ca631f156a7c5d772b62c36f0 + manifestHash: d2793403ba6e7087a07e1c86f37605902cd97ee539806adee74c09eec63145d0 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content index 0c21398d73..1c43580dfe 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 2bcc8128ce..cec76286de 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content index efa1906d0a..6adb54500d 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 5d5743c5a60229ffe1ff698b34b647b439d630fd7b02faadcfac7a8ea992ec29 + manifestHash: 8bc6fb7a74f5e187ae1411bbf3073a5e22ecfe2bdd2d19be5551d592202a6282 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content index b5a88a42ab..51396f6407 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 7741c136a0..f32c63109b 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content index 4cf9aefbee..22e27f878f 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: ea1f7e3249369b5b83d20835644803a56dce07f6bc8b7b4fc19ebd85e15871b8 + manifestHash: 2d3dd701f73b54923b45804d47196d2ee6c14ec202f42d8c2a8bc0da46fbdecd name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content index 40d8cbebd0..98f0980df0 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 7741c136a0..f32c63109b 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content index 4cf9aefbee..22e27f878f 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: ea1f7e3249369b5b83d20835644803a56dce07f6bc8b7b4fc19ebd85e15871b8 + manifestHash: 2d3dd701f73b54923b45804d47196d2ee6c14ec202f42d8c2a8bc0da46fbdecd name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 2cf8ce8c55..a90c23ae0f 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content index 66cee8696c..ccf88db5d1 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: e143ca526a96eb6025012f25f32c2dac043545ab44060ee2e12e31c09887b14c + manifestHash: 1a088861ee197bc865ad9e1c86de42404b98a2f8b8306853176c62d607973824 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content index 519eec4f84..8831a36680 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content index cafe6507c6..d06f343ada 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 22fd14c63a..338262d643 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content index 96748a970f..0aebf57cc8 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 9b43cac3d81b3ccce477845da0b779ef4e8b7ed64ecc105c82336b0435b02b7f + manifestHash: 393802e18726f23b03a8fd5949739c5e01e1718d86214661f2ee5c96499f8b95 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content index 9996e506f6..2cbee91b50 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content @@ -14,7 +14,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index d3a555006d..71c6f9f3ee 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content index 9d5e15f6e6..a63a7d1d04 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 83059b80afab2ed12139e26cf6c2316f884e725866a8b7e69289de1c93093a52 + manifestHash: c0147c7d6c3a561d38abb11ac54bf3ce63d2a6de658d9f84dd405ac32fb821aa name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content index 28e909d639..d5d483127b 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 22014f0bdd..5c4411435c 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 12171a0c91..fcd99db375 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3435d5b06bf4713803bb1ac266409b7ff67aba0904458ca4588cd2b767e6078e + manifestHash: 16005986140d60fa61ea08c2eb0eb47d114b6ae2f49b8ddb0e5721e31708c37d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content index 09b64be410..78a4c615ee 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 0dffd7026e..3b43eba32d 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1121,7 +1123,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index f81564e732..7f487d51ea 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: ab2da18d481b9d4a7da20bc857317d5e47b111578986bcd4ae48d575f212bee3 + manifestHash: 744427a1464d6ecf9a477e73f25a9f5fbeb5f8f97f917ead3aeb54c23c1bd820 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content index a170c534c8..4388d2e7aa 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 85d810b49c..d6d257f581 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content index 166db61f7f..cfcac9cb0f 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 31f617c2828e6dae13b3c5f916dd216c4d640756b6f7ad4d8335d138125f32ba + manifestHash: fd163094b7692e2d6395e5da5444a79ec5e97ba7db2e886bec686bad9d73336b name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content index a48097b6ca..c50fa8d1ce 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content @@ -16,7 +16,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index f1c71a9852..499ce71f45 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content index 06f4d31cdb..fcd7b1d88b 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: ca36b1f28c0f7e4e24e67313c5ad03bc279d62924769eb20c28884e03d1fc1ab + manifestHash: 6d404abbd017afcc77cd9a9447852473586b5c5afe3da8e7297405332ea2c871 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content index c9fbfdd2ac..ae27b3b7e7 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 7e9478f0cb..23b56d1f10 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content index 859cf8eb39..1322c1d6b8 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 545cd1745ab3745481fa2b31dbd741bc328389b18d68c1b7d0143832308bf36d + manifestHash: 7125d27f2de6220cfc42f698c02e6e5205ac6c617fd50217dc9bf9271ed52f4b name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content index 532d774114..a28ca4fa2c 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 22014f0bdd..5c4411435c 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index f6936e62be..6bdb599af5 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -170,7 +170,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3435d5b06bf4713803bb1ac266409b7ff67aba0904458ca4588cd2b767e6078e + manifestHash: 16005986140d60fa61ea08c2eb0eb47d114b6ae2f49b8ddb0e5721e31708c37d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content index 41dbb9ff56..ec103f36db 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 0dffd7026e..3b43eba32d 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1121,7 +1123,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 7d99e3daa7..5db84992b0 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: ab2da18d481b9d4a7da20bc857317d5e47b111578986bcd4ae48d575f212bee3 + manifestHash: 744427a1464d6ecf9a477e73f25a9f5fbeb5f8f97f917ead3aeb54c23c1bd820 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content index eac7683480..17064519fa 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content @@ -15,7 +15,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 1750244617..e47c523c01 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1153,7 +1155,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index ec3aaa3417..d65383a427 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -193,7 +193,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: adc955468094d4ab36bd15020617ae73b7501933a2b211c610397b9ca3055341 + manifestHash: a61aad6a8389f986d5d497fffa06e1f6cae5d0cf088e3dc45ee61599406ae95f name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content index 9de952579d..a1ab145329 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content @@ -15,7 +15,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 1750244617..e47c523c01 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1153,7 +1155,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index d70fbd6935..b7b6ed4c2f 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -200,7 +200,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: adc955468094d4ab36bd15020617ae73b7501933a2b211c610397b9ca3055341 + manifestHash: a61aad6a8389f986d5d497fffa06e1f6cae5d0cf088e3dc45ee61599406ae95f name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content index 2aaee33e45..d5ec939d76 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content @@ -15,7 +15,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 1750244617..e47c523c01 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1153,7 +1155,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index c9109780cd..f145eb6123 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -200,7 +200,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: adc955468094d4ab36bd15020617ae73b7501933a2b211c610397b9ca3055341 + manifestHash: a61aad6a8389f986d5d497fffa06e1f6cae5d0cf088e3dc45ee61599406ae95f name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content index 167a35bbe7..6e47d57156 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content @@ -15,7 +15,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 1750244617..e47c523c01 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1153,7 +1155,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 35008fd2e2..fa5b16ac77 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -201,7 +201,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: adc955468094d4ab36bd15020617ae73b7501933a2b211c610397b9ca3055341 + manifestHash: a61aad6a8389f986d5d497fffa06e1f6cae5d0cf088e3dc45ee61599406ae95f name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content index 7a345efe94..ef6863f8df 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content @@ -15,7 +15,8 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + hostNetwork: true + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 89e2206512..2991b1cd3e 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -616,7 +616,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -708,7 +708,7 @@ spec: volumeMounts: - mountPath: /csi name: plugin-dir - hostNetwork: false + hostNetwork: true nodeSelector: kubernetes.io/os: linux priorityClassName: system-node-critical @@ -756,7 +756,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +779,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +858,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1096,7 +1096,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index d24587a0b8..f611701057 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -193,7 +193,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: c425b0d06db6dcb39514b030632f849990617bda025dae5a3100a9c590404487 + manifestHash: d6e4e15862f4c2875b3328f0594edb1a90ec336d34b873da0c339407aa832cc2 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons-ccm/in-v1alpha2.yaml index 69ee42bddc..36d227a2ba 100644 --- a/tests/integration/update_cluster/many-addons-ccm/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons-ccm/in-v1alpha2.yaml @@ -18,6 +18,7 @@ spec: cloudConfig: awsEBSCSIDriver: enabled: true + hostNetwork: true cloudControllerManager: cloudProvider: aws cloudProvider: aws diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content index 605675e3dc..498f66181e 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content @@ -15,7 +15,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 77b3b1f28e..866ba2aea9 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1096,7 +1098,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content index 3125e48258..87a62103db 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content @@ -193,7 +193,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 09cbc19104a857d4ffe044a0abb00508f3cc45b4aed440924b42b017fb4dc30c + manifestHash: a3cdd5a42010b365abdaef74877ea0f4b3261f649fd20df86d346ebe3684a556 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content index db68a21730..602b6738fa 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 22014f0bdd..5c4411435c 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 713000742d..a6eca640a0 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3435d5b06bf4713803bb1ac266409b7ff67aba0904458ca4588cd2b767e6078e + manifestHash: 16005986140d60fa61ea08c2eb0eb47d114b6ae2f49b8ddb0e5721e31708c37d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content index fab87d5f04..607e66f043 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 22014f0bdd..5c4411435c 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 124273c3fc..c4ff6124be 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3435d5b06bf4713803bb1ac266409b7ff67aba0904458ca4588cd2b767e6078e + manifestHash: 16005986140d60fa61ea08c2eb0eb47d114b6ae2f49b8ddb0e5721e31708c37d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content index f5b68df346..e7d3543974 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 22014f0bdd..5c4411435c 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index dde4e6c297..4b4cee16ab 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3435d5b06bf4713803bb1ac266409b7ff67aba0904458ca4588cd2b767e6078e + manifestHash: 16005986140d60fa61ea08c2eb0eb47d114b6ae2f49b8ddb0e5721e31708c37d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content index dfc5d7f912..bd11e33237 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 22014f0bdd..5c4411435c 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index b185d00914..3b4f63b17e 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3435d5b06bf4713803bb1ac266409b7ff67aba0904458ca4588cd2b767e6078e + manifestHash: 16005986140d60fa61ea08c2eb0eb47d114b6ae2f49b8ddb0e5721e31708c37d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content index 0f39defc03..5ac6609e5c 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 22014f0bdd..5c4411435c 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 3d5fd7d639..639de1030f 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3435d5b06bf4713803bb1ac266409b7ff67aba0904458ca4588cd2b767e6078e + manifestHash: 16005986140d60fa61ea08c2eb0eb47d114b6ae2f49b8ddb0e5721e31708c37d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content index 4c7b2f7561..a076e7bbe3 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 22014f0bdd..5c4411435c 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 3d5fd7d639..639de1030f 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3435d5b06bf4713803bb1ac266409b7ff67aba0904458ca4588cd2b767e6078e + manifestHash: 16005986140d60fa61ea08c2eb0eb47d114b6ae2f49b8ddb0e5721e31708c37d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_cluster-completed.spec_content index 14182d187f..e0b3f711b4 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index ac54d2b4c7..79964b9b64 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content index 36a8d68847..4ad5f980b0 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: cbf95699179ff367c3a010ffb273bbc40ed8e1ef7640b9e30a6eecfea2ac839c + manifestHash: 72453e338d3fa4d015f4f96144398179c535d0eb3756f058a0c832971fce5a9d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content index 060aabe19f..b378a23fd7 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 22014f0bdd..5c4411435c 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index b46b00afda..8f1b282a48 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -99,7 +99,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3435d5b06bf4713803bb1ac266409b7ff67aba0904458ca4588cd2b767e6078e + manifestHash: 16005986140d60fa61ea08c2eb0eb47d114b6ae2f49b8ddb0e5721e31708c37d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content index e1f91def70..154aaf61d4 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 880133a56f..98a89aaaea 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content index 17a9be7ec3..7b41068a52 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: c8144d754ae863203ecd6a090fc54e0ce10f7f3304bbc0a2a1e6e517eda699ca + manifestHash: 278ad735cd955517beb524b75c09649601103b45baa5047240772a3155b5bbcc name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content index f86c541622..ea126470bd 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 22014f0bdd..5c4411435c 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 415b3a04e3..1c9c7ed59b 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3435d5b06bf4713803bb1ac266409b7ff67aba0904458ca4588cd2b767e6078e + manifestHash: 16005986140d60fa61ea08c2eb0eb47d114b6ae2f49b8ddb0e5721e31708c37d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content index a24d74175c..01d65a9d76 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true nodeIPFamilies: - ipv6 diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 56a7034c14..08e50ef837 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -618,7 +620,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -758,7 +760,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -781,7 +783,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -862,7 +864,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1075,7 +1077,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index 681ace57ea..92f5fc445c 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -168,7 +168,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: a1dd836d9ae20ffe61a696845546ce7fa69ffa116f935abd1a0a1d13c287508d + manifestHash: de36edbdb72b358dd32f64a77052ecae242ae9aed855bdc39fa993f1e7f3e32f name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io 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 d47d2e8d56..af625987c9 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 @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true nodeIPFamilies: - ipv6 diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 56a7034c14..08e50ef837 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -618,7 +620,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -758,7 +760,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -781,7 +783,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -862,7 +864,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1075,7 +1077,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: 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 70e3d79771..9305fe7275 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 @@ -121,7 +121,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: a1dd836d9ae20ffe61a696845546ce7fa69ffa116f935abd1a0a1d13c287508d + manifestHash: de36edbdb72b358dd32f64a77052ecae242ae9aed855bdc39fa993f1e7f3e32f name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content index 9b3bcfbad6..1f4516b022 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true nodeIPFamilies: - ipv6 diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 56a7034c14..08e50ef837 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -618,7 +620,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -758,7 +760,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -781,7 +783,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -862,7 +864,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1075,7 +1077,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index 0efceb1a20..e881a70b61 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: a1dd836d9ae20ffe61a696845546ce7fa69ffa116f935abd1a0a1d13c287508d + manifestHash: de36edbdb72b358dd32f64a77052ecae242ae9aed855bdc39fa993f1e7f3e32f name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content index 2dae150e9a..c9d812d2d3 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true nodeIPFamilies: - ipv6 diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 56a7034c14..08e50ef837 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -618,7 +620,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -758,7 +760,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -781,7 +783,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -862,7 +864,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1075,7 +1077,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index 0efceb1a20..e881a70b61 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: a1dd836d9ae20ffe61a696845546ce7fa69ffa116f935abd1a0a1d13c287508d + manifestHash: de36edbdb72b358dd32f64a77052ecae242ae9aed855bdc39fa993f1e7f3e32f name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content index 3ded15acad..ef6825d6d2 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index fee99c4175..218b110b9c 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content index 20c379c99c..79e5dfb689 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 35d12a278505891da130ce5bcd55aa0d06c4cb97322d2fee58d65230a317b62e + manifestHash: 31b787a59ec2781c054008a963ec292bbecd760caa0a0237b24525bda5523713 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io 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 bcceac7dda..8d1358e0c0 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 @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index c94761b28c..0781dda78c 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: 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 f7616529f9..5a71770b7e 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 @@ -114,7 +114,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 78c04efb935b84fc005511e791a59f5aa7c181e8d9f553fb34c382d4aa1de6d1 + manifestHash: cfb96bab8c7d6190b19849180061a0357205e0c8685fc7b4437738f46ec0fbf1 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content index 2eb97b9671..8ea60d821e 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 001af0d1be..60e38ac415 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content index a90a366309..3ef57bafc9 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: f13cbef1dc00413ae39cc166cdf66966f371dd1590360a819895ab44ddc5c870 + manifestHash: 52668ed9835c667c2655958f351cf3158a05a41cb5fd08802c8ca84280e3fdeb name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content index 4d58e2de0b..b4b8f72a8e 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index f415fcfbf0..892c1e5dca 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.k8s.local - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1121,7 +1123,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content index ddb1faa363..c326aff083 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 6dc7ded7c2f042f9a23a1426de002b8c2fe67c1ca10c65d569ab7958201a356c + manifestHash: 006a6fd1445eccb28399b57fb00291d85b326398a00f407153f4a3cb7bfb5b99 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content index 6a95f8b130..ff8efd8c1f 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 53a978050b..695e6e8331 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content index 86eb82e8e1..b66c8a5419 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: b696d4dccee875ea3ee3e9b257a1940befece141ba92a49d6a7bac43afab25c9 + manifestHash: b697e40f281450f49024c90d0137d9c6c8744737c07fba426a4c82fd9f0fedd7 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content index 6a95f8b130..ff8efd8c1f 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 53a978050b..695e6e8331 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content index 86eb82e8e1..b66c8a5419 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: b696d4dccee875ea3ee3e9b257a1940befece141ba92a49d6a7bac43afab25c9 + manifestHash: b697e40f281450f49024c90d0137d9c6c8744737c07fba426a4c82fd9f0fedd7 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content index 8bc77d02ff..9ea19ae6d3 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 6297fad657..e76c434cf6 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.nthimdsprocessor.lon-kfj86l - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1121,7 +1123,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content index a45597e4b2..e29a8f299b 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content @@ -104,7 +104,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 12f988923d4d0d0fcb9a0410ec5b85c45e7c97afda32a494f50eb7065e6c6c5a + manifestHash: 9023739286085959f968ef7b6572fbc3357ec0191cab61bb632d1a8aef3c3018 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content index 42ebbdebbd..c8a0c9e4df 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 081bd2fe06..4923cab3ac 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content index 6ab0a0faa7..8065343ac0 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content @@ -104,7 +104,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 07ca5f2786178c9a51a80cdb85152807a7fc16688174cf380d40b1bab046ee49 + manifestHash: ad8d742b0f0a48fcd81a36f10138a76819b3b3970a209038bfd5f4915d7bdd72 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content index 1571c8c3f6..e62dd02bd5 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 22014f0bdd..5c4411435c 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 5884d2b6bd..2aa88831fc 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3435d5b06bf4713803bb1ac266409b7ff67aba0904458ca4588cd2b767e6078e + manifestHash: 16005986140d60fa61ea08c2eb0eb47d114b6ae2f49b8ddb0e5721e31708c37d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content index a9f29f6e52..8f8827f95b 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index ee5c080091..724b50a95e 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content index 8169e49efd..75a06b8a44 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 6e9d33ed9ff5b4ec12ca21321cee0f88da520c7c15e5eb7431da1b513b8a8e96 + manifestHash: fbb23942fac2dc1affa5976dc81e7ee94f8f82e0ad9c94b88d73c89a4caee3a8 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content index f1070ab54a..4c4bcb9fcd 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 8440907b8d..2f541e0b32 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content index 04b25e1ac2..2aae1ac964 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 7fa2640af8958bedb09e9da445b7e7d35b50fd28a02bd71d4f122703f02a1ec8 + manifestHash: 590c3dc812c3930cba2ffc6e178247ef740b605d3c3db261f4dbdc12142e8b8a name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content index edec396a72..7ee0147b8e 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 8a0769df82..c372f8a2e1 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content index 6207821b47..529f523003 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content @@ -168,7 +168,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3872e86b6d24f687ca7755d9ff411bdf9b76d9cf70f45e0d3397433cbf79e329 + manifestHash: b252237c03e5326cc57cf5fdc68ad9565167a38315c848972a2831c1a9c5d451 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content index cd2c48f901..d988bb7ff9 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 65feb71233..a991195cc8 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content index a9b74497c1..6ea92d9276 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content @@ -168,7 +168,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 44787a5f2ac360750072aa45bc95f657b98c4765f6334e31edd3ae11d8d01ce1 + manifestHash: 5e11af540f5787bf74245a100d3ccfb9e75beece5ebde38ebe9cbd940e1fe272 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io 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 dc44f3a039..3be3460b61 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 @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index b81dd9e519..350d649386 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: 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 3d4b0e6dbb..12509f1894 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 @@ -114,7 +114,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: b4fd9fbc50e282bfdb7981c299aeb098d71d59dec3563663f1c7382e871dcc7d + manifestHash: ec858733befd4bfb8b1f712ec6e772cafc9dd75f7e98996810a2376421fe3828 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io 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 b17c570dbd..c4c42c9fab 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 @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index b81dd9e519..350d649386 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: 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 3abc86f50e..26b0859a6f 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 @@ -114,7 +114,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: b4fd9fbc50e282bfdb7981c299aeb098d71d59dec3563663f1c7382e871dcc7d + manifestHash: ec858733befd4bfb8b1f712ec6e772cafc9dd75f7e98996810a2376421fe3828 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io 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 eacca78b94..d9d7ebb5cf 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 @@ -15,7 +15,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index b81dd9e519..350d649386 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: 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 f609d8ea11..5fdb359c25 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 @@ -178,7 +178,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: b4fd9fbc50e282bfdb7981c299aeb098d71d59dec3563663f1c7382e871dcc7d + manifestHash: ec858733befd4bfb8b1f712ec6e772cafc9dd75f7e98996810a2376421fe3828 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io 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 d26f10802e..3269da5b38 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 @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 1ab4f47fca..68b415872d 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: 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 a5f7f1a997..ecd131f7a6 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 @@ -114,7 +114,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 4ca533b3ebce66a913fcd1a9f02c93165296a167121c7b7174e882e5bdc3a9aa + manifestHash: 4b19b9026055f91bad3bd5b36d490f026043cadd3e1c8b170500f7fb65f237c9 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content index 1e86178ed8..8bf084ef6c 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 7b0fe50ef0..9cf9c7223b 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content index eb809c93ac..216b972362 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 18a74390963e057385b74ad2b4949a77a84abea261f56d9bf80cfbb21698ec5e + manifestHash: c38a98e24d9938e24a0353e563c416c85fe5d2a892abb81ef7bac99c6e0960e6 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content index 9e1482a458..b103cab2db 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 3bcfd6ccf8..a598aefbd4 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content index b87064fefa..6462d65a07 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: c9cd7e0c6aa80e2e53718382f4c438aadbe47ce2a2ea64c13b7642832fa0ec2c + manifestHash: 46b8ff04589e3a1f6e07cfb35ace79013800fd903bf35855627b6d31986d06d6 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content index 97c616e56e..8ee5744b2f 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 217747f2d9..9e33017ae7 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content index 09604bf920..5007284f52 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content @@ -164,7 +164,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 1fc26fb00701a9b7fc35af6464420de0c95100bc8dcd365175243f754c0ead39 + manifestHash: d5f9495368be96c0d3eb3be5c71b9a9a982053150143b54cde849b2b23fdf54e name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content index ea69bf5ab8..6b4ccfd276 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 49ef2cf888..80c2cd024d 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content index c8c09aca74..98c3b3fc4c 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content @@ -155,7 +155,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: c3e4e60a89557f96e42df1e96c3188584e0ab4cba2308e99bf1f4998f089704c + manifestHash: 25cfcee43972385c20f911f0ed716190503d50a132eb3073627574e5d3e0c2d9 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content index 802c444d9b..7e54a84702 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 0dffd7026e..3b43eba32d 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: value: arn:aws-test:iam::123456789012:role/ebs-csi-controller-sa.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1121,7 +1123,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index b77e4846cb..10fb7e8f41 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: ab2da18d481b9d4a7da20bc857317d5e47b111578986bcd4ae48d575f212bee3 + manifestHash: 744427a1464d6ecf9a477e73f25a9f5fbeb5f8f97f917ead3aeb54c23c1bd820 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content index ffbf339cda..47e51cc033 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index e34fe4fca2..e025cad6ed 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content index f17e13897d..4275026bda 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: f86b56d4b290887b061629ff44af84855a9d0fa52b75d29ed82e308423e3ea13 + manifestHash: 9ab038c0ebf692d189d008af40ad42dbd0993be6060dc76caee749ca36a08a82 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content index 1742a8a6fe..900d0fce9c 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index a476f75208..d3d3b5c35e 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content index 2ab0b0ff61..1406d6cd28 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: e4cbe9a9d991aad34475285d0600af55084b8e79fc400773ccf3efaf9178ad1f + manifestHash: 9c9ffc4878c31394df92920fceebb98526971db462e430975573bc1f18950bb7 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content index 0a02701769..16f83d460f 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true nodeIPFamilies: - ipv6 diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 56a7034c14..08e50ef837 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -618,7 +620,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -758,7 +760,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -781,7 +783,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -862,7 +864,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1075,7 +1077,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index 0efceb1a20..e881a70b61 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: a1dd836d9ae20ffe61a696845546ce7fa69ffa116f935abd1a0a1d13c287508d + manifestHash: de36edbdb72b358dd32f64a77052ecae242ae9aed855bdc39fa993f1e7f3e32f name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content index 4c070caff1..9639322fcd 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content @@ -13,7 +13,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index c302bb92b2..223e14858d 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content index 162bf5007e..c66bfb4ac3 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 6836fc45f189ab89663b0adfbea556dd12a13a8c29769c5f1846d4c38a908f80 + manifestHash: 43fd5d27265295629ffdd51b4537a1409ed131272adb589890b616c3b66f5fc3 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content index 6087d165cd..088a8cf078 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content @@ -11,7 +11,7 @@ spec: channel: stable cloudConfig: awsEBSCSIDriver: - version: v1.26.0 + version: v1.26.1 manageStorageClasses: true cloudControllerManager: allocateNodeCIDRs: true diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content index 22014f0bdd..5c4411435c 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -33,7 +33,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller-sa namespace: kube-system @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-sa namespace: kube-system @@ -68,7 +68,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-attacher-role rules: @@ -127,7 +127,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-role rules: @@ -157,7 +157,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-provisioner-role rules: @@ -249,7 +249,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-resizer-role rules: @@ -317,7 +317,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-external-snapshotter-role rules: @@ -370,7 +370,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-attacher-binding roleRef: @@ -394,7 +394,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node-getter-binding roleRef: @@ -418,7 +418,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-provisioner-binding roleRef: @@ -442,7 +442,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-resizer-binding roleRef: @@ -466,7 +466,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-snapshotter-binding roleRef: @@ -515,7 +515,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-leases-rolebinding namespace: kube-system @@ -562,7 +562,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-node namespace: kube-system @@ -580,7 +580,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -588,6 +588,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: + - key: topology.kubernetes.io/zone + operator: Exists - key: eks.amazonaws.com/compute-type operator: NotIn values: @@ -616,7 +618,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -756,7 +758,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs-csi-controller namespace: kube-system @@ -779,7 +781,7 @@ spec: app.kubernetes.io/component: csi-driver app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 kops.k8s.io/managed-by: kops spec: affinity: @@ -858,7 +860,7 @@ spec: key: endpoint name: aws-meta optional: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.26.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 5 @@ -1071,7 +1073,7 @@ metadata: app.kubernetes.io/instance: aws-ebs-csi-driver app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-ebs-csi-driver - app.kubernetes.io/version: v1.26.0 + app.kubernetes.io/version: v1.26.1 k8s-addon: aws-ebs-csi-driver.addons.k8s.io name: ebs.csi.aws.com spec: diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 415b3a04e3..1c9c7ed59b 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 3435d5b06bf4713803bb1ac266409b7ff67aba0904458ca4588cd2b767e6078e + manifestHash: 16005986140d60fa61ea08c2eb0eb47d114b6ae2f49b8ddb0e5721e31708c37d name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml index 2580efe8a9..599f235693 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml @@ -114,7 +114,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 8aaf90259e5cf4baedc4e65b1f5f18f969f79ad2d193b27775edb3d9d5d7b6d4 + manifestHash: 200cdae414fe10a1011cc10bea37d02942c3896ad5204237b8802b2688328e74 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index 2580efe8a9..599f235693 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -114,7 +114,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 8aaf90259e5cf4baedc4e65b1f5f18f969f79ad2d193b27775edb3d9d5d7b6d4 + manifestHash: 200cdae414fe10a1011cc10bea37d02942c3896ad5204237b8802b2688328e74 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml index 657d691b86..d3d66f35f2 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 8aaf90259e5cf4baedc4e65b1f5f18f969f79ad2d193b27775edb3d9d5d7b6d4 + manifestHash: 200cdae414fe10a1011cc10bea37d02942c3896ad5204237b8802b2688328e74 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml index c054a12c84..b2994875dd 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 8aaf90259e5cf4baedc4e65b1f5f18f969f79ad2d193b27775edb3d9d5d7b6d4 + manifestHash: 200cdae414fe10a1011cc10bea37d02942c3896ad5204237b8802b2688328e74 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml index 8976134d4f..7e96e92ffd 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml @@ -113,7 +113,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 8aaf90259e5cf4baedc4e65b1f5f18f969f79ad2d193b27775edb3d9d5d7b6d4 + manifestHash: 200cdae414fe10a1011cc10bea37d02942c3896ad5204237b8802b2688328e74 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml index 2f26f1521f..58412afe30 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -114,7 +114,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 8aaf90259e5cf4baedc4e65b1f5f18f969f79ad2d193b27775edb3d9d5d7b6d4 + manifestHash: 200cdae414fe10a1011cc10bea37d02942c3896ad5204237b8802b2688328e74 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml index 6f4ce658b0..9be7a796e1 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 8aaf90259e5cf4baedc4e65b1f5f18f969f79ad2d193b27775edb3d9d5d7b6d4 + manifestHash: 200cdae414fe10a1011cc10bea37d02942c3896ad5204237b8802b2688328e74 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io 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 7a276cb812..7ccc587378 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 @@ -128,7 +128,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 8aaf90259e5cf4baedc4e65b1f5f18f969f79ad2d193b27775edb3d9d5d7b6d4 + manifestHash: 200cdae414fe10a1011cc10bea37d02942c3896ad5204237b8802b2688328e74 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io 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 d0b68ffae2..b52d917445 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 @@ -185,7 +185,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 8aaf90259e5cf4baedc4e65b1f5f18f969f79ad2d193b27775edb3d9d5d7b6d4 + manifestHash: 200cdae414fe10a1011cc10bea37d02942c3896ad5204237b8802b2688328e74 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml index a617f63ecf..cf12d657ab 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: a3b249fe7e21f3520e75a65b3ce0a19195027abf9aef769a6e315ffa0d2057c1 + manifestHash: e2f561752e2dd47ff8e0a45b4b808c3d803403362260d131aff136112abbb4c6 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml index 4ff89ad76b..86ed7ec0dd 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -106,7 +106,7 @@ spec: version: 9.99.0 - id: k8s-1.17 manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml - manifestHash: 8aaf90259e5cf4baedc4e65b1f5f18f969f79ad2d193b27775edb3d9d5d7b6d4 + manifestHash: 200cdae414fe10a1011cc10bea37d02942c3896ad5204237b8802b2688328e74 name: aws-ebs-csi-driver.addons.k8s.io selector: k8s-addon: aws-ebs-csi-driver.addons.k8s.io From 3c508bbbae1aa575ab6b565b5126c3aad3e10c37 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 9 Jan 2024 13:21:15 +0200 Subject: [PATCH 6/6] make crds --- k8s/crds/kops.k8s.io_clusters.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml index aec4ef2488..b77f33facf 100644 --- a/k8s/crds/kops.k8s.io_clusters.yaml +++ b/k8s/crds/kops.k8s.io_clusters.yaml @@ -326,6 +326,11 @@ spec: description: 'Enabled enables the AWS EBS CSI driver. Can only be set to true. Default: true' type: boolean + hostNetwork: + description: 'HostNetwork can be used for large clusters for + faster access to node info via instance metadata. Default: + false' + type: boolean kubeAPIBurst: description: KubeAPIBurst Burst to use while talking with Kubernetes API server. (default 100)