Merge branch 'feature/setup' into develop

Author: Steve Salas

codedx-tool-orchestration/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: codedx-tool-orchestration
-version: 1.0.1
-appVersion: "1.0.0"
+version: 1.0.2
+appVersion: "1.0.1"
 description: A Helm chart for Code Dx Tool Orchestration
 icon: https://codedx.com/wp-content/uploads/2017/03/CodeDx-logo.png
 home: https://github.com/codedx/codedx-kubernetes
@@ -12,10 +12,10 @@ keywords:
 sources:
 dependencies:
 - name: argo
-  version: 0.6.8
+  version: 0.6.9
   repository: https://codedx.github.io/codedx-kubernetes
 - name: minio
-  version: 3.1.4
+  version: 3.1.5
   repository: https://codedx.github.io/codedx-kubernetes
 maintainers:
 - name: tylercamp

codedx-tool-orchestration/README.md

@@ -274,34 +274,11 @@ toolServiceTls:
 
 ### Grant Access to a Private Docker Registry
 
-The Tool Orchestration service may require access to a private Docker registry, something that's necessary when using the Burp Suite automation as an example. Create a Kubernetes secret containing your Docker registry credentials using one of the two following options.
-
-#### Create Registry Credential - Command Line Option
-
-You can create a Kubernetes secret with your Docker registry credential from the command line by running the following command, replacing #server#, #username#, #password#, and #email# with your own values:
-
-```
-kubectl -n cdx-svc create secret docker-registry my-docker-registry --docker-server=#server# --docker-username=#username# --docker-password=#password# --docker-email=#email#
-```
-
-#### Create Registry Credential - YAML File Option
-
-Alternatively, you can create a Kubernetes secret containing your Docker registry credentials from a YAML file. Your file will look similar to what follows, but you must specify your own content for #value# - refer to [Pull an Image from a Private Registry](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) for more details.
-
-```
-apiVersion: v1
-metadata:
-  name: my-docker-registry
-data:
-  .dockerconfigjson: #value#
-kind: Secret
-type: kubernetes.io/dockerconfigjson
-```
-
-Save your YAML in a file named my-docker-registry.yaml and create your Kubernetes secret with the following command.
+The Tool Orchestration service may require access to a private Docker registry, something that's necessary when using the Burp Suite automation as an example. 
+You can create a Kubernetes secret with your Docker registry credential from the command line by running the following command, replacing #server#, #username#, and #password# with your own values:
 
 ```
-kubectl create -n cdx-svc -f my-docker-registry.yaml
+kubectl -n cdx-svc create secret docker-registry my-docker-registry --docker-server=#server# --docker-username=#username# --docker-password=#password#
 ```
 
 #### Registry Credential Config

codedx-tool-orchestration/templates/_helpers.tpl

@@ -90,6 +90,14 @@ If release name contains chart name it will be used as a full name.
 {{- include "sanitize" (printf "%s-pre-delete-job" (include "codedx-tool-orchestration.fullname" .)) -}}
 {{- end -}}
 
+{{- define "codedx-tool-orchestration.workflow.priorityClassName" -}}
+{{- include "sanitize" (printf "%s-wf-pc" (include "codedx-tool-orchestration.fullname" .)) -}}
+{{- end -}}
+
+{{- define "codedx-tool-orchestration.service.priorityClassName" -}}
+{{- include "sanitize" (printf "%s-svc-pc" (include "codedx-tool-orchestration.fullname" .)) -}}
+{{- end -}}
+
 {{/*
 Duplicates of a Minio template helper so we can reference Minio's service name
 */}}

codedx-tool-orchestration/templates/tool-service-deployment.yaml

@@ -73,6 +73,7 @@ spec:
           "-serviceTlsKeyPath", "/opt/codedx/service/tls/{{ .Values.toolServiceTls.keyFile }}",
           {{ end -}}
           "-workDir", "/opt/codedx/service/work",
+          "-workflowPriorityClassName", {{ include "codedx-tool-orchestration.workflow.priorityClassName" . | quote }},
           "-workflowRoleNames", {{ include "codedx-tool-orchestration.workflow.role.name" . }}]
         readinessProbe:
           httpGet:
@@ -113,7 +114,7 @@ spec:
         ports:
         - containerPort: 3333
           name: http
-      priorityClassName: codedx-tool-service
+      priorityClassName: {{ include "codedx-tool-orchestration.service.priorityClassName" . | quote }}
       volumes:
       - name: tool-service-secret-volume
         secret:

codedx-tool-orchestration/templates/tool-service-priority.yaml

@@ -1,31 +1,15 @@
 apiVersion: scheduling.k8s.io/v1
 kind: PriorityClass
 metadata:
