From ae02d98d377c2519d479c3df6a6cff5a8f2ed424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Zubcevic?= Date: Mon, 20 Dec 2021 14:27:14 +0100 Subject: [PATCH] template for openshift developer sandbox --- platformQuickStarts/helm/webgoat/Chart.yaml | 24 ++---- .../helm/webgoat/templates/NOTES.txt | 22 ----- .../helm/webgoat/templates/_helpers.tpl | 62 -------------- .../helm/webgoat/templates/deployment.yaml | 80 ++++++++---------- .../helm/webgoat/templates/hpa.yaml | 28 ------- .../helm/webgoat/templates/ingress.yaml | 41 --------- .../helm/webgoat/templates/route-goat.yml | 19 +++++ .../helm/webgoat/templates/route-wolf.yml | 19 +++++ .../helm/webgoat/templates/service.yaml | 22 +++-- .../webgoat/templates/serviceaccount.yaml | 12 --- .../templates/tests/test-connection.yaml | 15 ---- platformQuickStarts/helm/webgoat/values.yaml | 84 ++----------------- 12 files changed, 95 insertions(+), 333 deletions(-) delete mode 100644 platformQuickStarts/helm/webgoat/templates/NOTES.txt delete mode 100644 platformQuickStarts/helm/webgoat/templates/_helpers.tpl delete mode 100644 platformQuickStarts/helm/webgoat/templates/hpa.yaml delete mode 100644 platformQuickStarts/helm/webgoat/templates/ingress.yaml create mode 100644 platformQuickStarts/helm/webgoat/templates/route-goat.yml create mode 100644 platformQuickStarts/helm/webgoat/templates/route-wolf.yml delete mode 100644 platformQuickStarts/helm/webgoat/templates/serviceaccount.yaml delete mode 100644 platformQuickStarts/helm/webgoat/templates/tests/test-connection.yaml diff --git a/platformQuickStarts/helm/webgoat/Chart.yaml b/platformQuickStarts/helm/webgoat/Chart.yaml index b5aaeb7d5..c2fb4b327 100644 --- a/platformQuickStarts/helm/webgoat/Chart.yaml +++ b/platformQuickStarts/helm/webgoat/Chart.yaml @@ -1,23 +1,9 @@ apiVersion: v2 name: webgoat -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. +description: WebGoat Learning Environment + 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: 0.1.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 -# follow Semantic Versioning. They should reflect the version the application is using. -appVersion: v8.1.0 + +appVersion: "openshift" \ No newline at end of file diff --git a/platformQuickStarts/helm/webgoat/templates/NOTES.txt b/platformQuickStarts/helm/webgoat/templates/NOTES.txt deleted file mode 100644 index e59d54f9f..000000000 --- a/platformQuickStarts/helm/webgoat/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "webgoat.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "webgoat.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "webgoat.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "webgoat.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/platformQuickStarts/helm/webgoat/templates/_helpers.tpl b/platformQuickStarts/helm/webgoat/templates/_helpers.tpl deleted file mode 100644 index e13358a4e..000000000 --- a/platformQuickStarts/helm/webgoat/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "webgoat.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "webgoat.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "webgoat.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "webgoat.labels" -}} -helm.sh/chart: {{ include "webgoat.chart" . }} -{{ include "webgoat.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "webgoat.selectorLabels" -}} -app.kubernetes.io/name: {{ include "webgoat.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "webgoat.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "webgoat.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/platformQuickStarts/helm/webgoat/templates/deployment.yaml b/platformQuickStarts/helm/webgoat/templates/deployment.yaml index fcbf305a8..c1ffe834c 100644 --- a/platformQuickStarts/helm/webgoat/templates/deployment.yaml +++ b/platformQuickStarts/helm/webgoat/templates/deployment.yaml @@ -1,61 +1,47 @@ apiVersion: apps/v1 kind: Deployment +apiVersion: apps/v1 metadata: - name: {{ include "webgoat.fullname" . }} + name: {{ .Values.webgoat_server.name }} + namespace: {{ .Values.namespace }} labels: - {{- include "webgoat.labels" . | nindent 4 }} + app.kubernetes.io/part-of: {{ .Values.webgoat_server.name }} spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} + replicas: 1 selector: matchLabels: - {{- include "webgoat.selectorLabels" . | nindent 6 }} + app: {{ .Values.webgoat_server.name }} template: metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} labels: - {{- include "webgoat.selectorLabels" . | nindent 8 }} + app: {{ .Values.webgoat_server.name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "webgoat.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + - resources: + limits: + memory: "2Gi" + cpu: "1" + requests: + memory: "1Gi" + cpu: "0.5" + name: webgoat ports: - - name: webgoat - containerPort: 8080 + - containerPort: 8080 protocol: TCP - livenessProbe: - httpGet: - path: /WebGoat - port: webgoat - readinessProbe: - httpGet: - path: /WebGoat - port: webgoat - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} + - containerPort: 9090 + protocol: TCP + image: {{ .Values.webgoat_server.image }} + imagePullPolicy: IfNotPresent + terminationMessagePolicy: File + restartPolicy: Always + terminationGracePeriodSeconds: 30 + dnsPolicy: ClusterFirst + securityContext: {} + schedulerName: default-scheduler + strategy: + type: RollingUpdate + rollingUpdate: + maxUnavailable: 25% + maxSurge: 25% + revisionHistoryLimit: 10 + progressDeadlineSeconds: 600 \ No newline at end of file diff --git a/platformQuickStarts/helm/webgoat/templates/hpa.yaml b/platformQuickStarts/helm/webgoat/templates/hpa.yaml deleted file mode 100644 index 6c11f3547..000000000 --- a/platformQuickStarts/helm/webgoat/templates/hpa.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "webgoat.fullname" . }} - labels: - {{- include "webgoat.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "webgoat.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/platformQuickStarts/helm/webgoat/templates/ingress.yaml b/platformQuickStarts/helm/webgoat/templates/ingress.yaml deleted file mode 100644 index 98011cbca..000000000 --- a/platformQuickStarts/helm/webgoat/templates/ingress.yaml +++ /dev/null @@ -1,41 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "webgoat.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "webgoat.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - backend: - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} diff --git a/platformQuickStarts/helm/webgoat/templates/route-goat.yml b/platformQuickStarts/helm/webgoat/templates/route-goat.yml new file mode 100644 index 000000000..75cf2ade9 --- /dev/null +++ b/platformQuickStarts/helm/webgoat/templates/route-goat.yml @@ -0,0 +1,19 @@ +apiVersion: route.openshift.io/v1 +kind: Route +metadata: + labels: + app: {{ .Values.webgoat_server.name }} + name: {{ .Values.webgoat_server.name }}-goat + namespace: {{ .Values.namespace }} +spec: + tls: + termination: edge + insecureEdgeTerminationPolicy: Redirect + path: /WebGoat + port: + targetPort: 8080 + to: + kind: Service + name: {{ .Values.webgoat_server.name }}-service + weight: 100 + wildcardPolicy: None \ No newline at end of file diff --git a/platformQuickStarts/helm/webgoat/templates/route-wolf.yml b/platformQuickStarts/helm/webgoat/templates/route-wolf.yml new file mode 100644 index 000000000..15c9805d6 --- /dev/null +++ b/platformQuickStarts/helm/webgoat/templates/route-wolf.yml @@ -0,0 +1,19 @@ +apiVersion: route.openshift.io/v1 +kind: Route +metadata: + labels: + app: {{ .Values.webgoat_server.name }} + name: {{ .Values.webgoat_server.name }}-wolf + namespace: {{ .Values.namespace }} +spec: + tls: + termination: edge + insecureEdgeTerminationPolicy: Redirect + path: / + port: + targetPort: 9090 + to: + kind: Service + name: {{ .Values.webgoat_server.name }}-service + weight: 100 + wildcardPolicy: None \ No newline at end of file diff --git a/platformQuickStarts/helm/webgoat/templates/service.yaml b/platformQuickStarts/helm/webgoat/templates/service.yaml index 8854bfcbd..5a13ca567 100644 --- a/platformQuickStarts/helm/webgoat/templates/service.yaml +++ b/platformQuickStarts/helm/webgoat/templates/service.yaml @@ -1,15 +1,21 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "webgoat.fullname" . }} labels: - {{- include "webgoat.labels" . | nindent 4 }} + app: {{ .Values.webgoat_server.name }} + app.kubernetes.io/part-of: {{ .Values.webgoat_server.name }} + name: {{ .Values.webgoat_server.name }}-service + namespace: {{ .Values.namespace }} spec: - type: {{ .Values.service.type }} ports: - - port: {{ .Values.service.port }} - targetPort: 8080 - protocol: TCP - name: webgoat + - name: 8080-tcp + port: 8080 + protocol: TCP + targetPort: 8080 + - name: 9090-tcp + port: 9090 + protocol: TCP + targetPort: 9090 selector: - {{- include "webgoat.selectorLabels" . | nindent 4 }} + app: {{ .Values.webgoat_server.name }} + sessionAffinity: None \ No newline at end of file diff --git a/platformQuickStarts/helm/webgoat/templates/serviceaccount.yaml b/platformQuickStarts/helm/webgoat/templates/serviceaccount.yaml deleted file mode 100644 index cd45d72b9..000000000 --- a/platformQuickStarts/helm/webgoat/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "webgoat.serviceAccountName" . }} - labels: - {{- include "webgoat.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/platformQuickStarts/helm/webgoat/templates/tests/test-connection.yaml b/platformQuickStarts/helm/webgoat/templates/tests/test-connection.yaml deleted file mode 100644 index 6f8cdc610..000000000 --- a/platformQuickStarts/helm/webgoat/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "webgoat.fullname" . }}-test-connection" - labels: - {{- include "webgoat.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "webgoat.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/platformQuickStarts/helm/webgoat/values.yaml b/platformQuickStarts/helm/webgoat/values.yaml index 2f3aa1ed0..3a0cfbc23 100644 --- a/platformQuickStarts/helm/webgoat/values.yaml +++ b/platformQuickStarts/helm/webgoat/values.yaml @@ -1,79 +1,5 @@ -# Default values for webgoat. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: webgoat/goatandwolf - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 8080 - -ingress: - enabled: false - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: [] - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -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 - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -nodeSelector: {} - -tolerations: [] - -affinity: {} +namespace: renezubcevic-dev + +webgoat_server: + name: webgoat-1 + image: docker.io/webgoat/goatandwolf:openshift \ No newline at end of file