Merge pull request #55 from WesselAtWork/feature/volumes

Additional Persistance Options

Author: gitkent

charts/wiremock/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.6.0
+version: 1.7.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/wiremock/templates/_helpers.tpl

@@ -71,16 +71,16 @@ Create the name of the service account to use
 Pod annotations
 */}}
 {{- define "wiremock.podAnnotations" -}}
-{{- if .Values.mappingsAsConfigmap }}
+{{- if (or .Values.mappingsAsConfigmap .Values.mappingsFromConfigmap) }}
 checksum/configMappings: {{ include (print $.Template.BasePath "/configmap-mappings.yaml") . | sha256sum }}
 {{- end }}
-{{- if .Values.responsesAsConfigmap }}
+{{- if (or .Values.responsesAsConfigmap .Values.responsesFromConfigmap) }}
 checksum/configResponses: {{ include (print $.Template.BasePath "/configmap-responses.yaml") . | sha256sum }}
 {{- end }}
 {{- if .Values.podAnnotations }}
 {{ toYaml .Values.podAnnotations }}
 {{- end }}
-{{- end }}
+{{- end -}}
 
 {{/*
 Additional Pod Labels

charts/wiremock/templates/configmap-mappings.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.mappingsAsConfigmap -}}
+{{- if (or .Values.mappingsAsConfigmap .Values.mappingsFromConfigmap) -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:

charts/wiremock/templates/configmap-responses.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.responsesAsConfigmap -}}
+{{- if (or .Values.responsesAsConfigmap .Values.responsesFromConfigmap) -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:

charts/wiremock/templates/deployment.yaml

@@ -8,13 +8,20 @@ spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
   {{- end }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit | int }}
   selector:
     matchLabels:
       {{- include "wiremock.selectorLabels" . | nindent 6 }}
+  {{- with .Values.deploymentStrategy }}
+  strategy:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   template:
     metadata:
+      {{- with (include "wiremock.podAnnotations" .) }}
       annotations:
-        {{- include "wiremock.podAnnotations" . | nindent 8 }}
+        {{- . | nindent 8 }}
+      {{- end }}
       labels:
         {{- include "wiremock.podLabels" . | nindent 8 }}
     spec:
@@ -57,43 +64,49 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
-            {{- if .Values.mappingsAsConfigmap }}
+            {{- if (or .Values.mappingsAsConfigmap .Values.mappingsFromConfigmap .Values.persistence.mappings.enabled) }}
             - mountPath: /home/wiremock/storage/mappings
               name: mappings-data
             {{- end }}
-            {{- if .Values.responsesAsConfigmap }}
+            {{- if (or .Values.responsesAsConfigmap .Values.responsesFromConfigmap .Values.persistence.responses.enabled) }}
             - mountPath: /home/wiremock/storage/__files
               name: responses-data
             {{- end }}
             {{- with .Values.extraVolumeMounts }}
-              {{- toYaml . | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
             {{- end }}
       initContainers:
-        {{- if .Values.mappingsAsConfigmap }}
+        {{- if (or .Values.mappingsAsConfigmap .Values.mappingsFromConfigmap) }}
         - name: copy-mappings
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.initContainer.image.repository }}:{{ .Values.initContainer.image.tag }}"
           imagePullPolicy: {{ .Values.initContainer.image.pullPolicy }}
-          command: ["bash", "-c", "cp  -rf /data/mappings /home/wiremock/storage/mappings"]
+          command: ["bash", "-c", "cp  -rfv /data/mappings /home/wiremock/storage/mappings"]
           volumeMounts:
             - mountPath: /data/mappings
               name: mappings-volume
             - mountPath: /home/wiremock/storage/mappings
               name: mappings-data
+            {{- with .Values.initContainer.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
         {{- end }}
-        {{- if .Values.responsesAsConfigmap }}
+        {{- if (or .Values.responsesAsConfigmap .Values.responsesFromConfigmap) }}
         - name: copy-responses
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.initContainer.image.repository }}:{{ .Values.initContainer.image.tag }}"
           imagePullPolicy: {{ .Values.initContainer.image.pullPolicy }}
-          command: ["bash", "-c", "cp  -rf /data/responses /home/wiremock/storage/__files"]
+          command: ["bash", "-c", "cp  -rfv /data/responses /home/wiremock/storage/__files"]
           volumeMounts:
             - mountPath: /data/responses
               name: responses-volume
             - mountPath: /home/wiremock/storage/__files
               name: responses-data
+            {{- with .Values.initContainer.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
         {{- end }}
         {{- with .Values.extraInitContainers }}
         {{- toYaml . | nindent 8 }}
@@ -111,20 +124,34 @@ spec:
         {{- tpl (toYaml .) $ | nindent 8 }}
       {{- end }}
       volumes:
-        {{- if .Values.mappingsAsConfigmap }}
+        {{- if (or .Values.mappingsAsConfigmap .Values.mappingsFromConfigmap .Values.persistence.mappings.enabled) }}
         - name: mappings-data
+          {{- if .Values.persistence.mappings.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ include "wiremock.fullname" . }}-mappings-data
+          {{- else }}
           emptyDir: {}
+          {{- end }}
+        {{- end }}
+        {{- if (or .Values.mappingsAsConfigmap .Values.mappingsFromConfigmap) }}
         - name: mappings-volume
           configMap:
             name: {{ include "wiremock.fullname" . }}-mappings-configs
         {{- end }}
-        {{- if .Values.responsesAsConfigmap }}
+        {{- if (or .Values.responsesAsConfigmap .Values.responsesFromConfigmap .Values.persistence.responses.enabled) }}
         - name: responses-data
+          {{- if .Values.persistence.responses.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ include "wiremock.fullname" . }}-responses-data
+          {{- else }}
           emptyDir: {}
+          {{- end }}
+        {{- end }}
+        {{- if (or .Values.responsesAsConfigmap .Values.responsesFromConfigmap) }}
         - name: responses-volume
           configMap:
             name: {{ include "wiremock.fullname" . }}-responses-configs
         {{- end }}
         {{- with .Values.extraVolumes }}
-          {{- toYaml . | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
         {{- end }}

charts/wiremock/templates/extra-manifests.yaml

@@ -0,0 +1,8 @@
+{{ range .Values.extraObjects }}
+---
+{{- if typeIs "string" . }}
+  {{ tpl . $ }}
+{{ else }}
+  {{ tpl (. | toYaml) $ }}
+{{- end }}
+{{ end }}

charts/wiremock/templates/persistentvolumeclaim-mappings.yaml

@@ -0,0 +1,20 @@
+{{- if .Values.persistence.mappings.enabled }}
+{{- /* https://kubernetes.io/docs/concepts/storage/persistent-volumes/#writing-portable-configuration */}}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "wiremock.fullname" . }}-mappings-data
+  labels:
+    {{- include "wiremock.labels" . | nindent 4 }}
+spec:
+  {{- with .Values.persistence.mappings.accessModes }}
+  accessModes: {{ . | toYaml | nindent 2 }}
+  {{- end }}
+  {{- /* https://kubernetes.io/docs/concepts/storage/persistent-volumes/#class-1 */}}
+  {{- with .Values.persistence.mappings.storageClassName }}
+  storageClassName: {{ ternary "" . (eq `-` .) | quote }}
+  {{- end }}
+  resources:
+    requests:
+      storage: "{{ .Values.persistence.mappings.size }}"
+{{- end }}

