Merge pull request #6 from Azure/master

Merge from base master

captainkube/charts/captainkube/templates/_helpers.tpl

@@ -14,3 +14,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Generate the imagePullSecret for a private Container Registry.
+*/}}
+{{- define "imagePullSecret" }}
+{{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .Values.image.repository (printf "%s:%s" .Values.image.username .Values.image.password | b64enc) | b64enc }}
+{{- end }}

captainkube/charts/captainkube/templates/deployment.yaml

@@ -17,6 +17,10 @@ spec:
       labels:
         app: {{ template "fullname" . }}
     spec:
+{{ if .Values.image.private }}
+      imagePullSecrets:
+        - name: {{ .Chart.Name }}-acr-secret
+{{ end }}
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

captainkube/charts/captainkube/templates/secret.yaml

@@ -0,0 +1,9 @@
+{{ if .Values.image.private }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Chart.Name }}-acr-secret
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ template "imagePullSecret" . }}
+{{ end }}

captainkube/charts/captainkube/values.yaml

@@ -1,3 +1,4 @@
 replicaCount: 1
 image:
+  private: false
   pullPolicy: Always

nodebrady/charts/nodebrady/templates/_helpers.tpl

@@ -14,3 +14,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Generate the imagePullSecret for a private Container Registry.
+*/}}
+{{- define "imagePullSecret" }}
+{{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .Values.image.repository (printf "%s:%s" .Values.image.username .Values.image.password | b64enc) | b64enc }}
+{{- end }}

nodebrady/charts/nodebrady/templates/deployment.yaml

@@ -17,6 +17,10 @@ spec:
       labels:
         app: {{ template "fullname" . }}
     spec:
+{{ if .Values.image.private }}
+      imagePullSecrets:
+        - name: {{ .Chart.Name }}-acr-secret
+{{ end }}
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

nodebrady/charts/nodebrady/templates/secret.yaml

@@ -0,0 +1,9 @@
+{{ if .Values.image.private }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Chart.Name }}-acr-secret
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ template "imagePullSecret" . }}
+{{ end }}

nodebrady/charts/nodebrady/values.yaml

@@ -1,5 +1,6 @@
 replicaCount: 1
 image:
+  private: false
   pullPolicy: Always
 service:
   internalPort: 3000

parrot/charts/parrot/templates/_helpers.tpl

@@ -14,3 +14,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Generate the imagePullSecret for a private Container Registry.
+*/}}
+{{- define "imagePullSecret" }}
+{{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .Values.image.repository (printf "%s:%s" .Values.image.username .Values.image.password | b64enc) | b64enc }}
+{{- end }}

parrot/charts/parrot/templates/deployment.yaml

@@ -17,6 +17,10 @@ spec:
       labels:
         app: {{ template "fullname" . }}
     spec:
+{{ if .Values.image.private }}
+      imagePullSecrets:
+        - name: {{ .Chart.Name }}-acr-secret
+{{ end }}
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

parrot/charts/parrot/templates/secret.yaml

@@ -0,0 +1,9 @@
+{{ if .Values.image.private }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Chart.Name }}-acr-secret
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ template "imagePullSecret" . }}
+{{ end }}

parrot/charts/parrot/templates/service.yaml

@@ -14,4 +14,8 @@ spec:
     targetPort: {{ .Values.service.internalPort }}
   selector:
     app: {{ template "fullname" . }}
-  type: ClusterIP
+{{ if .Values.ingress.enabled }}
+  type: ClusterIP
+{{ else }}
+  type: LoadBalancer
+{{ end }}

parrot/charts/parrot/values.yaml

@@ -1,5 +1,6 @@
 replicaCount: 1
 image:
+  private: false
   pullPolicy: Always
 service:
   internalPort: 80

phippy/charts/phippy/templates/_helpers.tpl

@@ -14,3 +14,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Generate the imagePullSecret for a private Container Registry.
+*/}}
+{{- define "imagePullSecret" }}
+{{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .Values.image.repository (printf "%s:%s" .Values.image.username .Values.image.password | b64enc) | b64enc }}
+{{- end }}

phippy/charts/phippy/templates/deployment.yaml

@@ -15,6 +15,10 @@ spec:
         draft: {{ default "draft-app" .Values.draft }}
         app: {{ template "fullname" . }}
     spec:
+{{ if .Values.image.private }}
+      imagePullSecrets:
+        - name: {{ .Chart.Name }}-acr-secret
+{{ end }}
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

phippy/charts/phippy/templates/secret.yaml

@@ -0,0 +1,9 @@
+{{ if .Values.image.private }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Chart.Name }}-acr-secret
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ template "imagePullSecret" . }}
+{{ end }}

phippy/charts/phippy/values.yaml

@@ -3,6 +3,7 @@
 # Declare variables to be passed into your templates.
 replicaCount: 1
 image:
+  private: false
   pullPolicy: IfNotPresent
 service:
   externalPort: 80