Merge pull request #30 from stefanprodan/service-account

Add service account to Helm chart

charts/podinfo/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
-version: 2.1.0
-appVersion: 2.1.0
+version: 2.1.3
+appVersion: 2.1.3
 name: podinfo
 engine: gotpl
 description: Podinfo Helm chart for Kubernetes

charts/podinfo/README.md

@@ -57,11 +57,14 @@ Parameter | Description | Default
 `resources.requests/memory` | pod memory request | `16Mi`
 `resources.limits/cpu` | pod CPU limit | None
 `resources.limits/memory` | pod memory limit | None
+`service.enabled` | create Kubernetes service (should be disabled when using Flagger) | `true`
 `service.externalPort` | external port for the service | `9898`
 `service.internalPort` | internal port for the service | `9898`
 `service.nodePort` | node port for the service | `31198`
 `service.type` | type of service | `ClusterIP`
 `tolerations` | list of node taints to tolerate | `[]`
+`serviceAccount.enabled` | specifies whether a service account should be created | `false`
+`serviceAccount.name` | the name of the service account to use, if not set and create is true, a name is generated using the fullname template | None
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 

charts/podinfo/templates/_helpers.tpl

@@ -30,3 +30,14 @@ Create chart name and version as used by the chart label.
 {{- define "podinfo.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "podinfo.serviceAccountName" -}}
+{{- if .Values.serviceAccount.enabled -}}
+    {{ default (include "podinfo.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}

charts/podinfo/templates/deployment.yaml

@@ -26,6 +26,9 @@ spec:
         prometheus.io/scrape: 'true'
     spec:
       terminationGracePeriodSeconds: 30
+      {{- if .Values.serviceAccount.create }}
+      serviceAccountName: {{ template "podinfo.serviceAccountName" . }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

charts/podinfo/templates/service.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.service.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -20,3 +21,4 @@ spec:
   selector:
     app: {{ template "podinfo.name" . }}
     release: {{ .Release.Name }}
+{{- end }}

charts/podinfo/templates/serviceaccount.yaml

@@ -0,0 +1,11 @@
+{{- if .Values.serviceAccount.enabled -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ template "podinfo.serviceAccountName" . }}
+  labels:
+    app: {{ template "podinfo.name" . }}
+    chart: {{ template "podinfo.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- end -}}

charts/podinfo/templates/tests/jwt.yaml

@@ -24,12 +24,12 @@ spec:
   volumes:
   - name: scripts
     configMap:
-      name: {{ template "podinfo.fullname" . }}-storage-cfg
+      name: {{ template "podinfo.fullname" . }}-test-cfg
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "podinfo.fullname" . }}-storage-cfg
+  name: {{ template "podinfo.fullname" . }}-test-cfg
   labels:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}

charts/podinfo/values.yaml

@@ -11,11 +11,12 @@ faults:
   error: false
 
 image:
-  repository: quay.io/stefanprodan/podinfo
-  tag: 2.1.0
+  repository: stefanprodan/podinfo
+  tag: 2.1.3
   pullPolicy: IfNotPresent
 
 service:
+  enabled: true
   type: ClusterIP
   externalPort: 9898
   containerPort: 9898
@@ -32,6 +33,13 @@ hpa:
   # average http requests per second per pod (k8s-prometheus-adapter)
   requests:
 
+serviceAccount:
+  # Specifies whether a service account should be created
+  enabled: false
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name:
+
 ingress:
   enabled: false
   annotations: {}

e2e/test.sh

@@ -5,8 +5,12 @@ set -o errexit
 REPO_ROOT=$(git rev-parse --show-toplevel)
 export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
 
+function finish {
+  echo '>>> Test logs'
+  kubectl logs -l app=podinfo
+}
+trap finish EXIT
+
 echo '>>> Testing'
 helm test podinfo
 
-echo '>>> Test logs'
-kubectl logs -l app=podinfo

kustomize/deployment.yaml

@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
       - name: podinfod
-        image: quay.io/stefanprodan/podinfo:2.1.0
+        image: stefanprodan/podinfo:2.1.3
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9898

kustomize/kustomization.yaml

@@ -2,4 +2,3 @@ resources:
   - hpa.yaml
   - deployment.yaml
   - service.yaml
-

pkg/version/version.go

@@ -1,4 +1,4 @@
 package version
 
-var VERSION = "2.1.0"
+var VERSION = "2.1.3"
 var REVISION = "unknown"