Merge pull request #1701 from zmaguire/master

Pre-release PR for 2.1.12 release

Author: dankova22

CHANGELOG-2.x.md

@@ -1,3 +1,7 @@
+# V2.1.12
+* Update golang MV in DockerFile ([#1697](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1697), [@mondaljs](https://github.com/mondaljs))
+* Update Sidecar Versions to Resolve CVEs ([#1694](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1694), [@samuhale](https://github.com/samuhale))
+* Allow : in Tags with Escape Character ([#1693](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1693), [@samuhale](https://github.com/samuhale))
 # V2.1.11
 * Bump k8 version to default 1.33 for e2e tests([#1681](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1681), [@dankova22](https://github.com/dankova22))
 * Update openssl installation change in Dockerfile ([#1678](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1678), [@anthotse](https:///github.com/anthotse))

Makefile

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-VERSION=v2.1.11
+VERSION=v2.1.12
 
 PKG=github.com/kubernetes-sigs/aws-efs-csi-driver
 GIT_COMMIT?=$(shell git rev-parse HEAD)

charts/aws-efs-csi-driver/CHANGELOG.md

@@ -1,4 +1,6 @@
 # Helm chart
+# v3.2.3
+* Bump app/driver version to `v2.1.12`
 # v3.2.2
 * Bump app/driver version to `v2.1.11`
 # v3.2.1

charts/aws-efs-csi-driver/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: aws-efs-csi-driver
-version: 3.2.2
-appVersion: 2.1.11
+version: 3.2.3
+appVersion: 2.1.12
 kubeVersion: ">=1.17.0-0"
 description: "A Helm chart for AWS EFS CSI Driver"
 home: https://github.com/kubernetes-sigs/aws-efs-csi-driver

charts/aws-efs-csi-driver/values.yaml

@@ -11,7 +11,7 @@ portRangeUpperBound: "21049"
 
 image:
   repository: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver
-  tag: "v2.1.11"
+  tag: "v2.1.12"
   pullPolicy: IfNotPresent
 
 sidecars:

deploy/kubernetes/base/controller-deployment.yaml

@@ -37,7 +37,7 @@ spec:
         - name: efs-plugin
           securityContext:
             privileged: true
-          image: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.1.11
+          image: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.1.12
           imagePullPolicy: IfNotPresent
           args:
             - --endpoint=$(CSI_ENDPOINT)

deploy/kubernetes/base/node-daemonset.yaml

@@ -48,7 +48,7 @@ spec:
         - name: efs-plugin
           securityContext:
             privileged: true
-          image: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.1.11
+          image: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.1.12
           imagePullPolicy: IfNotPresent
           args:
             - --endpoint=$(CSI_ENDPOINT)

deploy/kubernetes/overlays/stable/ecr/kustomization.yaml

@@ -5,7 +5,7 @@ bases:
 images:
   - name: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver
     newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/aws-efs-csi-driver
-    newTag: v2.1.11
+    newTag: v2.1.12
   - name: public.ecr.aws/csi-components/livenessprobe
     newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/livenessprobe
     newTag: v2.16.0-eksbuild.5

deploy/kubernetes/overlays/stable/kustomization.yaml

@@ -4,7 +4,7 @@ bases:
   - ../../base
 images:
   - name: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver
-    newTag: v2.1.11
+    newTag: v2.1.12
   - name: public.ecr.aws/csi-components/livenessprobe
     newTag: v2.16.0-eksbuild.5
   - name: public.ecr.aws/csi-components/csi-node-driver-registrar

docs/README.md

@@ -89,6 +89,7 @@ The following sections are Kubernetes specific. If you are a Kubernetes user, us
 | Amazon EFS CSI Driver Version | Image                            |
 |-------------------------------|----------------------------------|
 | master branch                 | amazon/aws-efs-csi-driver:master |
+| v2.1.12                       | amazon/aws-efs-csi-driver:v2.1.12 |
 | v2.1.11                       | amazon/aws-efs-csi-driver:v2.1.11|
 | v2.1.10                       | amazon/aws-efs-csi-driver:v2.1.10|
 | v2.1.9                        | amazon/aws-efs-csi-driver:v2.1.9 |
@@ -161,7 +162,7 @@ The following sections are Kubernetes specific. If you are a Kubernetes user, us
 ### ECR Image
 | Driver Version | [ECR](https://gallery.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver) Image |
 |----------------|-------------------------------------------------------------------------------|
-| v2.1.11        | public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.1.11               |
+| v2.1.12        | public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.1.12               |
 
 **Note**  
 You can find previous efs-csi-driver versions' images from [here](https://gallery.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver)
@@ -386,7 +387,7 @@ If you want to update to a specific version, first customize the driver yaml fil
 kubectl kustomize "github.com/kubernetes-sigs/aws-efs-csi-driver/deploy/kubernetes/overlays/stable/?ref=release-2.0" > driver.yaml
 ```
 
-Then, update all lines referencing `image: amazon/aws-efs-csi-driver` to the desired version (e.g., to `image: amazon/aws-efs-csi-driver:v2.1.11`) in the yaml file, and deploy driver yaml again:
+Then, update all lines referencing `image: amazon/aws-efs-csi-driver` to the desired version (e.g., to `image: amazon/aws-efs-csi-driver:v2.1.12`) in the yaml file, and deploy driver yaml again:
 ```sh
 kubectl apply -f driver.yaml
 ```