helm chart

Author: Raman

deployment/helm/templates/_helpers.tpl

@@ -50,16 +50,18 @@ app.kubernetes.io/name: {{ include "chatserver.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "chatserver.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "chatserver.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
+{{- /*
+Merges the global annotations with the service-specific annotations,
+giving precedence to the service-specific annotations.
+*/ -}}
+{{- define "chatserver.annotations" -}}
+{{- $serviceAnnotations := . -}}
+{{- $globalAnnotations := .Values.podAnnotations -}}
+{{- $result := dict -}}
+{{- $result = merge $result $globalAnnotations -}}
+{{- $result = merge $result $serviceAnnotations -}}
+{{- $result -}}
+{{- end -}}
 
 
 {{/*

deployment/helm/templates/group-message-router/statefulset.yaml

@@ -17,7 +17,7 @@ spec:
       {{- include "chatserver.selectorLabels" . | nindent 6 -}}
   template:
     metadata:
-      {{- with .Values.podAnnotations -}}
+      {{- with ( include "chatserver.annotations" .Values.mesageDelivery.podAnnotations ) -}}
       annotations:
         {{- toYaml . | nindent 8 -}}
       {{- end -}}

deployment/helm/templates/message-delivery/configmap.yaml

@@ -19,6 +19,10 @@ spec:
   template:
     metadata:
       name:  {{ $serviceName }}
+      {{- with ( include "chatserver.annotations" .Values.mesageDelivery.podAnnotations ) -}}
+      annotations:
+        {{- toYaml . | nindent 8 -}}
+      {{- end -}}
       labels:
         - service:  {{ $serviceName }}
         {{- include "chatserverlabels" . | nindent 4 -}}
@@ -27,7 +31,6 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 -}}
       {{- end -}}
-      serviceAccountName: {{ include "chatserver.serviceAccountName" . }}
       containers:
         - name:  {{ $serviceName }}
           securityContext:
@@ -54,11 +57,4 @@ spec:
             {{ include "mongo.opton" | nindent 12 }}
             {{- end -}}
             {{ include "eventStore.option" (dict "consumerGroup" "message-delivery") | nindent 12 }}
-          volumeMounts:
-            - name: service-discovery
-              mountPath: /app
-      volumes:
-        - name: service-discovery
-          configMap:
-            name: gateway-directory
 {{- end -}}

deployment/helm/templates/message-delivery/deployment.yaml

@@ -16,7 +16,7 @@ spec:
       {{- include "chatserver.selectorLabels" . | nindent 6 -}}
   template:
     metadata:
-      {{- with .Values.podAnnotations -}}
+      {{- with ( include "chatserver.annotations" .Values.messageRouter.podAnnotations ) -}}
       annotations:
         {{- toYaml . | nindent 8 -}}
       {{- end -}}
@@ -29,7 +29,6 @@ spec:
         {{- toYaml . | nindent 8 -}}
       {{- end -}}
       serviceName: {{ $serviceName }}
-      serviceAccountName: {{ include "chatserver.serviceAccountName" . }}
       containers:
         - name: {{ $serviceName }}
           securityContext:

deployment/helm/templates/message-router/statefulset.yaml

@@ -16,6 +16,10 @@ spec:
   template:
     metadata:
       name: nginx
+      {{- with ( include "chatserver.annotations" .Values.nginx.podAnnotations ) -}}
+      annotations:
+        {{- toYaml . | nindent 8 -}}
+      {{- end -}}
       labels:
         - service: "nginx"
         {{- include "chatserver.labels" . | nindent 4 -}}
@@ -24,7 +28,6 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 -}}
       {{- end -}}
-      serviceAccountName: {{ include "chatserver.serviceAccountName" . }}
       containers:
         - name: nginx
           securityContext:

deployment/helm/templates/nginx/deployment.yaml

@@ -18,7 +18,7 @@ spec:
       {{- include "chatserver.selectorLabels" . | nindent 6 -}}
   template:
     metadata:
-      {{- with .Values.podAnnotations -}}
+      {{- with ( include "chatserver.annotations" .Values.profileMs.podAnnotations ) -}}
       annotations:
         {{- toYaml . | nindent 8 -}}
       {{- end -}}
@@ -31,7 +31,6 @@ spec:
         {{- toYaml . | nindent 8 -}}
       {{- end -}}
       serviceName: {{ $serviceName }}
-      serviceAccountName: {{ include "chatserver.serviceAccountName" . }}
       containers:
         - name: {{ $serviceName }}
           securityContext:

deployment/helm/templates/notification/statefulset.yaml

@@ -20,6 +20,10 @@ spec:
   template:
     metadata:
       name: {{ $serviceName }}
+      {{- with ( include "chatserver.annotations" .Values.profileMs.podAnnotations ) -}}
+      annotations:
+        {{- toYaml . | nindent 8 -}}
+      {{- end -}}
       labels:
         - service: {{ $serviceName }}
         {{- include "chatserver.labels" . | nindent 4 -}}
@@ -28,7 +32,6 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 -}}
       {{- end -}}
-      serviceAccountName: {{ include "chatserver.serviceAccountName" . }}
       containers:
         - name: {{ $serviceName }}
           securityContext:

deployment/helm/templates/profile/deployment.yaml

@@ -16,7 +16,7 @@ spec:
       {{- include "chatserver.selectorLabels" . | nindent 6 -}}
   template:
     metadata:
-      {{- with .Values.podAnnotations -}}
+      {{- with ( include "chatserver.annotations" .Values.gateway.podAnnotations ) -}}
       annotations:
         {{- toYaml . | nindent 8 -}}
       {{- end -}}
@@ -29,7 +29,6 @@ spec:
         {{- toYaml . | nindent 8 -}}
       {{- end -}}
       serviceName: "{{ $serviceName }}-headless"
-      serviceAccountName: {{ include "chatserver.serviceAccountName" . }}
       containers:
         - name: {{ $serviceName }}
           securityContext: