fix: adds labels to broker deployment [HYB-560]

charts/snyk-broker/templates/_helpers.tpl

@@ -40,6 +40,9 @@ helm.sh/chart: {{ include "snyk-broker.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- with .Values.labels }}
+{{  toYaml . }}
+{{- end }}
 {{- end }}
 
 {{/*

charts/snyk-broker/tests/__snapshot__/broker_deployment_artifactory_test.yaml.snap

@@ -8,6 +8,8 @@ should render artifactoryUrl and brokerClientValidationUrl as secrets:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: artifactory-broker-RELEASE-NAME
       namespace: NAMESPACE
     spec:
@@ -107,6 +109,8 @@ should render artifactoryUrl and brokerClientValidationUrl as secrets:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: artifactory-broker-service-RELEASE-NAME
       namespace: NAMESPACE
     spec:
@@ -150,5 +154,7 @@ should render artifactoryUrl and brokerClientValidationUrl as secrets:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: snyk-broker-RELEASE-NAME
       namespace: NAMESPACE

charts/snyk-broker/tests/__snapshot__/broker_deployment_configmap_test.yaml.snap

@@ -8,6 +8,8 @@ cacert:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: github-com-broker-RELEASE-NAME
       namespace: NAMESPACE
     spec:
@@ -116,6 +118,8 @@ cacert:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: github-com-broker-service-RELEASE-NAME
       namespace: NAMESPACE
     spec:
@@ -158,6 +162,8 @@ cacert:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: RELEASE-NAME-snyk-broker-cacert-configmap-RELEASE-NAME
       namespace: NAMESPACE
   4: |
@@ -177,6 +183,8 @@ cacert:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: snyk-broker-RELEASE-NAME
       namespace: NAMESPACE
 cacertfile:
@@ -189,6 +197,8 @@ cacertfile:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: github-com-broker-RELEASE-NAME
       namespace: NAMESPACE
     spec:
@@ -297,6 +307,8 @@ cacertfile:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: github-com-broker-service-RELEASE-NAME
       namespace: NAMESPACE
     spec:
@@ -318,6 +330,8 @@ cacertfile:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: RELEASE-NAME-snyk-broker-cacert-configmap-RELEASE-NAME
       namespace: NAMESPACE
   4: |
@@ -337,5 +351,7 @@ cacertfile:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: snyk-broker-RELEASE-NAME
       namespace: NAMESPACE

charts/snyk-broker/tests/__snapshot__/broker_deployment_nexus_test.yaml.snap

@@ -8,6 +8,8 @@ should render render nexusUrl, baseNexusUrl and brokerClientValidationUrl as sec
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: nexus-broker-RELEASE-NAME
       namespace: NAMESPACE
     spec:
@@ -110,6 +112,8 @@ should render render nexusUrl, baseNexusUrl and brokerClientValidationUrl as sec
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: nexus-broker-service-RELEASE-NAME
       namespace: NAMESPACE
     spec:
@@ -161,5 +165,7 @@ should render render nexusUrl, baseNexusUrl and brokerClientValidationUrl as sec
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: snyk-broker-RELEASE-NAME
       namespace: NAMESPACE

charts/snyk-broker/tests/__snapshot__/broker_deployment_test.yaml.snap

@@ -432,6 +432,149 @@ HTTPS enabled:
         helm.sh/chart: snyk-broker-0.0.0
       name: snyk-broker-RELEASE-NAME
       namespace: NAMESPACE
+add deployment labels:
+  1: |
+    apiVersion: apps/v1
+    kind: Deployment
+    metadata:
+      labels:
+        app.kubernetes.io/instance: RELEASE-NAME
+        app.kubernetes.io/managed-by: Helm
+        app.kubernetes.io/name: snyk-broker-RELEASE-NAME
+        helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
+      name: github-com-broker-RELEASE-NAME
+      namespace: NAMESPACE
+    spec:
+      replicas: 1
+      selector:
+        matchLabels:
+          app.kubernetes.io/instance: RELEASE-NAME
+          app.kubernetes.io/name: snyk-broker-RELEASE-NAME
+      template:
+        metadata:
+          labels:
+            app.kubernetes.io/instance: RELEASE-NAME
+            app.kubernetes.io/name: snyk-broker-RELEASE-NAME
+        spec:
+          containers:
+            - env:
+                - name: BROKER_SERVER_URL
+                  value: https://broker.test.snyk.io
+                - name: BROKER_HEALTHCHECK_PATH
+                  value: /healthcheck
+                - name: BROKER_SYSTEMCHECK_PATH
+                  value: /systemcheck
+                - name: BROKER_TOKEN
+                  valueFrom:
+                    secretKeyRef:
+                      key: github-com-broker-token-key
+                      name: github-com-broker-token-RELEASE-NAME
+                - name: GITHUB_TOKEN
+                  valueFrom:
+                    secretKeyRef:
+                      key: github-com-token-key
+                      name: github-com-token-RELEASE-NAME
+                - name: PORT
+                  value: "8000"
+                - name: BROKER_CLIENT_URL
+                  value: http://brokerclient
+                - name: LOG_LEVEL
+                  value: info
+                - name: LOG_ENABLE_BODY
+                  value: "false"
+                - name: ACCEPT_CODE
+                  value: "true"
+                - name: ACCEPT_IAC
+                  value: tf,yaml,yml,json,tpl
+                - name: BROKER_DISPATCHER_BASE_URL
+                  value: https://api.test.snyk.io
+              image: snyk/broker:github-com
+              imagePullPolicy: Always
+              livenessProbe:
+                failureThreshold: 3
+                httpGet:
+                  path: /healthcheck
+                  port: 8000
+                  scheme: HTTP
+                initialDelaySeconds: 3
+                periodSeconds: 10
+                timeoutSeconds: 1
+              name: github-com-broker-RELEASE-NAME
+              ports:
+                - containerPort: 8000
+                  name: http
+              readinessProbe:
+                failureThreshold: 3
+                httpGet:
+                  path: /healthcheck
+                  port: 8000
+                  scheme: HTTP
+                initialDelaySeconds: 3
+                periodSeconds: 10
+                timeoutSeconds: 1
+              resources:
+                limits:
+                  cpu: 1
+                  memory: 256Mi
+                requests:
+                  cpu: 1
+                  memory: 256Mi
+              securityContext:
+                allowPrivilegeEscalation: false
+                capabilities:
+                  drop:
+                    - ALL
+                readOnlyRootFilesystem: true
+                runAsNonRoot: true
+                runAsUser: 1000
+              volumeMounts: null
+          securityContext: {}
+          serviceAccountName: snyk-broker-RELEASE-NAME
+          volumes: null
+  2: |
+    apiVersion: v1
+    kind: Service
+    metadata:
+      labels:
+        app.kubernetes.io/instance: RELEASE-NAME
+        app.kubernetes.io/managed-by: Helm
+        app.kubernetes.io/name: snyk-broker-RELEASE-NAME
+        helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
+      name: github-com-broker-service-RELEASE-NAME
+      namespace: NAMESPACE
+    spec:
+      ports:
+        - port: 8000
+          targetPort: 8000
+      selector:
+        app.kubernetes.io/instance: RELEASE-NAME
+        app.kubernetes.io/name: snyk-broker-RELEASE-NAME
+      type: ClusterIP
+  3: |
+    apiVersion: v1
+    data:
+      github-com-broker-token-key: MTIz
+    kind: Secret
+    metadata:
+      name: github-com-broker-token-RELEASE-NAME
+    type: Opaque
+  4: |
+    apiVersion: v1
+    kind: ServiceAccount
+    metadata:
+      labels:
+        app.kubernetes.io/instance: RELEASE-NAME
+        app.kubernetes.io/managed-by: Helm
+        app.kubernetes.io/name: snyk-broker-RELEASE-NAME
+        helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
+      name: snyk-broker-RELEASE-NAME
+      namespace: NAMESPACE
 default values:
   1: |
     apiVersion: apps/v1
@@ -442,6 +585,8 @@ default values:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: github-com-broker-RELEASE-NAME
       namespace: NAMESPACE
     spec:
@@ -540,6 +685,8 @@ default values:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: github-com-broker-service-RELEASE-NAME
       namespace: NAMESPACE
     spec:
@@ -567,6 +714,8 @@ default values:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: snyk-broker-RELEASE-NAME
         helm.sh/chart: snyk-broker-0.0.0
+        node1: test1
+        node2: test2
       name: snyk-broker-RELEASE-NAME
       namespace: NAMESPACE
 preflight checks off:

charts/snyk-broker/tests/broker_deployment_test.yaml

@@ -33,3 +33,8 @@ tests:
       - ./fixtures/default_values_ha_on_4_replicas.yaml
     asserts:
       - matchSnapshot: {}
+  - it: add deployment labels
+    values:
+      - ./fixtures/default_values.yaml
+    asserts:
+      - matchSnapshot: {}

charts/snyk-broker/tests/fixtures/default_values.yaml

@@ -21,3 +21,6 @@ highAvailabilityMode:
   enabled: false
 brokerDispatcherUrl: "https://api.test.snyk.io"
 
+labels:
+  node1: test1
+  node2: test2

charts/snyk-broker/values.yaml

@@ -24,6 +24,9 @@ brokerDispatcherUrl: "https://api.snyk.io"
 # This number if only used if enableHighAvailabilityMode is true
 replicaCount: 2
 
+# Adds additional labels to broker deployment
+labels: {}
+
 ##### SCM Generic #####
 
 # scmType is used to define the Source Control that you are connecting to.