Add podAnnotations to Helm templates for injecting user-specified pod.

install/helm/open-match/subcharts/open-match-customize/templates/evaluator.yaml

@@ -77,6 +77,9 @@ spec:
       annotations:
         {{- include "prometheus.annotations" (dict "port" .Values.evaluator.httpPort "prometheus" .Values.global.telemetry.prometheus) | nindent 8 }}
         {{- include "openmatch.chartmeta" . | nindent 8 }}
+        {{- if .Values.evaluator.podAnnotations }}
+        {{- toYaml .Values.evaluator.podAnnotations | nindent 8 }}
+        {{- end }}
       labels:
         app: {{ template "openmatch.name" . }}
         component: evaluator

install/helm/open-match/subcharts/open-match-customize/templates/matchfunctions.yaml

@@ -78,6 +78,9 @@ spec:
       annotations:
         {{- include "prometheus.annotations" (dict "port" .Values.function.httpPort "prometheus" .Values.global.telemetry.prometheus) | nindent 8 }}
         {{- include "openmatch.chartmeta" . | nindent 8 }}
+        {{- if .Values.function.podAnnotations }}
+        {{- toYaml .Values.function.podAnnotations | nindent 8 }}
+        {{- end }}
       labels:
         app: {{ template "openmatch.name" . }}
         component: matchfunction

install/helm/open-match/subcharts/open-match-customize/values.yaml

@@ -21,12 +21,14 @@ function:
   replicas: 3
   portType: ClusterIP
   image: openmatch-mmf-go-soloduel
+  podAnnotations: {}
 
 evaluator:
   enabled: false
   replicas: 3
   portType: ClusterIP
   image: openmatch-default-evaluator
+  podAnnotations: {}
 
 evaluatorConfigs: 
   # We use harness to implement the MMFs. MMF itself only requires one configmap but harness expects two,

install/helm/open-match/subcharts/open-match-scale/templates/scale-backend.yaml

@@ -53,6 +53,9 @@ spec:
       annotations:
         {{- include "openmatch.chartmeta" . | nindent 8 }}
         {{- include "prometheus.annotations" (dict "port" .Values.scaleBackend.httpPort "prometheus" .Values.global.telemetry.prometheus) | nindent 8 }}
+        {{- if .Values.scaleBackend.podAnnotations }}
+        {{- toYaml .Values.scaleBackend.podAnnotations | nindent 8 }}
+        {{- end }}
       labels:
         app: {{ template "openmatch.name" . }}
         component: scaleBackend

install/helm/open-match/subcharts/open-match-scale/templates/scale-frontend.yaml

@@ -53,6 +53,9 @@ spec:
       annotations:
         {{- include "openmatch.chartmeta" . | nindent 8 }}
         {{- include "prometheus.annotations" (dict "port" .Values.scaleFrontend.httpPort "prometheus" .Values.global.telemetry.prometheus) | nindent 8 }}
+        {{- if .Values.scaleFrontend.podAnnotations }}
+        {{- toYaml .Values.scaleFrontend.podAnnotations | nindent 8 }}
+        {{- end }}
       labels:
         app: {{ template "openmatch.name" . }}
         component: scaleFrontend

install/helm/open-match/subcharts/open-match-scale/values.yaml

@@ -17,12 +17,14 @@ scaleFrontend:
   httpPort: 51509
   replicas: 1
   image: openmatch-scale-frontend
+  podAnnotations: {}
 
 scaleBackend:
   hostName:
   httpPort: 51509
   replicas: 1
   image: openmatch-scale-backend
+  podAnnotations: {}
 
 configs:
   default:

install/helm/open-match/templates/backend.yaml

@@ -75,6 +75,9 @@ spec:
       annotations:
         {{- include "openmatch.chartmeta" . | nindent 8 }}
         {{- include "prometheus.annotations" (dict "port" .Values.backend.httpPort "prometheus" .Values.global.telemetry.prometheus) | nindent 8 }}
+        {{- if .Values.backend.podAnnotations }}
+        {{- toYaml .Values.backend.podAnnotations | nindent 8 }}
+        {{- end }}
       labels:
         app: {{ template "openmatch.name" . }}
         component: backend

install/helm/open-match/templates/frontend.yaml

@@ -75,6 +75,9 @@ spec:
       annotations:
         {{- include "openmatch.chartmeta" . | nindent 8 }}
         {{- include "prometheus.annotations" (dict "port" .Values.frontend.httpPort "prometheus" .Values.global.telemetry.prometheus) | nindent 8 }}
+        {{- if .Values.frontend.podAnnotations }}
+        {{- toYaml .Values.frontend.podAnnotations | nindent 8 }}
+        {{- end }}
       labels:
         app: {{ template "openmatch.name" . }}
         component: frontend

install/helm/open-match/templates/query.yaml

@@ -75,6 +75,9 @@ spec:
       annotations:
         {{- include "openmatch.chartmeta" . | nindent 8 }}
         {{- include "prometheus.annotations" (dict "port" .Values.query.httpPort "prometheus" .Values.global.telemetry.prometheus) | nindent 8 }}
