guacsec · ANIRUDH-333 · Mar 4, 2025
diff --git a/charts/guac/Chart.yaml b/charts/guac/Chart.yaml
@@ -9,8 +9,8 @@ maintainers:
     email: guac-info@kusari.dev
 
 type: application
-version: 0.6.1
-appVersion: "v0.13.0"
+version: 0.6.2
+appVersion: "v0.13.2"
 
 dependencies:
 - name: nats

diff --git a/charts/guac/README.md b/charts/guac/README.md
@@ -256,6 +256,7 @@ This section contains parameters for configuring the different GUAC components.
 | `guac.collectorPublishToQueue`                                 | Whether to publish ingestion message to pubsub queue                                                                                           | `true`                                         |
 | `guac.blobAddr`                                                | gocloud connection string for blob store configured via https://gocloud.dev/howto/blob/                                                        | `undefined`                                    |
 | `guac.additionalResources`                                     |                                                                                                                                                | `{}`                                           |
+| `guac.customLabels`                                            | custom labels for all resources                                                                                                                | `{}`                                           |
 
 ### nats
 
@@ -312,7 +313,7 @@ For running the unit tests, install the unittest plugin.
 
 To run unit tests
 
-`helm unittest charts/guac -3`
+`helm unittest charts/guac`
 
 To run Helm chart-testing (ct) lint and install tests
 

diff --git a/charts/guac/schema.json b/charts/guac/schema.json
@@ -1013,6 +1013,11 @@
                     "type": "object",
                     "description": "",
                     "default": {}
+                },
+                "customLabels": {
+                    "type": "object",
+                    "description": "custom labels for all resources",
+                    "default": {}
                 }
             }
         },

diff --git a/charts/guac/templates/_helpers.tpl b/charts/guac/templates/_helpers.tpl
@@ -35,6 +35,12 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{- define "custom.labels" -}}
+{{- if .Values.guac.customLabels }}
+{{- toYaml .Values.guac.customLabels }}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Common labels
 */}}

diff --git a/charts/guac/templates/api-only-ingress.yaml b/charts/guac/templates/api-only-ingress.yaml
@@ -16,6 +16,7 @@ metadata:
 {{- range $key, $value := .Values.guac.apiOnlyIngress.extraLabels }}
     {{ $key }}: {{ $value }}
 {{- end }}
+{{- include "custom.labels" . | nindent 4 }}
 
 spec:
   {{- if .Values.guac.apiOnlyIngress.ingressClassName }}

