Brought the way we handled the deployment and ingress labels and annotations inline with what we do for Console.

Author: BStarmerSmith

charts/gateway/templates/deployment.yaml

@@ -2,7 +2,14 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "conduktor-gateway.fullname" . }}
-  labels: {{ include "conduktor-gateway.labels" . | nindent 4 }}
+  labels: {{- include "conduktor-gateway.labels" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- if .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- end }}
 spec:
   selector:
     matchLabels: {{ include "conduktor-gateway.podSelectorLabels" . | nindent 6 }}
@@ -12,18 +19,24 @@ spec:
   template:
     metadata:
       annotations:
+        {{- if .Values.commonAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 8 }}
+        {{- end }}
+        {{- if .Values.gateway.podAnnotations }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.gateway.podAnnotations "context" $) | nindent 8 }}
+        {{- end }}
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         checksum/self-secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
         {{- if .Values.gateway.secretSha256sum }}
         checksum/secret: {{ .Values.gateway.secretSha256sum }}
         {{- end }}
-        {{- with .Values.gateway.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
+      labels: {{- include "conduktor-gateway.labels" . | nindent 8 }}
+        {{- if .Values.gateway.podLabels }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.gateway.podLabels "context" $) | nindent 8 }}
+        {{- end }}
+        {{- if .Values.commonLabels }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }}
         {{- end }}
-      labels: {{ include "conduktor-gateway.labels" . | nindent 8 }}
-      {{- if .Values.gateway.podLabels }}
-      {{- toYaml .Values.gateway.podLabels | nindent 8 }}
-      {{- end }}
     spec:
       containers:
         - name: gateway

charts/gateway/templates/ingress.yaml

@@ -4,7 +4,10 @@ kind: Ingress
 metadata:
   name: {{ template "common.names.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{ include "conduktor-gateway.labels" . | nindent 4 }}
+  labels: {{- include "conduktor-gateway.labels" . | nindent 4 }}
+    {{- with .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
+    {{- end }}
   {{- if or .Values.ingress.annotations .Values.commonAnnotations }}
   annotations:
     {{- if .Values.ingress.annotations }}

values.yaml

@@ -0,0 +1,33 @@
+global:
+  imagePullSecrets:
+    - name: harbor-secret
+commonLabels:
+  conduktor.io/team: gateway
+  conduktor.io/app-env: nightly
+  conduktor.io/env: staging
+gateway:
+  image:
+    registry: harbor.cdkt.dev
+    repository: conduktor/conduktor-gateway
+    tag: nightly-1742776053 # {"$imagepolicy": "gateway-nightly:conduktor-gateway:tag"}
+  podLabels:
+  replicas: 3
+  secretRef: "gateway-secrets" # pragma: allowlist secret
+  env:
+    LOG4J2_APPENDER_LAYOUT: json
+    GATEWAY_SECURITY_PROTOCOL: SASL_PLAINTEXT
+    KAFKA_BOOTSTRAP_SERVERS: "cp-kafka.gateway-nightly.svc.cluster.local:9092"
+    KAFKA_SECURITY_PROTOCOL: SASL_PLAINTEXT
+    KAFKA_SASL_MECHANISM: PLAIN
+    KAFKA_SASL_JAAS_CONFIG: "org.apache.kafka.common.security.plain.PlainLoginModule required username=\"admin\" password=\"admin-secret\";"
+  startupProbeDelay: "45"
+  portRange:
+    start: 9092
+    count: 3
+  jmx:
+    enable: true
+  resources:
+    requests:
+      cpu: 1
+    limits:
+      cpu: 3