-  name: codedx-workflow
-value: 10000 
+  name: {{ include "codedx-tool-orchestration.workflow.priorityClassName" . | quote }}
+value: {{ .Values.priorityClass.workflowValue }}
 globalDefault: false
 description: "The priority class for Code Dx Tool Orchestration workflows."
 ---
 apiVersion: scheduling.k8s.io/v1
 kind: PriorityClass
 metadata:
-  name: codedx-tool-service
-value: 10100 
+  name: {{ include "codedx-tool-orchestration.service.priorityClassName" . | quote }}
+value: {{ .Values.priorityClass.serviceValue }}
 globalDefault: false
 description: "The priority class for the Code Dx Tool Orchestration service."
----
-apiVersion: scheduling.k8s.io/v1
-kind: PriorityClass
-metadata:
-  name: codedx-workflow-controller
-value: 10100
-globalDefault: false
-description: "The priority class for the Code Dx Argo Workflow controller."
----
-apiVersion: scheduling.k8s.io/v1
-kind: PriorityClass
-metadata:
-  name: codedx-workflow-storage
-value: 10100
-globalDefault: false
-description: "The priority class for the Code Dx MinIO instance."

codedx-tool-orchestration/values.yaml

@@ -169,6 +169,10 @@ podSecurityPolicy:
 #
 resources: {}
 
+priorityClass:
+  workflowValue: 10000
+  serviceValue: 10100
+
 # NOTE: These are setting attributes for the `argo` dependency
 argo:
   installCRD: false
@@ -178,7 +182,7 @@ argo:
     controller: codedx-workflow-controller
     tag: v2.4.2
   controller:
-    priorityClassName: 'codedx-workflow-controller'
+    priorityClassValue: 10100
   ui:
     enabled: false
   minio:
@@ -208,7 +212,7 @@ minio:
   persistence:
     size: 50Gi
     storageClass: 
-  priorityClassName: 'codedx-workflow-storage'
+  priorityClassValue: 10100
 
 # Options for configuring clients to explicitly trust certificate data for the MinIO TLS configuration. This section
 # does not apply when minio.tls.enabled=false.

codedx/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: codedx
-version: 0.8.9
+version: 0.8.10
 appVersion: "5.0.2"
 description: A Helm chart for Code Dx
 icon: https://codedx.com/wp-content/uploads/2017/03/CodeDx-logo.png
@@ -17,7 +17,7 @@ sources:
 - https://hub.docker.com/r/bitnami/mariadb
 dependencies:
 - name: mariadb
-  version: 7.3.12
+  version: 7.3.13
   repository: https://codedx.github.io/codedx-kubernetes
   condition: mariadb.enabled
 maintainers:

codedx/templates/_helpers.tpl

@@ -249,6 +249,11 @@ Determine the name to use to create and/or bind MariaDB's PodSecurityPolicy.
 {{- include "sanitize" $fullName -}}
 {{- end -}}
 
+{{- define "codedx.cacerts.pwd.secretName" -}}
+{{- $fullName := printf "%s-cacerts-pwd-secret" (include "codedx.fullname" .) -}}
+{{- include "sanitize" $fullName -}}
+{{- end -}}
+
 {{- define "codedx.adminSecretName" -}}
 {{- $fullName := printf "%s-admin-secret" (include "codedx.fullname" .) -}}
 {{- include "sanitize" $fullName -}}
@@ -259,8 +264,10 @@ Determine the name to use to create and/or bind MariaDB's PodSecurityPolicy.
 {{- include "sanitize" $fullName -}}
 {{- end -}}
 
-
-
+{{- define "codedx.priorityClassName" -}}
+{{- $fullName := printf "%s-codedx-pc" (include "codedx.fullname" .) -}}
+{{- include "sanitize" $fullName -}}
+{{- end -}}
 
 {{/*
 Duplicates of MariaDB template helpers so we can reference service/serviceAccount names

codedx/templates/codedx-cacerts-secret-pwd.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "codedx.cacerts.pwd.secretName" . | quote }}
+  labels:
+    {{- include "codedx.commonLabels" . | nindent 4 }}
+type: Opaque
+data:
+  password: {{ .Values.cacertsFilePwd | b64enc | quote }}

codedx/templates/codedx-configmap.yaml

@@ -24,6 +24,7 @@ data:
   tomcat.env: |-
     CATALINA_OPTS='{{ include "codedx.props.params.combined" . }}'
     CATALINA_OPTS="$CATALINA_OPTS {{ default "" .Values.codedxJavaOpts }}"
+    CATALINA_OPTS="$CATALINA_OPTS -Djavax.net.ssl.keystorepassword=$KEYSTORE_KEY"
 
   {{ if .Values.loggingConfigFile -}}
   logback.xml: |-