Merge branch 'master' into feature/adding_ec

Author: Christopher Hein

charts/aws-service-operator/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: aws-service-operator
-version: 0.0.1
+version: 0.0.2
 description: The AWS Service Operator allows you to manage AWS resources using Kubernetes Custom Resource Definitions.
 keywords:
   - AWS

charts/aws-service-operator/README.md

@@ -24,6 +24,7 @@ The following table lists the configurable parameters of the aws-service-operato
 | `image.repository`        | Container image repository             | `awsserviceoperator/aws-service-operator`          |
 | `image.tag`               | Container image tag                    | `v0.0.1-alpha2`                                    |
 | `image.pullPolicy`        | Container pull policy                  | `IfNotPresent`                                     |
+| `image.pullSecret`        | Container pull secret (secret created not by this chart) | ``                               |
 | `operator.accountId`      | AWS Account ID to operator on          | `""`                                               |
 | `operator.bucket`         | Base bucket to store resources in      | `aws-operator`                                     |
 | `operator.clusterName`    | Used to label generated CF templates   | `aws-operator`                                     |

charts/aws-service-operator/templates/deployment.yaml

@@ -22,6 +22,10 @@ spec:
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
       {{ end }}
+      {{- if .Values.image.pullSecret }}
+      imagePullSecrets:
+        - name: {{ .Values.image.pullSecret }}
+      {{- end  }}
       serviceAccountName: {{ if .Values.rbac.create }}{{ template "aws-service-operator.fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
       containers:
         - name: aws-service-operator

charts/aws-service-operator/values.yaml

@@ -5,6 +5,7 @@ image:
   repository: awsserviceoperator/aws-service-operator
   tag: v0.0.1-alpha2
   pullPolicy: IfNotPresent
+  #pullSecret: your-k8-secet-to-use (not deployed by chart, but you can reference existing one)
 
 ## App config
 operator: