Merge f93c04e into 4a8153e

kubernetes-sigs · Mar 18, 2021 · bf4b7e3 · bf4b7e3
2 parents 4a8153e + f93c04e
commit bf4b7e3
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 24 deletions.
diff --git a/CHANGELOG-1.x.md b/CHANGELOG-1.x.md
@@ -1,3 +1,17 @@
+# v1.2
+
+## Notable changes
+- efs-csi-driver now supports dynamic provisioning 
+
+### New features
+* Implement dynamic provisioning ([#274](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/274), [#297](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/297), [@kbasv](https://github.com/kbasv))
+* Add tags to efs resources provisioned by driver ([#309](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/309), [@kbasv](https://github.com/kbasv))
+
+### Improvements
+* Bump efs-utils version to 1.29.1-1 ([#366](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/366), [@kbasv](https://github.com/kbasv))
+* Daemonset Affinity for fargate nodes ([#329](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/329), [@benmccown-amz](https://github.com/benmccown-amz))
+
+
 # v1.1.1
 
 ### Bug fixes

diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@
 
 PKG=github.com/kubernetes-sigs/aws-efs-csi-driver
 IMAGE?=amazon/aws-efs-csi-driver
-VERSION=v1.1.1-dirty
+VERSION=v1.2.0-dirty
 GIT_COMMIT?=$(shell git rev-parse HEAD)
 BUILD_DATE?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 EFS_CLIENT_SOURCE?=k8s

diff --git a/charts/aws-efs-csi-driver/Chart.yaml b/charts/aws-efs-csi-driver/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "1.1.1"
+appVersion: "1.2.0"
 name: aws-efs-csi-driver
 description: A Helm chart for AWS EFS CSI Driver
-version: 1.1.1
+version: 1.2.0
 kubeVersion: ">=1.14.0-0"
 home: https://github.com/kubernetes-sigs/aws-efs-csi-driver
 sources:

diff --git a/charts/aws-efs-csi-driver/values.yaml b/charts/aws-efs-csi-driver/values.yaml
@@ -5,8 +5,8 @@
 replicaCount: 2
 
 image:
-  repository: amazon/aws-efs-csi-driver
-  tag: "v1.1.1"
+  repository: k8s.gcr.io/provider-aws/aws-efs-csi-driver
+  tag: "v1.2.0"
   pullPolicy: IfNotPresent
 
 sidecars:
@@ -18,7 +18,7 @@ sidecars:
     tag: "v2.1.0"
   csiProvisionerImage:
     repository: k8s.gcr.io/sig-storage/csi-provisioner
-    tag: "v2.1.1"
+    tag: "v2.0.3"
 
 imagePullSecrets: []
 nameOverride: ""

diff --git a/deploy/kubernetes/base/controller-deployment.yaml b/deploy/kubernetes/base/controller-deployment.yaml
@@ -31,7 +31,7 @@ spec:
         - name: efs-plugin
           securityContext:
             privileged: true
-          image: "amazon/aws-efs-csi-driver:v1.1.1"
+          image: "amazon/aws-efs-csi-driver:latest"
           imagePullPolicy: IfNotPresent
           args:
             - --endpoint=$(CSI_ENDPOINT)
@@ -58,7 +58,7 @@ spec:
             periodSeconds: 10
             failureThreshold: 5
         - name: csi-provisioner
-          image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
+          image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.3
           args:
             - --csi-address=$(ADDRESS)
             - --v=5

diff --git a/deploy/kubernetes/base/kustomization.yaml b/deploy/kubernetes/base/kustomization.yaml
@@ -2,9 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kube-system
 resources:
-- clusterrole-provisioner.yaml
-- clusterrolebinding-provisioner.yaml
-- node.yaml
+- node-daemonset.yaml
 - csidriver.yaml
-- controller.yaml
-- serviceaccount-csi-controller.yaml
+- controller-deployment.yaml
+- controller-serviceaccount.yaml
diff --git a/deploy/kubernetes/base/node-daemonset.yaml b/deploy/kubernetes/base/node-daemonset.yaml
@@ -39,7 +39,7 @@ spec:
         - name: efs-plugin
           securityContext:
             privileged: true
-          image: "amazon/aws-efs-csi-driver:v1.1.1"
+          image: "amazon/aws-efs-csi-driver:latest"
           args:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr

diff --git a/deploy/kubernetes/overlays/stable/ecr/kustomization.yaml b/deploy/kubernetes/overlays/stable/ecr/kustomization.yaml
@@ -5,10 +5,13 @@ bases:
 images:
   - name: amazon/aws-efs-csi-driver
     newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/aws-efs-csi-driver
-    newTag: v1.0.0
+    newTag: v1.2.0
+  - name: quay.io/k8scsi/csi-provisioner
+    newName: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
+    newTag: v2.0.3-eks-1-18-1
   - name: quay.io/k8scsi/livenessprobe
-    newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/livenessprobe
-    newTag: v2.0.0
+    newName: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
+    newTag: v2.1.0-eks-1-18-1
   - name: quay.io/k8scsi/csi-node-driver-registrar
-    newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-node-driver-registrar
-    newTag: v1.3.0
+    newName: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
+    newTag: v2.0.1-eks-1-18-1
diff --git a/deploy/kubernetes/overlays/stable/kustomization.yaml b/deploy/kubernetes/overlays/stable/kustomization.yaml
@@ -4,8 +4,10 @@ bases:
   - ../../base
 images:
   - name: amazon/aws-efs-csi-driver
-    newTag: v1.1.1
-  - name: quay.io/k8scsi/livenessprobe
-    newTag: v2.0.0
-  - name: quay.io/k8scsi/csi-node-driver-registrar
-    newTag: v1.3.0
+    newTag: v1.2.0
+  - name: k8s.gcr.io/sig-storage/csi-provisioner
+    newTag: v2.0.3
+  - name: k8s.gcr.io/sig-storage/livenessprobe
+    newTag: v2.2.0
+  - name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
+    newTag: v2.1.0
diff --git a/docs/README.md b/docs/README.md
@@ -51,6 +51,7 @@ The following sections are Kubernetes specific. If you are a Kubernetes user, us
 | AWS EFS CSI Driver \ Kubernetes Version| maturity | v1.11 | v1.12 | v1.13 | v1.14 | v1.15 | v1.16 | v1.17+ |
 |----------------------------------------|----------|-------|-------|-------|-------|-------|-------|-------|
 | master branch                          | GA       | no    | no    | no    | no    | no    | no    | yes   |
+| v1.2.x                                 | GA       | no    | no    | no    | no    | no    | no    | yes   |
 | v1.1.x                                 | GA       | no    | no    | no    | yes   | yes   | yes   | yes   |
 | v1.0.x                                 | GA       | no    | no    | no    | yes   | yes   | yes   | yes   |
 | v0.3.0                                 | beta     | no    | no    | no    | yes   | yes   | yes   | yes   |
@@ -61,6 +62,7 @@ The following sections are Kubernetes specific. If you are a Kubernetes user, us
 |EFS CSI Driver Version     | Image                               |
 |---------------------------|-------------------------------------|
 |master branch              |amazon/aws-efs-csi-driver:master     |
+|v1.2.0                     |amazon/aws-efs-csi-driver:v1.2.0     |
 |v1.1.1                     |amazon/aws-efs-csi-driver:v1.1.1     |
 |v1.1.0                     |amazon/aws-efs-csi-driver:v1.1.0     |
 |v1.0.0                     |amazon/aws-efs-csi-driver:v1.0.0     |