charts/wiremock/templates/persistentvolumeclaim-responses.yaml

@@ -0,0 +1,20 @@
+{{- if .Values.persistence.responses.enabled }}
+{{- /* https://kubernetes.io/docs/concepts/storage/persistent-volumes/#writing-portable-configuration */}}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "wiremock.fullname" . }}-responses-data
+  labels:
+    {{- include "wiremock.labels" . | nindent 4 }}
+spec:
+  {{- with .Values.persistence.responses.accessModes }}
+  accessModes: {{ . | toYaml | nindent 2 }}
+  {{- end }}
+  {{- /* https://kubernetes.io/docs/concepts/storage/persistent-volumes/#class-1 */}}
+  {{- with .Values.persistence.responses.storageClassName }}
+  storageClassName: {{ ternary "" . (eq `-` .) | quote }}
+  {{- end }}
+  resources:
+    requests:
+      storage: "{{ .Values.persistence.responses.size }}"
+{{- end }}

charts/wiremock/values.yaml

@@ -26,6 +26,8 @@ responses: {}
 
 replicaCount: 1
 
+revisionHistoryLimit: 10
+
 image:
   repository: wiremock/wiremock
   # Overrides the image tag whose default is the chart appVersion.
@@ -37,9 +39,35 @@ initContainer:
     repository: bash
     tag: 5
     pullPolicy: Always
+  extraVolumeMounts: {}
 
 extraInitContainers: []
 
+deploymentStrategy: {}
+# type: Recreate
+
+# Load mappings from the templated configmap
+mappingsFromConfigmap: true
+
+# Load mappings from the templated configmap
+responsesFromConfigmap: true
+
+persistence:
+  mappings:
+    enabled: false
+    accessModes: ["ReadWriteOnce"]
+    size: 10Gi
+    # storageClassName: "-"
+  responses:
+    enabled: false
+    accessModes: ["ReadWriteOnce"]
+    size: 10Gi
+    # storageClassName: "-"
+
+extraVolumes: {}
+
+extraVolumeMounts: {}
+
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
@@ -54,7 +82,6 @@ serviceAccount:
   name: ""
 
 labels: {}
-
 podLabels: {}
 podAnnotations: {}
 
@@ -106,16 +133,6 @@ args:
   - "--local-response-templating"
   - "--root-dir=/home/wiremock/storage"
 
-# Disable this if you mount your own mappings using extraVolumeMounts
-mappingsAsConfigmap: true
-
-# Disable this if you mount your own responses using extraVolumeMounts
-responsesAsConfigmap: true
-
-extraVolumeMounts: []
-
-extraVolumes: []
-
 resources: {}
 # We usually recommend not to specify default resources and to leave this as a conscious
 # choice for the user. This also increases chances charts run on environments with little
@@ -142,3 +159,33 @@ tolerations: []
 affinity: {}
 
 scheme: "HTTP"
+
+# extraObjects could be utilized to add dynamic manifests via values
+extraObjects: []
+# Examples:
+# extraObjects:
+# - apiVersion: kubernetes-client.io/v1
+#   kind: ExternalSecret
+#   metadata:
+#     name: wiremock-config-{{ .Release.Name }}
+#   spec:
+#     backendType: gcpSecretsManager
+#     data:
+#     - remoteRef:
+#         key: wiremock-config
+#         property: config.json
+#       secretKey: wiremock-config-gcp
+# Alternatively, you can use strings, which lets you use additional templating features:
+# extraObjects:
+# - |
+#   apiVersion: kubernetes-client.io/v1
+#   kind: ExternalSecret
+#   metadata:
+#     name: wiremock-config-{{ .Release.Name }}
+#   spec:
+#     backendType: gcpSecretsManager
+#     data:
+#     - remoteRef:
+#         key: wiremock-config
+#         property: config.json
+#       secretKey: {{ include "some-other-template" }}