From d5ef3707c48e8b581908583e84e62525aa9055ff Mon Sep 17 00:00:00 2001
From: Josh Myers <joshuajmyers@gmail.com>
Date: Tue, 22 Jan 2019 18:51:01 +0000
Subject: [PATCH] [stable/efs-provisioner] Allow passing in annotations via
 values (#10829)

This commit enables passing in annotations via values for the
`efs-provisioner` chart and bumps the version to 0.1.3

Signed-off-by: Josh Myers <joshuajmyers@gmail.com>
---
 stable/efs-provisioner/Chart.yaml                        | 2 +-
 stable/efs-provisioner/README.md                         | 4 ++++
 stable/efs-provisioner/templates/clusterrole.yaml        | 2 ++
 stable/efs-provisioner/templates/clusterrolebinding.yaml | 2 ++
 stable/efs-provisioner/templates/deployment.yaml         | 4 ++++
 stable/efs-provisioner/templates/serviceaccount.yaml     | 2 ++
 stable/efs-provisioner/templates/storageclass.yaml       | 1 +
 7 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/stable/efs-provisioner/Chart.yaml b/stable/efs-provisioner/Chart.yaml
index d1a8ec1414..b71467edee 100644
--- a/stable/efs-provisioner/Chart.yaml
+++ b/stable/efs-provisioner/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: efs-provisioner
 description: A Helm chart for the AWS EFS external storage provisioner
-version: 0.1.2
+version: 0.1.3
 appVersion: v0.1.2
 home: https://github.com/kubernetes-incubator/external-storage/tree/master/aws/efs
 sources:
diff --git a/stable/efs-provisioner/README.md b/stable/efs-provisioner/README.md
index 0d8693d266..9648ac7ffe 100644
--- a/stable/efs-provisioner/README.md
+++ b/stable/efs-provisioner/README.md
@@ -68,6 +68,10 @@ busyboxImage:
   tag: 1.27
   pullPolicy: IfNotPresent
 
+## Deployment annotations
+##
+annotations: {}
+
 ## Configure provisioner
 ## https://github.com/kubernetes-incubator/external-storage/tree/master/aws/efs#deployment
 ##
diff --git a/stable/efs-provisioner/templates/clusterrole.yaml b/stable/efs-provisioner/templates/clusterrole.yaml
index 122a4aa251..59a9ab1427 100644
--- a/stable/efs-provisioner/templates/clusterrole.yaml
+++ b/stable/efs-provisioner/templates/clusterrole.yaml
@@ -9,6 +9,8 @@ metadata:
     chart: {{ template "efs-provisioner.chartname" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  annotations:
+{{ toYaml .Values.annotations | indent 4 }}
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
diff --git a/stable/efs-provisioner/templates/clusterrolebinding.yaml b/stable/efs-provisioner/templates/clusterrolebinding.yaml
index 7bb8f76895..d2943ca958 100644
--- a/stable/efs-provisioner/templates/clusterrolebinding.yaml
+++ b/stable/efs-provisioner/templates/clusterrolebinding.yaml
@@ -9,6 +9,8 @@ metadata:
     chart: {{ template "efs-provisioner.chartname" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  annotations:
+{{ toYaml .Values.annotations | indent 4 }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "efs-provisioner.serviceAccountName" . }}
diff --git a/stable/efs-provisioner/templates/deployment.yaml b/stable/efs-provisioner/templates/deployment.yaml
index 245d566d51..903d4c77ba 100644
--- a/stable/efs-provisioner/templates/deployment.yaml
+++ b/stable/efs-provisioner/templates/deployment.yaml
@@ -19,6 +19,8 @@ metadata:
     chart: {{ template "efs-provisioner.chartname" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  annotations:
+{{ toYaml .Values.annotations | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -33,6 +35,8 @@ spec:
       labels:
         app: {{ template "efs-provisioner.name" . }}
         release: "{{ .Release.Name }}"
+      annotations:
+{{ toYaml .Values.annotations | indent 8 }}
     spec:
       serviceAccount: {{ template "efs-provisioner.serviceAccountName" . }}
       {{- if .Values.priorityClassName }}
diff --git a/stable/efs-provisioner/templates/serviceaccount.yaml b/stable/efs-provisioner/templates/serviceaccount.yaml
index 5ca58616a4..0e477fa244 100644
--- a/stable/efs-provisioner/templates/serviceaccount.yaml
+++ b/stable/efs-provisioner/templates/serviceaccount.yaml
@@ -9,4 +9,6 @@ metadata:
     chart: {{ template "efs-provisioner.chartname" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  annotations:
+{{ toYaml .Values.annotations | indent 4 }}
 {{- end }}
diff --git a/stable/efs-provisioner/templates/storageclass.yaml b/stable/efs-provisioner/templates/storageclass.yaml
index e8a1d6341f..f6822f03b4 100644
--- a/stable/efs-provisioner/templates/storageclass.yaml
+++ b/stable/efs-provisioner/templates/storageclass.yaml
@@ -11,6 +11,7 @@ metadata:
 {{- if .Values.efsProvisioner.storageClass.isDefault }}
   annotations:
     storageclass.kubernetes.io/is-default-class: "true"
+{{ toYaml .Values.annotations | indent 4 }}
 {{- end }}
 provisioner: {{ .Values.efsProvisioner.provisionerName }}
 parameters: