Fix helm charts

hypertrace · Oct 10, 2024 · cf6889e · cf6889e
1 parent 2454cd2
commit cf6889e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/helm/templates/config-service-config.yaml b/helm/templates/config-service-config.yaml
@@ -43,4 +43,3 @@ data:
       {{- end }}
       ]
     }
-
diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
@@ -20,15 +20,15 @@ spec:
     metadata:
       labels:
         release: {{ .Release.Name }}
-      {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
+      {{- with merge .Values.podLabels .Values.commonPodLabels }}
+      {{- toYaml . | nindent 8 }}
       {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/config-service-config.yaml") . | sha256sum }}
         prometheus.io/scrape: "true"
         prometheus.io/port: "{{ .Values.containerAdminPort }}"
-      {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
+      {{- with merge .Values.podAnnotations .Values.commonPodAnnotations }}
+      {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
     {{- with .Values.imagePullSecrets }}
@@ -86,3 +86,7 @@ spec:
               port: {{ .Values.containerAdminPort }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- with .Values.containerSecurityContext }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -29,6 +29,14 @@ service:
   type: ClusterIP
   port: 50101
 
+containerSecurityContext: {}
+
+podSecurityContext: {}
+
+commonPodLabels: {}
+
+commonPodAnnotations: {}
+
 nodeLabels: {}
 
 javaOpts: "-XX:InitialRAMPercentage=50.0 -XX:MaxRAMPercentage=75.0"
@@ -115,3 +123,7 @@ kafka-topic-creator:
     address: zookeeper:2181
   imagePullSecrets: []
   podAnnotations: {}
+  podSecurityContext: {}
+  commonPodLabels: {}
+  containerSecurityContext: {}
+