diff --git a/charts/guac/templates/cd-certifier-deployment.yaml b/charts/guac/templates/cd-certifier-deployment.yaml
@@ -14,6 +14,7 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.cdCertifier.name }}
     app.kubernetes.io/component: {{ .Values.guac.cdCertifier.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   replicas:  {{ .Values.guac.cdCertifier.replicas }}
   selector:
@@ -27,6 +28,7 @@ spec:
         {{- include "guac.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/name: {{ .Values.guac.cdCertifier.name }}
         app.kubernetes.io/component: {{ .Values.guac.cdCertifier.name }}
+        {{- include "custom.labels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ .Values.guac.cdCertifier.name }}
       containers:

diff --git a/charts/guac/templates/cd-certifier-sa.yaml b/charts/guac/templates/cd-certifier-sa.yaml
@@ -15,5 +15,6 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.cdCertifier.name }}
     app.kubernetes.io/component: {{ .Values.guac.cdCertifier.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 {{- end }}
 {{- end }}
diff --git a/charts/guac/templates/collectsub-deployment.yaml b/charts/guac/templates/collectsub-deployment.yaml
@@ -14,6 +14,7 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.collectSub.name }}
     app.kubernetes.io/component: {{ .Values.guac.collectSub.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   replicas:  {{ .Values.guac.collectSub.replicas }}
   selector:
@@ -27,6 +28,7 @@ spec:
         {{- include "guac.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/name: {{ .Values.guac.collectSub.name }}
         app.kubernetes.io/component: {{ .Values.guac.collectSub.name }}
+        {{- include "custom.labels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ .Values.guac.collectSub.name }}
       containers:

diff --git a/charts/guac/templates/collectsub-sa.yaml b/charts/guac/templates/collectsub-sa.yaml
@@ -15,5 +15,6 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.collectSub.name }}
     app.kubernetes.io/component: {{ .Values.guac.collectSub.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 {{- end }}
 {{- end }}
diff --git a/charts/guac/templates/collectsub-service.yaml b/charts/guac/templates/collectsub-service.yaml
@@ -10,11 +10,13 @@ metadata:
   labels: {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.collectSub.name }}
     app.kubernetes.io/component: {{ .Values.guac.collectSub.name }}
+     {{- include "custom.labels" . | nindent 4 }}
 spec:
   selector:
     {{- include "guac.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.collectSub.name }}
     app.kubernetes.io/component: {{ .Values.guac.collectSub.name }}
+    {{- include "custom.labels" . | nindent 4 }}
   ports:
   {{- range .Values.guac.collectSub.svcPorts }}
     - {{ . | toYaml | indent 6 | trim }}

diff --git a/charts/guac/templates/depsdev-collector-deployment.yaml b/charts/guac/templates/depsdev-collector-deployment.yaml
@@ -14,6 +14,7 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.depsDevCollector.name }}
     app.kubernetes.io/component: {{ .Values.guac.depsDevCollector.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   replicas:  {{ .Values.guac.depsDevCollector.replicas }}
   selector:
@@ -27,6 +28,7 @@ spec:
         {{- include "guac.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/name: {{ .Values.guac.depsDevCollector.name }}
         app.kubernetes.io/component: {{ .Values.guac.depsDevCollector.name }}
+        {{- include "custom.labels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ .Values.guac.depsDevCollector.name }}
       containers:

diff --git a/charts/guac/templates/depsdev-collector-sa.yaml b/charts/guac/templates/depsdev-collector-sa.yaml
@@ -15,5 +15,6 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.depsDevCollector.name }}
     app.kubernetes.io/component: {{ .Values.guac.depsDevCollector.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 {{- end }}
 {{- end }}
diff --git a/charts/guac/templates/graphql-server-deployment.yaml b/charts/guac/templates/graphql-server-deployment.yaml
@@ -14,6 +14,7 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.graphqlServer.name }}
     app.kubernetes.io/component: {{ .Values.guac.graphqlServer.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   replicas:  {{ .Values.guac.graphqlServer.replicas }}
   selector:
@@ -27,6 +28,7 @@ spec:
         {{- include "guac.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/name: {{ .Values.guac.graphqlServer.name }}
         app.kubernetes.io/component: {{ .Values.guac.graphqlServer.name }}
+        {{- include "custom.labels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ .Values.guac.graphqlServer.name }}
 {{- if .Values.atlas.enabled }}
@@ -36,7 +38,7 @@ spec:
         env:
         - name: DB_ADDRESS
           value: '{{ index .Values.guac.backend.ent "db-address" }}'
-{{- end }}      
+{{- end }}
         {{- if .Values.atlas.image.digest }}
         image: "{{ .Values.atlas.image.repository }}@{{ .Values.atlas.image.digest }}"
         {{- else }}

diff --git a/charts/guac/templates/graphql-server-sa.yaml b/charts/guac/templates/graphql-server-sa.yaml
@@ -15,5 +15,6 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.graphqlServer.name }}
     app.kubernetes.io/component: {{ .Values.guac.graphqlServer.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 {{- end }}
 {{- end }}
diff --git a/charts/guac/templates/graphql-server-service.yaml b/charts/guac/templates/graphql-server-service.yaml
@@ -11,12 +11,14 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.graphqlServer.name }}
     app.kubernetes.io/component: {{ .Values.guac.graphqlServer.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   type: ClusterIP
   selector:
     {{- include "guac.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.graphqlServer.name }}
     app.kubernetes.io/component: {{ .Values.guac.graphqlServer.name }}
+    {{- include "custom.labels" . | nindent 4 }}
   ports:
   {{- range .Values.guac.graphqlServer.svcPorts }}
     - {{ . | toYaml | indent 6 | trim }}
@@ -36,6 +38,7 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.graphqlServer.name }}
     app.kubernetes.io/component: {{ .Values.guac.graphqlServer.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   type: NodePort
   selector:

diff --git a/charts/guac/templates/guacrest-deployment.yaml b/charts/guac/templates/guacrest-deployment.yaml
@@ -14,6 +14,7 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.restApi.name }}
     app.kubernetes.io/component: {{ .Values.guac.restApi.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   replicas:  {{ .Values.guac.restApi.replicas }}
   selector:
@@ -27,6 +28,7 @@ spec:
         {{- include "guac.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/name: {{ .Values.guac.restApi.name }}
         app.kubernetes.io/component: {{ .Values.guac.restApi.name }}
+        {{- include "custom.labels" . | nindent 8 }}
     spec:
       containers:
       - name: {{ .Values.guac.restApi.name }}

diff --git a/charts/guac/templates/guacrest-sa.yaml b/charts/guac/templates/guacrest-sa.yaml
@@ -15,5 +15,6 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.restApi.name }}
     app.kubernetes.io/component: {{ .Values.guac.restApi.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 {{- end }}
 {{- end }}
diff --git a/charts/guac/templates/guacrest-service.yaml b/charts/guac/templates/guacrest-service.yaml
@@ -11,11 +11,13 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.restApi.name }}
     app.kubernetes.io/component: {{ .Values.guac.restApi.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   selector:
     {{- include "guac.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.restApi.name }}
     app.kubernetes.io/component: {{ .Values.guac.restApi.name }}
+    {{- include "custom.labels" . | nindent 4 }}
   ports:
   {{- range .Values.guac.restApi.svcPorts }}
     - {{ . | toYaml | indent 6 | trim }}

diff --git a/charts/guac/templates/ingest-guac-data-job.yaml b/charts/guac/templates/ingest-guac-data-job.yaml
@@ -9,6 +9,7 @@ metadata:
   labels:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.sampleData.jobName }}
+    {{- include "custom.labels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": post-install, post-upgrade
     "helm.sh/hook-weight": "10"
@@ -19,6 +20,7 @@ spec:
       labels:
         {{- include "guac.labels" . | nindent 8 }}
         app.kubernetes.io/name: {{ .Values.guac.sampleData.jobName }}
+        {{- include "custom.labels" . | nindent 8 }}
     spec:
       containers:
       - name: data-ingestor

diff --git a/charts/guac/templates/ingestor-deployment.yaml b/charts/guac/templates/ingestor-deployment.yaml
@@ -14,6 +14,7 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.ingestor.name }}
     app.kubernetes.io/component: {{ .Values.guac.ingestor.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   replicas:  {{ .Values.guac.ingestor.replicas }}
   selector:
@@ -27,6 +28,7 @@ spec:
         {{- include "guac.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/name: {{ .Values.guac.ingestor.name }}
         app.kubernetes.io/component: {{ .Values.guac.ingestor.name }}
+        {{- include "custom.labels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ .Values.guac.ingestor.name }}
       containers:

diff --git a/charts/guac/templates/ingestor-sa.yaml b/charts/guac/templates/ingestor-sa.yaml
@@ -15,5 +15,6 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.ingestor.name }}
     app.kubernetes.io/component: {{ .Values.guac.ingestor.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 {{- end }}
 {{- end }}
diff --git a/charts/guac/templates/ingress.yaml b/charts/guac/templates/ingress.yaml
@@ -16,6 +16,7 @@ metadata:
 {{- range $key, $value := .Values.guac.ingress.extraLabels }}
     {{ $key }}: {{ $value }}
 {{- end }}
+{{- include "custom.labels" . | nindent 4 }}
 
 spec:
   {{- if .Values.guac.ingress.ingressClassName }}

diff --git a/charts/guac/templates/oci-collector-deployment.yaml b/charts/guac/templates/oci-collector-deployment.yaml
@@ -14,6 +14,7 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.ociCollector.name }}
     app.kubernetes.io/component: {{ .Values.guac.ociCollector.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   replicas:  {{ .Values.guac.ociCollector.replicas }}
   selector:
@@ -27,6 +28,7 @@ spec:
         {{- include "guac.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/name: {{ .Values.guac.ociCollector.name }}
         app.kubernetes.io/component: {{ .Values.guac.ociCollector.name }}
+        {{- include "custom.labels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ .Values.guac.ociCollector.name }}
       containers:

diff --git a/charts/guac/templates/oci-collector-sa.yaml b/charts/guac/templates/oci-collector-sa.yaml
@@ -15,5 +15,6 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.ociCollector.name }}
     app.kubernetes.io/component: {{ .Values.guac.ociCollector.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 {{- end }}
 {{- end }}
diff --git a/charts/guac/templates/osv-certifier-deployment.yaml b/charts/guac/templates/osv-certifier-deployment.yaml
@@ -14,6 +14,7 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.osvCertifier.name }}
     app.kubernetes.io/component: {{ .Values.guac.osvCertifier.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   replicas:  {{ .Values.guac.osvCertifier.replicas }}
   selector:
@@ -27,6 +28,7 @@ spec:
         {{- include "guac.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/name: {{ .Values.guac.osvCertifier.name }}
         app.kubernetes.io/component: {{ .Values.guac.osvCertifier.name }}
+        {{- include "custom.labels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ .Values.guac.osvCertifier.name }}
       containers:

diff --git a/charts/guac/templates/osv-certifier-sa.yaml b/charts/guac/templates/osv-certifier-sa.yaml
@@ -15,5 +15,6 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.osvCertifier.name }}
     app.kubernetes.io/component: {{ .Values.guac.osvCertifier.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 {{- end }}
 {{- end }}
diff --git a/charts/guac/templates/visualizer-deployment.yaml b/charts/guac/templates/visualizer-deployment.yaml
@@ -14,6 +14,7 @@ metadata:
     {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.visualizer.name }}
     app.kubernetes.io/component: {{ .Values.guac.visualizer.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   replicas:  {{ .Values.guac.visualizer.replicas }}
   selector:
@@ -27,6 +28,7 @@ spec:
         {{- include "guac.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/name: {{ .Values.guac.visualizer.name }}
         app.kubernetes.io/component: {{ .Values.guac.visualizer.name }}
+        {{- include "custom.labels" . | nindent 8 }}
     spec:
       containers:
       # workaround the problem that next.config.js can't set gql-addr dynamically

diff --git a/charts/guac/templates/visualizer-service.yaml b/charts/guac/templates/visualizer-service.yaml
@@ -10,11 +10,13 @@ metadata:
   labels: {{- include "guac.labels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.visualizer.name }}
     app.kubernetes.io/component: {{ .Values.guac.visualizer.name }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   selector:
     {{- include "guac.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/name: {{ .Values.guac.visualizer.name }}
     app.kubernetes.io/component: {{ .Values.guac.visualizer.name }}
+    {{- include "custom.labels" . | nindent 4 }}
   ports:
   {{- range .Values.guac.visualizer.svcPorts }}
     - {{ . | toYaml | indent 6 | trim }}