From 638bdc8e83a74e7818f9b1b5dcbc8fba1fd239bf Mon Sep 17 00:00:00 2001
From: Sean Eagan <sean.eagan@att.com>
Date: Wed, 13 May 2020 12:01:43 -0500
Subject: [PATCH] Helm 3 tests should be Jobs

Without this "helm.sh/hook-delete-policy": before-hook-creation" does not work.
---
 charts/podinfo/templates/tests/grpc.yaml    | 18 ++++++------
 charts/podinfo/templates/tests/jwt.yaml     | 32 +++++++++++----------
 charts/podinfo/templates/tests/service.yaml | 30 ++++++++++---------
 3 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/charts/podinfo/templates/tests/grpc.yaml b/charts/podinfo/templates/tests/grpc.yaml
index 55f0323..1176a62 100644
--- a/charts/podinfo/templates/tests/grpc.yaml
+++ b/charts/podinfo/templates/tests/grpc.yaml
@@ -1,5 +1,5 @@
-apiVersion: v1
-kind: Pod
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ template "podinfo.fullname" . }}-grpc-test-{{ randAlphaNum 5 | lower }}
   labels:
@@ -14,9 +14,11 @@ metadata:
     linkerd.io/inject: disabled
     appmesh.k8s.aws/sidecarInjectorWebhook: disabled
 spec:
-  containers:
-    - name: grpc-health-probe
-      image: stefanprodan/grpc_health_probe:v0.3.0
-      command: ['grpc_health_probe']
-      args:  ['-addr={{ template "podinfo.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.service.grpcPort }}']
-  restartPolicy: Never
+  template:
+    spec:
+      containers:
+        - name: grpc-health-probe
+          image: stefanprodan/grpc_health_probe:v0.3.0
+          command: ['grpc_health_probe']
+          args:  ['-addr={{ template "podinfo.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.service.grpcPort }}']
+      restartPolicy: Never
diff --git a/charts/podinfo/templates/tests/jwt.yaml b/charts/podinfo/templates/tests/jwt.yaml
index 4b7debf..788f4d3 100644
--- a/charts/podinfo/templates/tests/jwt.yaml
+++ b/charts/podinfo/templates/tests/jwt.yaml
@@ -1,5 +1,5 @@
-apiVersion: v1
-kind: Pod
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ template "podinfo.fullname" . }}-jwt-test-{{ randAlphaNum 5 | lower }}
   labels:
@@ -14,16 +14,18 @@ metadata:
     linkerd.io/inject: disabled
     appmesh.k8s.aws/sidecarInjectorWebhook: disabled
 spec:
-  containers:
-    - name: tools
-      image: giantswarm/tiny-tools
-      command:
-        - sh
-        - -c
-        - |
-          TOKEN=$(curl -sd 'test' ${PODINFO_SVC}/token | jq -r .token) &&
-          curl -sH "Authorization: Bearer ${TOKEN}" ${PODINFO_SVC}/token/validate | grep test
-      env:
-      - name: PODINFO_SVC
-        value: "{{ template "podinfo.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.service.externalPort }}"
-  restartPolicy: Never
+  template:
+    spec:
+      containers:
+        - name: tools
+          image: giantswarm/tiny-tools
+          command:
+            - sh
+            - -c
+            - |
+              TOKEN=$(curl -sd 'test' ${PODINFO_SVC}/token | jq -r .token) &&
+              curl -sH "Authorization: Bearer ${TOKEN}" ${PODINFO_SVC}/token/validate | grep test
+          env:
+          - name: PODINFO_SVC
+            value: "{{ template "podinfo.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.service.externalPort }}"
+      restartPolicy: Never
diff --git a/charts/podinfo/templates/tests/service.yaml b/charts/podinfo/templates/tests/service.yaml
index bd81825..7852639 100644
--- a/charts/podinfo/templates/tests/service.yaml
+++ b/charts/podinfo/templates/tests/service.yaml
@@ -1,5 +1,5 @@
-apiVersion: v1
-kind: Pod
+apiVersion: batch/v1
+kind: Job
 metadata:
   name: {{ template "podinfo.fullname" . }}-service-test-{{ randAlphaNum 5 | lower }}
   labels:
@@ -14,15 +14,17 @@ metadata:
     linkerd.io/inject: disabled
     appmesh.k8s.aws/sidecarInjectorWebhook: disabled
 spec:
-  containers:
-    - name: curl
-      image: curlimages/curl:7.69.0
-      command:
-        - sh
-        - -c
-        - |
-          curl -s ${PODINFO_SVC}/api/info | grep version
-      env:
-        - name: PODINFO_SVC
-          value: "{{ template "podinfo.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.service.externalPort }}"
-  restartPolicy: Never
+  template:
+    spec:
+      containers:
+        - name: curl
+          image: curlimages/curl:7.69.0
+          command:
+            - sh
+            - -c
+            - |
+              curl -s ${PODINFO_SVC}/api/info | grep version
+          env:
+            - name: PODINFO_SVC
+              value: "{{ template "podinfo.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.service.externalPort }}"
+      restartPolicy: Never