Merge master

kubernetes-sigs · Apr 16, 2021 · 5ba1a44 · 5ba1a44
2 parents a698d74 + d4f2e0c
commit 5ba1a44
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/charts/aws-efs-csi-driver/CHANGELOG.md b/charts/aws-efs-csi-driver/CHANGELOG.md
@@ -1,15 +1,22 @@
-# Helm chart changelog
+# Helm chart
 
-## v1.3.0
+# v1.3.0
 
-### Notable changes
+## Notable changes
 
 * Multiple breaking changes in values file
-* Kubernetes `1.18+` with `CSIDriver` api version `storage.k8s.io/v1`
+* Support only Kubernetes `>=1.18` with `CSIDriver` API version `storage.k8s.io/v1`
 
-### New features
+## New features
 
 * Set `affinity`, `nodeSelector`, `podAnnotations` and `tolerations` fields independently
 for Controller deployment and Node daemonset
 * Set `resources` and `imagePullPolicy` fields independently for containers
 * Set `reclaimPolicy` and `volumeBindingMode` fields in storage class
+
+# v1.2.2
+
+## Notable changes
+
+* Create `ClusterRole` and `ClusterRoleBinding` even if `ServiceAccount` is not created
+* Release Helm chart seperately
diff --git a/charts/aws-efs-csi-driver/templates/_helpers.tpl b/charts/aws-efs-csi-driver/templates/_helpers.tpl
@@ -48,7 +48,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Create the name of the service account to use
 */}}
 {{- define "aws-efs-csi-driver.serviceAccountName" -}}
-{{- if .Values.serviceAccount.controller.create -}}
+{{- if .Values.controller.create -}}
     {{ default (include "aws-efs-csi-driver.fullname" .) .Values.serviceAccount.controller.name }}
 {{- else -}}
     {{ default "default" .Values.serviceAccount.controller.name }}

diff --git a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
@@ -34,9 +34,7 @@ spec:
         {{- with .Values.controller.nodeSelector }}
         {{- . | toYaml | nindent 8 }}
         {{- end }}
-      {{- if .Values.serviceAccount.controller.create }}
       serviceAccountName: {{ include "aws-efs-csi-driver.serviceAccountName" . }}
-      {{- end }}
       priorityClassName: system-cluster-critical
       tolerations:
         - operator: Exists

diff --git a/charts/aws-efs-csi-driver/templates/controller-serviceaccount.yaml b/charts/aws-efs-csi-driver/templates/controller-serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.serviceAccount.controller.create -}}
+{{- if .Values.serviceAccount.controller.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -9,6 +9,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+{{- end }}
 ---
 
 kind: ClusterRole
@@ -56,4 +57,3 @@ roleRef:
   kind: ClusterRole
   name: efs-csi-external-provisioner-role
   apiGroup: rbac.authorization.k8s.io
-{{- end }}
diff --git a/charts/aws-efs-csi-driver/values.yaml b/charts/aws-efs-csi-driver/values.yaml
@@ -99,7 +99,7 @@ storageClasses: []
 #   - tls
 #   parameters:
 #     provisioningMode: efs-ap
-#     fileSystemId: fs-92107410
+#     fileSystemId: fs-1122aabb
 #     directoryPerms: "700"
 #     gidRangeStart: "1000"
 #     gidRangeEnd: "2000"