Merge pull request #66 from saitejaopsmx/2024-12

December Release Helm Chart

.github/workflows/release.yaml

@@ -3,7 +3,7 @@ name: Release Charts
 on:
   push:
     branches:
-      - 2024-10
+      - 2024-12
     paths:
       - 'charts/ssd/Chart.yaml'
       - 'charts/ssd/Chart.lock'

charts/ssd/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: ssd
-version: "2024.10.00"
-appVersion: "2024.10.00"
+version: "2024.12.00"
+appVersion: "2024.12.00"
 description: "OpsMx Secure Software Delivery for CI/CD"
 icon: https://raw.githubusercontent.com/OpsMx/enterprise-spinnaker/master/img/opsmx.png
 maintainers:

charts/ssd/node-selector-values.yaml

@@ -86,6 +86,8 @@ db:
 ####################################################
 toolchain:
   annotations: {}
+  nodeSelector: {}
+  tolerations: []
   serviceAnnotations: {}
 ####################################################
 supplychainpreprocessor:

charts/ssd/templates/_helpers.tpl

@@ -149,6 +149,16 @@ Return the proper Mobsf image name
 {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
 {{- end -}}
 
+{{/*
+Return the proper ZAP image name
+*/}}
+{{- define "zap.image" -}}
+{{- $registryName := .Values.imageCredentials.registry -}}
+{{- $repositoryName := .Values.zap.image.repository -}}
+{{- $tag := .Values.zap.image.tag | toString -}}
+{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+
 {{/* vim: set filetype=mustache: */}}
 {{/*
 Renders a value that contains template.

charts/ssd/templates/zap/zap-deployment.yaml

@@ -15,9 +15,8 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/configmap: {{ (.Files.Glob "config/ssd-ui/app-config.json").AsConfig | sha256sum }}
-{{- if .Values.ui.annotations -}}
-        {{ toYaml .Values.ui.annotations | nindent 8 }}
+{{- if .Values.zap.annotations -}}
+        {{ toYaml .Values.zap.annotations | nindent 8 }}
 {{- end }}
       labels:
         app: ssd
@@ -27,7 +26,7 @@ spec:
 {{- end }}
     spec:
       containers:
-      - image: zaproxy/zap-stable
+      - image: {{ template "zap.image" . }}
         name: zap
         command:
           - /zap/zap.sh

charts/ssd/values.yaml

@@ -127,7 +127,7 @@ customLabels: {}
 ssdgate:
   image:
     repository: ssdgate
-    tag: "2024-10-00"
+    tag: "2024-12-00"
   installDex: true
   createGateDexSecret: true
   #home_page: "/ui/index.html" # OPTIONAL default redirect page
@@ -211,7 +211,7 @@ toolchain:
   ## Image specific details
   image:
     repository: tool-chain
-    tag: "2024-10-00"
+    tag: "2024-12-00"
     pullPolicy: IfNotPresent
 
   annotations: {}
@@ -248,7 +248,7 @@ supplychainpreprocessor:
   ## Image specific details
   image:
     repository: supplychain-preprocessor
-    tag: "2024-10-00"
+    tag: "2024-12-00"
     pullPolicy: IfNotPresent
 
   annotations: {}
@@ -265,7 +265,7 @@ ssdopa:
   ## Image specific details
   image:
     repository: ssd-opa
-    tag: "2024-10-00"
+    tag: "2024-12-00"
     pullPolicy: IfNotPresent
 
   annotations: {}
@@ -280,7 +280,7 @@ supplychainapi:
   ## Image specific details
   image:
     repository: supplychain-api
-    tag: "2024-10-00"
+    tag: "2024-12-00"
     pullPolicy: IfNotPresent
 
   annotations: {}
@@ -329,7 +329,7 @@ ui:
   ## Image specific details
   image:
     repository: ssd-ui
-    tag: "2024-10-00"
+    tag: "2024-12-00"
     pullPolicy: IfNotPresent
 
   annotations: {}
@@ -346,7 +346,7 @@ ui:
 mobsf:
   image:
     repository: mobsf
-    tag: "v4.1.3"
+    tag: "2024-12-00"
     pullPolicy: IfNotPresent
 
   annotations: {}
@@ -357,6 +357,11 @@ mobsf:
 ##############################################################################
 ##
 zap:
+  image:
+    repository: zap
+    tag: "2024-12-00"
+    pullPolicy: IfNotPresent
+
   annotations: {}
 
   serviceAnnotations: {}