seperate apps

platformQuickStarts/helm/webgoat/templates/configmap-wolf.yaml

@@ -0,0 +1,11 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: {{ .Values.webwolf_server.name }}-configmap
+  namespace: {{ .Values.namespace }}
+  labels:
+    app.kubernetes.io/part-of: {{ .Values.webgoat_server.name }} 
+data:
+  TZ: 'Europe/Amsterdam'
+  WEBGOAT_HOST: {{ .Values.webgoat_server.name }}-service
+

platformQuickStarts/helm/webgoat/templates/configmap.yaml

@@ -9,5 +9,5 @@ data:
   TZ: 'Europe/Amsterdam'
   EXCLUDE_CATEGORIES: 'CLIENT_SIDE'
   EXCLUDE_LESSONS: 'SqlInjectionAdvanced'
-  WEBWOLF_HOST: '{{ .Values.webgoat_server.name }}-service'
+  WEBWOLF_HOST: 'webwolf-1-wolf-demo-project.apps-crc.testing'
-  WEBWOLF_PORT: '9090'
+  WEBWOLF_PORT: '80'

platformQuickStarts/helm/webgoat/templates/deployment.yaml

@@ -1,11 +1,10 @@
-apiVersion: apps/v1
 kind: Deployment
 apiVersion: apps/v1
 metadata:
-  name: {{ .Values.webgoat_server.name }}
-  namespace: {{ .Values.namespace }}
   labels:
     app.kubernetes.io/part-of: {{ .Values.webgoat_server.name }} 
+  name: {{ .Values.webgoat_server.name }}
+  namespace: {{ .Values.namespace }}
 spec:
   replicas: 1
   selector:
@@ -18,8 +17,8 @@ spec:
     spec:
       volumes:
         - name: webgoat-volume-1
-          #persistentVolumeClaim:
+          persistentVolumeClaim:
-          #  claimName: {{ .Values.webgoat_server.name }}-pvc 
+            claimName: {{ .Values.webgoat_server.name }}-pvc 
       containers:
         - resources:
             limits:
@@ -32,10 +31,25 @@ spec:
           ports:
             - containerPort: 8080
               protocol: TCP
-            - containerPort: 9090
+          #livenessProbe:
-              protocol: TCP
+          #  failureThreshold: 3
+          #  periodSeconds: 10
+          #  httpGet:
+          #    path: /WebGoat
+          #    port: 8080
+          #readinessProbe:
+          #  failureThreshold: 3
+          #  periodSeconds: 10
+          #  initialDelaySeconds: 60
+          ##  httpGet:
+           #   path: /WebGoat
+           #   port: 8080
           image: {{ .Values.webgoat_server.image }}
-          imagePullPolicy: IfNotPresent
+          command:
+            - 'java'
+          args: ["-Duser.home=/home/webgoat","-Dfile.encoding=UTF-8","-jar","/home/webgoat/webgoat.jar","--server.address=0.0.0.0"]
+          #  - '--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.beans=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED -Duser.home=/home/webgoat -Dfile.encoding=UTF-8 -jar /home/webgoat/webgoat.jar --server.address=0.0.0.0'
+          imagePullPolicy: Always
           volumeMounts:
             - name: webgoat-volume-1
               mountPath: /home/webgoat/.webgoat-8.2.3-SNAPSHOT 
@@ -57,3 +71,74 @@ spec:
       maxSurge: 25%
   revisionHistoryLimit: 10
   progressDeadlineSeconds: 600
