diff --git a/stable/efs-provisioner/Chart.yaml b/stable/efs-provisioner/Chart.yaml index e16be317c1..d1a8ec1414 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.1 +version: 0.1.2 appVersion: v0.1.2 home: https://github.com/kubernetes-incubator/external-storage/tree/master/aws/efs sources: diff --git a/stable/efs-provisioner/templates/deployment.yaml b/stable/efs-provisioner/templates/deployment.yaml index 6e014fee26..245d566d51 100644 --- a/stable/efs-provisioner/templates/deployment.yaml +++ b/stable/efs-provisioner/templates/deployment.yaml @@ -1,3 +1,14 @@ + {{- if ne .Values.efsProvisioner.efsFileSystemId "fs-12345678" }} + {{/* + The `efsFileSystemId` value must be set. + + The above `if` condition also prevents the helm integration tests from failing. + Given that the helm test infrastructure does not have access to valid + AWS EFS resources, a deployment that references the example `fs-12345678` + creates pods that will never enter a clean, running state. + + Omitting the deployment hacks around this limitation. +*/}} kind: Deployment apiVersion: apps/v1beta2 metadata: @@ -24,6 +35,9 @@ spec: release: "{{ .Release.Name }}" spec: serviceAccount: {{ template "efs-provisioner.serviceAccountName" . }} + {{- if .Values.priorityClassName }} + priorityClassName: "{{ .Values.priorityClassName }}" + {{- end }} containers: - name: {{ template "efs-provisioner.fullname" . }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" @@ -54,3 +68,4 @@ spec: nfs: server: {{ .Values.efsProvisioner.efsFileSystemId }}.efs.{{ .Values.efsProvisioner.awsRegion }}.amazonaws.com path: / +{{- end }} diff --git a/stable/efs-provisioner/values.yaml b/stable/efs-provisioner/values.yaml index d93b610621..c568533405 100644 --- a/stable/efs-provisioner/values.yaml +++ b/stable/efs-provisioner/values.yaml @@ -65,3 +65,5 @@ resources: {} # requests: # cpu: 100m # memory: 128Mi + +priorityClassName: ""