diff --git a/hack/e2e/run.sh b/hack/e2e/run.sh index 94e3122d30..2ad4e3bd49 100755 --- a/hack/e2e/run.sh +++ b/hack/e2e/run.sh @@ -48,15 +48,15 @@ IMAGE_TAG=${IMAGE_TAG:-${TEST_ID}} # kops: must include patch version (e.g. 1.19.1) # eksctl: mustn't include patch version (e.g. 1.19) -K8S_VERSION_KOPS=${K8S_VERSION_KOPS:-${K8S_VERSION:-1.26.2}} -K8S_VERSION_EKSCTL=${K8S_VERSION_EKSCTL:-${K8S_VERSION:-1.25}} +K8S_VERSION_KOPS=${K8S_VERSION_KOPS:-${K8S_VERSION:-1.27.0}} +K8S_VERSION_EKSCTL=${K8S_VERSION_EKSCTL:-${K8S_VERSION:-1.26}} -KOPS_VERSION=${KOPS_VERSION:-1.26.2} +KOPS_VERSION=${KOPS_VERSION:-1.27.0-alpha.2} KOPS_STATE_FILE=${KOPS_STATE_FILE:-s3://k8s-kops-csi-e2e} KOPS_PATCH_FILE=${KOPS_PATCH_FILE:-./hack/kops-patch.yaml} KOPS_PATCH_NODE_FILE=${KOPS_PATCH_NODE_FILE:-./hack/kops-patch-node.yaml} -EKSCTL_VERSION=${EKSCTL_VERSION:-0.133.0} +EKSCTL_VERSION=${EKSCTL_VERSION:-0.141.0} EKSCTL_PATCH_FILE=${EKSCTL_PATCH_FILE:-./hack/eksctl-patch.yaml} VPC_CONFIGMAP_FILE=${VPC_CONFIGMAP_FILE:-./hack/vpc-resource-controller-configmap.yaml} EKSCTL_ADMIN_ROLE=${EKSCTL_ADMIN_ROLE:-} diff --git a/hack/kops-patch.yaml b/hack/kops-patch.yaml index 2e29993586..5608976d57 100644 --- a/hack/kops-patch.yaml +++ b/hack/kops-patch.yaml @@ -143,25 +143,6 @@ spec: } } ] - kubeAPIServer: - featureGates: - CSIMigration: "true" - CSIMigrationAWS: "true" - ExpandCSIVolumes: "true" - CSIInlineVolume: "true" - kubeControllerManager: - featureGates: - CSIMigration: "true" - CSIMigrationAWS: "true" - ExpandCSIVolumes: "true" - CSIInlineVolume: "true" - kubelet: - featureGates: - CSIMigration: "true" - CSIMigrationAWS: "true" - ExpandCSIVolumes: "true" - CSIInlineVolume: "true" - anonymousAuth: false cloudConfig: awsEBSCSIDriver: enabled: true