+---
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  labels:
+    app.kubernetes.io/part-of: {{ .Values.webgoat_server.name }} 
+  name: {{ .Values.webwolf_server.name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ .Values.webwolf_server.name }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.webwolf_server.name }} 
+    spec:
+      volumes:
+        - name: webgoat-volume-1
+          persistentVolumeClaim:
+            claimName: {{ .Values.webgoat_server.name }}-pvc 
+      containers:
+        - resources:
+            limits:
+              memory: "2Gi"
+              cpu: "1"
+            requests:
+              memory: "1Gi"
+              cpu: "0.5"
+          name: webwolf
+          ports:
+            - containerPort: 9090
+              protocol: TCP
+          #livenessProbe:
+          #  failureThreshold: 3
+          #  periodSeconds: 10
+          #  httpGet:
+          #    path: /WebWolf
+          #    port: 9090
+          #readinessProbe:
+            #failureThreshold: 3
+            #periodSeconds: 10
+            #initialDelaySeconds: 100
+            #httpGet:
+            #  path: /WebWolf
+            #  port: 9090
+          image: {{ .Values.webwolf_server.image }}
+          command:
+            - 'java'
+          args: ["-Duser.home=/home/webgoat","-Dfile.encoding=UTF-8","-jar","/home/webgoat/webwolf.jar","--server.address=0.0.0.0"]
+          imagePullPolicy: Always
+          volumeMounts:
+            - name: webgoat-volume-1
+              mountPath: /home/webgoat/.webgoat-8.2.3-SNAPSHOT 
+          terminationMessagePolicy: File
+          envFrom:
+            - configMapRef:
+                name: {{ .Values.webwolf_server.name }}-configmap   
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
+      dnsPolicy: ClusterFirst
+      securityContext: {}
+      schedulerName: default-scheduler
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 25%
+      maxSurge: 25%
+  revisionHistoryLimit: 10
+  progressDeadlineSeconds: 600

platformQuickStarts/helm/webgoat/templates/persistent-storage-claim

@@ -0,0 +1,13 @@
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: '{{ .Values.webgoat_server.name }}-pvc'
+  namespace: '{{ .Values.namespace }}'
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 1Gi
+  #volumeName: pv0028
+  volumeMode: Filesystem

platformQuickStarts/helm/webgoat/templates/route-wolf.yml

@@ -2,8 +2,8 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   labels:
-    app: {{ .Values.webgoat_server.name }}
+    app: {{ .Values.webwolf_server.name }}
-  name: {{ .Values.webgoat_server.name }}-wolf
+  name: {{ .Values.webwolf_server.name }}-wolf
   namespace: {{ .Values.namespace }}
 spec:
   path: /
@@ -11,6 +11,6 @@ spec:
     targetPort: 9090
   to:
     kind: Service
-    name: {{ .Values.webgoat_server.name }}-service
+    name: {{ .Values.webwolf_server.name }}-service
     weight: 100
   wildcardPolicy: None

platformQuickStarts/helm/webgoat/templates/service.yaml

@@ -12,10 +12,28 @@ spec:
     port: 8080
     protocol: TCP
     targetPort: 8080
+  - name: 9001-tcp
+    port: 9001
+    protocol: TCP
+    targetPort: 9001
+  selector:
+    app: {{ .Values.webgoat_server.name }}
+  sessionAffinity: None
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: {{ .Values.webwolf_server.name }}
+    app.kubernetes.io/part-of: {{ .Values.webgoat_server.name }}
+  name: {{ .Values.webwolf_server.name }}-service
+  namespace: {{ .Values.namespace }}
+spec:
+  ports:
   - name: 9090-tcp
     port: 9090
     protocol: TCP
     targetPort: 9090
   selector:
-    app: {{ .Values.webgoat_server.name }}
+    app: {{ .Values.webwolf_server.name }}
-  sessionAffinity: None
+  sessionAffinity: None

platformQuickStarts/helm/webgoat/values.yaml

@@ -1,5 +1,9 @@
-namespace: renezubcevic-dev
+namespace: demo-project
  
 webgoat_server:
   name: webgoat-1
-  image: docker.io/webgoat/goatandwolf:openshift
+  image: docker.io/webgoat/goatandwolf:openshift
+
+webwolf_server:
+  name: webwolf-1
+  image: docker.io/webgoat/goatandwolf:openshift