+        {{- if .Values.query.podAnnotations }}
+        {{- toYaml .Values.query.podAnnotations | nindent 8 }}
+        {{- end }}
       labels:
         app: {{ template "openmatch.name" . }}
         component: query

install/helm/open-match/templates/swaggerui.yaml

@@ -54,6 +54,9 @@ spec:
       namespace: {{ .Release.Namespace }}
       annotations:
         {{- include "openmatch.chartmeta" . | nindent 8 }}
+        {{- if .Values.swaggerui.podAnnotations }}
+        {{- toYaml .Values.swaggerui.podAnnotations | nindent 8 }}
+        {{- end }}
       labels:
         app: {{ template "openmatch.name" . }}
         component: swaggerui

install/helm/open-match/templates/synchronizer.yaml

@@ -59,6 +59,9 @@ spec:
       annotations:
         {{- include "openmatch.chartmeta" . | nindent 8 }}
         {{- include "prometheus.annotations" (dict "port" .Values.synchronizer.httpPort "prometheus" .Values.global.telemetry.prometheus) | nindent 8 }}
+        {{- if .Values.synchronizer.podAnnotations }}
+        {{- toYaml .Values.synchronizer.podAnnotations | nindent 8 }}
+        {{- end }}
       labels:
         app: {{ template "openmatch.name" . }}
         component: synchronizer

install/helm/open-match/values-production.yaml

@@ -43,50 +43,61 @@
 #
 #   # Specifies the image name to be used in a Kubernetes pod for `query` compoenent.
 #   image: openmatch-query
+#
+#   # Specifies annotations to be used in a Kubernetes pod for `query` compoenent.
+#   podAnnotations:
+#    key1: value1
 swaggerui: &swaggerui
   hostName:
   httpPort: 51500
   portType: ClusterIP
   replicas: 1
   image: openmatch-swaggerui
+  podAnnotations: {}
 query: &query
   hostName:
   grpcPort: 50503
   httpPort: 51503
   portType: ClusterIP
   replicas: 3
   image: openmatch-query
+  podAnnotations: {}
 frontend: &frontend
   hostName:
   grpcPort: 50504
   httpPort: 51504
   portType: ClusterIP
   replicas: 3
   image: openmatch-frontend
+  podAnnotations: {}
 backend: &backend
   hostName:
   grpcPort: 50505
   httpPort: 51505
   portType: ClusterIP
   replicas: 3
   image: openmatch-backend
+  podAnnotations: {}
 synchronizer: &synchronizer
   hostName:
   grpcPort: 50506
   httpPort: 51506
   portType: ClusterIP
   replicas: 1
   image: openmatch-synchronizer
+  podAnnotations: {}
 evaluator: &evaluator
   hostName:
   grpcPort: 50508
   httpPort: 51508
   replicas: 3
+  podAnnotations: {}
 function: &function
   hostName:
   grpcPort: 50502
   httpPort: 51502
   replicas: 3
+  podAnnotations: {}
 
 # Specifies the location and name of the Open Match application-level config volumes.
 # Used in template: `openmatch.volumemounts.configs` and `openmatch.volumes.configs` under `templates/_helpers.tpl` file.

install/helm/open-match/values.yaml

@@ -43,50 +43,61 @@
 #
 #   # Specifies the image name to be used in a Kubernetes pod for `query` compoenent.
 #   image: openmatch-query
+#
+#   # Specifies annotations to be used in a Kubernetes pod for `query` compoenent.
+#   podAnnotations:
+#    key1: value1
 swaggerui: &swaggerui
   hostName:
   httpPort: 51500
   portType: ClusterIP
   replicas: 1
   image: openmatch-swaggerui
+  podAnnotations: {}
 query: &query
   hostName:
   grpcPort: 50503
   httpPort: 51503
   portType: ClusterIP
   replicas: 3
   image: openmatch-query
+  podAnnotations: {}
 frontend: &frontend
   hostName:
   grpcPort: 50504
   httpPort: 51504
   portType: ClusterIP
   replicas: 3
   image: openmatch-frontend
+  podAnnotations: {}
 backend: &backend
   hostName:
   grpcPort: 50505
   httpPort: 51505
   portType: ClusterIP
   replicas: 3
   image: openmatch-backend
+  podAnnotations: {}
 synchronizer: &synchronizer
   hostName:
   grpcPort: 50506
   httpPort: 51506
   portType: ClusterIP
   replicas: 1
   image: openmatch-synchronizer
+  podAnnotations: {}
 evaluator: &evaluator
   hostName:
   grpcPort: 50508
   httpPort: 51508
   replicas: 3
+  podAnnotations: {}
 function: &function
   hostName:
   grpcPort: 50502
   httpPort: 51502
   replicas: 3
+  podAnnotations: {}
 
 # Specifies the location and name of the Open Match application-level config volumes.
   # Used in template: `openmatch.volumemounts.configs` and `openmatch.volumes.configs` under `templates/_helpers.tpl` file.