Bumping up to k8s 1.21

kubernetes-sigs · Jun 24, 2022 · 3aef42c · 3aef42c
1 parent 06de073
commit 3aef42c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -116,7 +116,7 @@ test:
 
 .PHONY: test-e2e
 test-e2e:
-	K8S_VERSION="1.20.15" \
+	K8S_VERSION="1.21.12" \
 	DRIVER_NAME=aws-efs-csi-driver \
 	CONTAINER_NAME=efs-plugin \
 	TEST_EXTRA_FLAGS='--cluster-name=$$CLUSTER_NAME --created-by=kops' \
@@ -129,7 +129,7 @@ test-e2e:
 .PHONY: test-e2e-external-eks
 test-e2e-external-eks:
 	CLUSTER_TYPE=eksctl \
-	K8S_VERSION="1.20" \
+	K8S_VERSION="1.21" \
 	DRIVER_NAME=aws-efs-csi-driver \
 	HELM_VALUES_FILE="./hack/values_eksctl.yaml" \
 	CONTAINER_NAME=efs-plugin \

diff --git a/charts/aws-efs-csi-driver/values.yaml b/charts/aws-efs-csi-driver/values.yaml
@@ -28,7 +28,7 @@ sidecars:
   csiProvisioner:
     image:
       repository: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
-      tag: v3.1.0-eks-1-20-15
+      tag: v3.1.0-eks-1-21-12
       pullPolicy: IfNotPresent
     resources: {}
 

diff --git a/deploy/kubernetes/base/controller-deployment.yaml b/deploy/kubernetes/base/controller-deployment.yaml
@@ -60,7 +60,7 @@ spec:
             periodSeconds: 10
             failureThreshold: 5
         - name: csi-provisioner
-          image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v3.1.1-eks-1-20-15
+          image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v3.1.0-eks-1-21-12
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=$(ADDRESS)

diff --git a/hack/e2e/run.sh b/hack/e2e/run.sh
@@ -50,7 +50,7 @@ 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=${K8S_VERSION:-1.20.15}
+K8S_VERSION=${K8S_VERSION:-1.21.12}
 
 KOPS_VERSION=${KOPS_VERSION:-1.21.0}
 KOPS_STATE_FILE=${KOPS_STATE_FILE:-s3://k8s-kops-csi-e2e}
@@ -189,10 +189,10 @@ fi
 loudecho "Driver deployment complete, time used: $secondUsed seconds"
 
 loudecho "Testing focus ${GINKGO_FOCUS}"
-eval "EXPANDED_TEST_EXTRA_FLAGS=\"$TEST_EXTRA_FLAGS\""
+eval "EXPANDED_TEST_EXTRA_FLAGS=$TEST_EXTRA_FLAGS"
 set -x
 set +e
-${GINKGO_BIN} -p -nodes="${GINKGO_NODES}" -v --focus="${GINKGO_FOCUS}" --skip="${GINKGO_SKIP}" "${TEST_PATH}" -- -kubeconfig="${KUBECONFIG}" -report-dir="${ARTIFACTS}" -gce-zone="${FIRST_ZONE}" $EXPANDED_TEST_EXTRA_FLAGS
+${GINKGO_BIN} -p -nodes="${GINKGO_NODES}" -v --focus="${GINKGO_FOCUS}" --skip="${GINKGO_SKIP}" "${TEST_PATH}" -- -kubeconfig="${KUBECONFIG}" -report-dir="${ARTIFACTS}" -gce-zone="${FIRST_ZONE}" "${EXPANDED_TEST_EXTRA_FLAGS}"
 TEST_PASSED=$?
 set -e
 set +x