diff --git a/charts/guac/Chart.yaml b/charts/guac/Chart.yaml index 1565d2b..f0a7140 100644 --- 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 index 518e0e7..a55b239 100644 --- 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 index 336c781..95af710 100644 --- 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 index b6f4c5b..ae1ed8e 100644 --- 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 index 0f589d7..b8a85e1 100644 --- 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 index e4ba2ef..4949167 100644 --- 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 index 18d7926..6c2d281 100644 --- 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 index 4e56aae..c4c0c31 100644 --- 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 index 8bec572..c64aa4c 100644 --- 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 index 5d65944..1fd1e61 100644 --- 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 index 42c623c..47b6a2f 100644 --- 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 index bf72be9..bc3ac30 100644 --- 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 index 4356c5a..57ef514 100644 --- 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 index e79e736..4ef811e 100644 --- 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 index c129476..5f997c3 100644 --- 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 index d754556..0220a36 100644 --- 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 index 5309b9c..2265912 100644 --- 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 index b8b1b96..f8c0b19 100644 --- 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 index 8e17c50..e59e3d8 100644 --- 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 index 9341d06..92347b2 100644 --- 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 index c08789f..1e7215f 100644 --- 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 index 7796e18..4e28cb8 100644 --- 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 index 02b7fe6..49044f8 100644 --- 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 index 6fc7d9e..eda02cb 100644 --- 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 index e90a168..a945169 100644 --- 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 index 01fdbde..79fc4e7 100644 --- 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 index 5a60656..0fcc7fc 100644 --- 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 index 6dbdfda..dfe8841 100644 --- 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 }} diff --git a/charts/guac/tests/custom_labels_test.yaml b/charts/guac/tests/custom_labels_test.yaml new file mode 100644 index 0000000..32bfd51 --- /dev/null +++ b/charts/guac/tests/custom_labels_test.yaml @@ -0,0 +1,78 @@ +# Copyright Kusari, Inc. and contributors +# Licensed under the MIT license. See LICENSE file in the project root for details. + +suite: GUAC Custom Labels tests + +tests: + - it: should have custom labels at the metadata level + templates: + # Deployments + - cd-certifier-deployment.yaml + - collectsub-deployment.yaml + - depsdev-collector-deployment.yaml + - graphql-server-deployment.yaml + - ingestor-deployment.yaml + - oci-collector-deployment.yaml + - osv-certifier-deployment.yaml + - guacrest-deployment.yaml + # Service Accounts + - cd-certifier-sa.yaml + - collectsub-sa.yaml + - depsdev-collector-sa.yaml + - graphql-server-sa.yaml + - guacrest-sa.yaml + - ingestor-sa.yaml + - oci-collector-sa.yaml + - osv-certifier-sa.yaml + # Services + - collectsub-service.yaml + - graphql-server-service.yaml + - guacrest-service.yaml + - visualizer-service.yaml + # Ingress + - api-only-ingress.yaml + - ingress.yaml + values: + - ./values_custom_labels.yaml + asserts: + - isSubset: + path: metadata.labels + content: + custom-label-1: 'test-label-1' + custom-label-2: 'test-label-2' + + - it: should have custom labels inside pod template metadata (Deployments only) + templates: + # Deployments + - cd-certifier-deployment.yaml + - collectsub-deployment.yaml + - depsdev-collector-deployment.yaml + - graphql-server-deployment.yaml + - ingestor-deployment.yaml + - oci-collector-deployment.yaml + - osv-certifier-deployment.yaml + - guacrest-deployment.yaml + values: + - ./values_custom_labels.yaml + asserts: + - isSubset: + path: spec.template.metadata.labels + content: + custom-label-1: 'test-label-1' + custom-label-2: 'test-label-2' + + - it: should have custom labels in spec selector (Services only) + templates: + # Services + - collectsub-service.yaml + - graphql-server-service.yaml + - guacrest-service.yaml + - visualizer-service.yaml + values: + - ./values_custom_labels.yaml + asserts: + - isSubset: + path: spec.selector + content: + custom-label-1: 'test-label-1' + custom-label-2: 'test-label-2' diff --git a/charts/guac/tests/values_custom_labels.yaml b/charts/guac/tests/values_custom_labels.yaml new file mode 100644 index 0000000..387527f --- /dev/null +++ b/charts/guac/tests/values_custom_labels.yaml @@ -0,0 +1,12 @@ +# Copyright Kusari, Inc. and contributors +# Licensed under the MIT license. See LICENSE file in the project root for details. +guac: + customLabels: { custom-label-1: 'test-label-1', custom-label-2: 'test-label-2' } + apiOnlyIngress: + enabled: true + ingress: + enabled: true + sampleData: + env: ["test"] + ingest: true + jobName: ingest-guac-data \ No newline at end of file diff --git a/charts/guac/values.yaml b/charts/guac/values.yaml index bab65bc..7119955 100644 --- a/charts/guac/values.yaml +++ b/charts/guac/values.yaml @@ -165,9 +165,8 @@ imagePullSecrets: ## @param guac.collectorPublishToQueue Whether to publish ingestion message to pubsub queue ## @param guac.blobAddr [nullable] gocloud connection string for blob store configured via https://gocloud.dev/howto/blob/ ## @param guac.additionalResources - +## @param guac.customLabels custom labels for all resources guac: - guacImage: repository: ghcr.io/guacsec/guac # if not set appVersion field from Chart.yaml is used @@ -176,7 +175,8 @@ guac: digest: "" pullPolicy: IfNotPresent workingDir: /guac - + # custom labels for all resources + customLabels: {} common: # env: [] env: