[tavern] Use Manifests Library (#11)

Signed-off-by: Oliver Bähler <[email protected]>

Author: oliverbaehler

charts/tavern/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: tavern
 description: "Unofficial Tavern Helm Chart"
 type: application
-version: 0.1.3
+version: 0.2.0
 appVersion: 1.0.3
 home: "https://tavern.readthedocs.io/en/latest/"
 icon: "https://tavern.readthedocs.io/en/latest/_static/icon.png"
@@ -12,14 +12,14 @@ keywords:
   - API testing
   - pytest
 dependencies:
-  - name: "library"
-    version: 0.2.0
-    repository: https://buttahtoast.github.io/helm-charts/
+ - name: manifests
+   version: ">=0.1.0"
+   repository: https://bedag.github.io/helm-charts
 maintainers:
   - name: oliverbaehler
     email: [email protected]
   - name: chifu1234
-    email: [email protected]    
+    email: [email protected]
 annotations:
   artifacthub.io/containsSecurityUpdates: "false"
   artifacthub.io/prerelease: "true"

charts/tavern/README.md.gotmpl

@@ -44,7 +44,7 @@ Tavern tests are implemented under the key `$.Values.tests`. Each element of thi
 
 ## Using Templates
 
-This chart provides the functionality to create templates, which can be rereferenced. The templates allow you to implement go sprig logic and therefor might dramatically improve your tavern test suites.
+This chart provides the functionality to create templates, which can be re referenced. The templates allow you to implement go sprig logic and therefor might dramatically improve your tavern test suites.
 
 **NOTE**: While tavern statements use single `{ .. }` I had to replace the go sprig `\{\{ .. }}` as well with single `{ .. }` because of the documenting engine.
 

charts/tavern/examples/advanced.yaml

@@ -1,3 +1,23 @@
+## Tavern Configuration
+tavern:
+  asCronjob: true
+
+## Job (CronJob) Configuration
+# Watch out when having a * as first character.
+job:
+  schedule: "{{ printf \"%s\" \"* * * * 0\" | quote }}"
+
+  ## Add Extra Resource as Volume
+  volumes:
+    - name: scripts
+      configMap:
+        name: "{{ cat (include \"lib.utils.fullname\" $) \"-scripts\" | nospace }}"
+
+  ## Mount custom volume into pod
+  volumeMounts:
+    - name: scripts
+      mountPath: "/scripts"
+
 
 ## Declare Environment Variables
 environment:
@@ -8,38 +28,29 @@ environment:
   - name: "BASIC_AUTH_PASSWD"
     value: "password"
 
-
+## Extra Resources
+# Manifests compatible extra resoures
 extraResources:
 
   ## Python Scripts to integrate with Tavern Tests
-  - apiVersion: v1
-    kind: ConfigMap
-    metadata:
-      name: "{{ cat (include \"lib.utils.fullname\" $) \"-scripts\" | nospace }}"
-    data:
-      testing_utils.py: |
-        def message_says_hello(response):
-            """Make sure that the response was friendly
-            """
-            assert response.json().get("message") == "hello world"
-
-## Declare the Configmap as volume
-volumes:
-  - name: scripts
-    configMap:
-      name: "{{ cat (include \"lib.utils.fullname\" $) \"-scripts\" | nospace }}"
-
-
-## Mount the Common Values
-volumeMounts:
-  - name: scripts
-    mountPath: "/scripts"
+  - type: "raw"
+    manifest: |
+      apiVersion: v1
+      kind: ConfigMap
+      metadata:
+        name: "{{ cat (include "lib.utils.fullname" $) "-scripts" | nospace }}"
+      data:
+        testing_utils.py: |
+          def message_says_hello(response):
+              """Make sure that the response was friendly
+              """
+              assert response.json().get("message") == "hello world"
+
 
 ## Custom Value Structure
 common:
   country: "Switzerland"
 
-
 ## Tavern Stage Templates
 stageTemplates:
   - name: "http_get"
@@ -121,7 +132,7 @@ tests:
             url: '{tavern.env_vars.HOST}/home'
             method: GET
             json:
-              country: {{ $.Values.common.country }}
+              country: "{{ $.Values.common.country }}"
             headers:
               content-type: "application/json"
           response:

charts/tavern/templates/bundle.yaml

@@ -0,0 +1,75 @@
+{{/*
+
+Copyright © 2020 Oliver Baehler
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+{{ $t := fromYaml (include "tavern.bundle" $) }}
+*/}}
+
+{{- include "bedag-lib.manifest.bundle" (dict "bundle" (fromYaml (include "tavern.bundle" $)) "context" $) | nindent 0 }}
+
+{{/*
+  Tavern Chart Bundle
+*/}}
+{{- define "tavern.bundle" -}}
+  {{- $tavern_tests := (fromYaml (include "tavern.tests" $)) -}}
+resources:
+  {{- if and $.Values.extraResources (kindIs "slice" $.Values.extraResources) }}
+    {{- toYaml $.Values.extraResources | nindent 2 }}
+  {{- end }}
+  {{- if $.Values.tavern.asCronjob }}
+  - type: "cronjob"
+  {{- else }}
+  - type: "job"
+  {{- end }}
+    values: {{ toYaml $.Values.job | nindent 6 }}
+    overwrites:
+
+      {{/* VolumeMounts */}}
+      volumeMounts:
+      {{- if $.Values.job.volumeMounts }}
+        {{- toYaml $.Values.job.volumeMounts | nindent 8 }}
+      {{- end }}
+      {{- if $tavern_tests.tests }}
+          volumeMounts:
+        {{- if $tavern_tests.tests }}
+          {{- range $tavern_tests.tests }}
+            - name: {{ .name }}
+              mountPath: {{ include "tavern.test_directory" $ }}/test_{{ .name }}.tavern.yaml
+              subPath: {{ .name }}
+          {{- end }}
+        {{- end }}
+      {{- end }}
+
+      {{/* Volumes */}}
+      volumes:
+      {{- if $.Values.job.volumes }}
+        {{- toYaml $.Values.job.volumes | nindent 8 }}
+      {{- end }}
+      {{- if $tavern_tests.tests }}
+        {{- range $tavern_tests.tests }}
+          {{- $ref := include "lib.utils.fullname" (dict "name" .name "context" $) }}
+          {{- if .secret }}
+        - name: {{ .name }}
+          secret:
+            secretName: {{ $ref }}
+            defaultMode: {{ $.Values.tavern.defaultMode }}
+          {{- else }}
+        - name: {{ .name }}
+          configMap:
+            name: {{ $ref }}
+            defaultMode: {{ $.Values.tavern.defaultMode }}
+          {{- end }}
+        {{- end }}
+      {{- end }}
+{{- end }}