service annotations to values

Author: shcherbak

charts/synapse/Chart.yaml

@@ -1,3 +1,3 @@
 ---
 name: synapse
-version: 1.1.4
+version: 1.1.5

charts/synapse/templates/admin-service.yaml

@@ -3,8 +3,10 @@ apiVersion: v1
 kind: Service
 metadata:
   name: admin
+  {{- with .Values.admin.service.annotations }}
   annotations:
-    cloud.google.com/neg: '{"ingress":false}'
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   selector:
     app: admin

charts/synapse/templates/envoy-service.yaml

@@ -5,6 +5,10 @@ metadata:
   name:  synapse-client-reader-envoy
   labels:
     {{- include "synapse-client-reader-envoy.selectorLabels" . | nindent 4 }}
+  {{- with .Values.envoyProxy.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.envoyProxy.service.type }}
   ports:

charts/synapse/templates/matrix-authentication-service.yaml

@@ -6,6 +6,10 @@ metadata:
   name:  matrix-authentication
   labels:
     {{- include "matrix-authentication.selectorLabels" . | nindent 4 }}
+  {{- with .Values.matrixAuthentication.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.matrixAuthentication.service.type }}
   ports:

charts/synapse/templates/pgbouncer-service.yaml

@@ -5,6 +5,10 @@ metadata:
   name: synapse-pgbouncer
   labels:
     app: synapse-pgbouncer
+  {{- with .Values.synapse.pgbouncer.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   selector:
     app: synapse-pgbouncer

charts/synapse/templates/synapse-service.yaml

@@ -6,8 +6,10 @@ apiVersion: v1
 kind: Service
 metadata:
   name: synapse-{{ $name }}
+  {{- with $.Values.synapse.service.annotations }}
   annotations:
-    cloud.google.com/neg: '{"ingress":false}'
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   clusterIP: None
   selector:
@@ -25,8 +27,10 @@ apiVersion: v1
 kind: Service
 metadata:
   name: synapse-client-reader-headless
+  {{- with $.Values.synapse.service.annotations }}
   annotations:
-    cloud.google.com/neg: '{"ingress":false}'
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     {{- include "synapse-client-reader.selectorLabels" . | nindent 4 }}
 spec:

charts/synapse/templates/well-known-service.yaml

@@ -3,8 +3,10 @@ apiVersion: v1
 kind: Service
 metadata:
   name: well-known
+  {{- with .Values.wellKnown.service.annotations }}
   annotations:
-    cloud.google.com/neg: '{"ingress":false}'
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   selector:
     app: well-known

charts/synapse/values.yaml

@@ -196,6 +196,8 @@ synapse:
     #     secretKeyRef:
     #       key: my-secret-key
     #       name: my-secret
+    service:
+      annotations: {}
   pgbouncerExporter:
     enabled: false
     podMonitor: false
@@ -220,6 +222,9 @@ synapse:
       requests:
         cpu: 30m
         memory: 40Mi
+  service:
+    annotations:
+      cloud.google.com/neg: '{"ingress":false}'
 
   redis:
     enabled: true
@@ -487,6 +492,9 @@ admin:
   tolerations: []
   affinity: {}
   updateStrategy: {}
+  service:
+    annotations:
+      cloud.google.com/neg: '{"ingress":false}'
 
 envoyProxy:
   enabled: true
@@ -496,6 +504,7 @@ envoyProxy:
   service:
     type: ClusterIP
     port: 80
+    annotations: {}
   replicaCount: 2
   podDisruptionBudget:
     enabled: true
@@ -539,6 +548,7 @@ matrixAuthentication:
   service:
     type: ClusterIP
     port: 80
+    annotations: {}
   replicaCount: 2
   podDisruptionBudget:
     enabled: true
@@ -671,6 +681,9 @@ wellKnown:
   tolerations: []
   affinity: {}
   updateStrategy: {}
+  service:
+    annotations:
+      cloud.google.com/neg: '{"ingress":false}'
   ingress:
     commonAnnotations:
       nginx.ingress.kubernetes.io/use-regex: "true"