From e58373ffff2d7e6996bc5c0c3747299dc03e940c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Zubcevic?= <rene@zubcevic.com>
Date: Mon, 20 Dec 2021 16:55:25 +0100
Subject: [PATCH] config added

---
 .../helm/webgoat/templates/configmap.yaml          | 13 +++++++++++++
 .../helm/webgoat/templates/deployment.yaml         | 14 +++++++++++++-
 .../helm/webgoat/templates/route-wolf.yml          |  5 +----
 .../helm/webgoat/templates/secrets.yaml            |  7 +++++++
 4 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 platformQuickStarts/helm/webgoat/templates/configmap.yaml
 create mode 100644 platformQuickStarts/helm/webgoat/templates/secrets.yaml

diff --git a/platformQuickStarts/helm/webgoat/templates/configmap.yaml b/platformQuickStarts/helm/webgoat/templates/configmap.yaml
new file mode 100644
index 000000000..5a9748884
--- /dev/null
+++ b/platformQuickStarts/helm/webgoat/templates/configmap.yaml
@@ -0,0 +1,13 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: {{ .Values.webgoat_server.name }}-configmap
+  namespace: {{ .Values.namespace }}
+  labels:
+    app.kubernetes.io/part-of: {{ .Values.webgoat_server.name }} 
+data:
+  TZ: 'Europe/Amsterdam'
+  EXCLUDE_CATEGORIES: 'CLIENT_SIDE'
+  EXCLUDE_LESSONS: 'SqlInjectionAdvanced'
+  WEBWOLF_HOST: '{{ .Values.webgoat_server.name }}-service'
+  WEBWOLF_PORT: '9090'
diff --git a/platformQuickStarts/helm/webgoat/templates/deployment.yaml b/platformQuickStarts/helm/webgoat/templates/deployment.yaml
index c1ffe834c..8d94c48dc 100644
--- a/platformQuickStarts/helm/webgoat/templates/deployment.yaml
+++ b/platformQuickStarts/helm/webgoat/templates/deployment.yaml
@@ -16,6 +16,10 @@ spec:
       labels:
         app: {{ .Values.webgoat_server.name }} 
     spec:
+      volumes:
+        - name: webgoat-volume-1
+          #persistentVolumeClaim:
+          #  claimName: {{ .Values.webgoat_server.name }}-pvc 
       containers:
         - resources:
             limits:
@@ -32,7 +36,15 @@ spec:
               protocol: TCP
           image: {{ .Values.webgoat_server.image }}
           imagePullPolicy: IfNotPresent
+          volumeMounts:
+            - name: webgoat-volume-1
+              mountPath: /home/webgoat/.webgoat-8.2.3-SNAPSHOT 
           terminationMessagePolicy: File
+          envFrom:
+            - configMapRef:
+                name: {{ .Values.webgoat_server.name }}-configmap 
+            - secretRef:
+                name: {{ .Values.webgoat_server.name }}-secret      
       restartPolicy: Always
       terminationGracePeriodSeconds: 30
       dnsPolicy: ClusterFirst
@@ -44,4 +56,4 @@ spec:
       maxUnavailable: 25%
       maxSurge: 25%
   revisionHistoryLimit: 10
-  progressDeadlineSeconds: 600
\ No newline at end of file
+  progressDeadlineSeconds: 600
diff --git a/platformQuickStarts/helm/webgoat/templates/route-wolf.yml b/platformQuickStarts/helm/webgoat/templates/route-wolf.yml
index 15c9805d6..91bda3867 100644
--- a/platformQuickStarts/helm/webgoat/templates/route-wolf.yml
+++ b/platformQuickStarts/helm/webgoat/templates/route-wolf.yml
@@ -6,9 +6,6 @@ metadata:
   name: {{ .Values.webgoat_server.name }}-wolf
   namespace: {{ .Values.namespace }}
 spec:
-  tls:
-    termination: edge
-    insecureEdgeTerminationPolicy: Redirect
   path: /
   port:
     targetPort: 9090
@@ -16,4 +13,4 @@ spec:
     kind: Service
     name: {{ .Values.webgoat_server.name }}-service
     weight: 100
-  wildcardPolicy: None
\ No newline at end of file
+  wildcardPolicy: None
diff --git a/platformQuickStarts/helm/webgoat/templates/secrets.yaml b/platformQuickStarts/helm/webgoat/templates/secrets.yaml
new file mode 100644
index 000000000..07dd16aad
--- /dev/null
+++ b/platformQuickStarts/helm/webgoat/templates/secrets.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Values.webgoat_server.name }}-secret
+  namespace: {{ .Values.namespace }}
+stringData:
+  ADMIN_PASSWORD: admin