Merge pull request #37 from stefanprodan/chart-fixes

Fix Helm tests when running inside a service mesh

charts/podinfo/Chart.yaml

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

charts/podinfo/templates/ingress.yaml

@@ -1,6 +1,5 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "podinfo.fullname" . -}}
-{{- $servicePort := .Values.service.port -}}
 {{- $ingressPath := .Values.ingress.path -}}
 apiVersion: extensions/v1beta1
 kind: Ingress

charts/podinfo/templates/tests/grpc.yaml

@@ -9,6 +9,9 @@ metadata:
     app: {{ template "podinfo.name" . }}
   annotations:
     "helm.sh/hook": test-success
+    sidecar.istio.io/inject: "false"
+    linkerd.io/inject: disabled
+    appmesh.k8s.aws/sidecarInjectorWebhook: disabled
 spec:
   containers:
     - name: grpc-health-probe

charts/podinfo/templates/tests/jwt.yaml

@@ -9,6 +9,9 @@ metadata:
     app: {{ template "podinfo.name" . }}
   annotations:
     "helm.sh/hook": test-success
+    sidecar.istio.io/inject: "false"
+    linkerd.io/inject: disabled
+    appmesh.k8s.aws/sidecarInjectorWebhook: disabled
 spec:
   containers:
     - name: tools

charts/podinfo/templates/tests/service.yaml

@@ -9,10 +9,20 @@ metadata:
     app: {{ template "podinfo.name" . }}
   annotations:
     "helm.sh/hook": test-success
+    sidecar.istio.io/inject: "false"
+    linkerd.io/inject: disabled
+    appmesh.k8s.aws/sidecarInjectorWebhook: disabled
 spec:
   containers:
     - name: curl
-      image: radial/busyboxplus:curl
-      command: ['curl']
-      args:  ['{{ template "podinfo.fullname" . }}:{{ .Values.service.externalPort }}']
+      image: giantswarm/tiny-tools
+      command:
+        - sh
+        - -c
+        - |
+          TOKEN=$(curl -sd 'test' ${PODINFO_SVC}/token | jq -r .token) &&
+          curl -H "Authorization: Bearer ${TOKEN}" ${PODINFO_SVC}/token/validate | grep test
+      env:
+        - name: PODINFO_SVC
+          value: {{ template "podinfo.fullname" . }}:{{ .Values.service.externalPort }}
   restartPolicy: Never

charts/podinfo/values.yaml

@@ -12,7 +12,7 @@ faults:
 
 image:
   repository: stefanprodan/podinfo
-  tag: 3.1.0
+  tag: 3.1.1
   pullPolicy: IfNotPresent
 
 service:

kustomize/deployment.yaml

@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
       - name: podinfod
-        image: stefanprodan/podinfo:3.1.0
+        image: stefanprodan/podinfo:3.1.1
         imagePullPolicy: IfNotPresent
         ports:
         - name: http

pkg/version/version.go

@@ -1,4 +1,4 @@
 package version
 
-var VERSION = "3.1.0"
+var VERSION = "3.1.1"
 var REVISION = "unknown"