ingress-annotations (#16)

Author: shcherbak

charts/synapse/Chart.yaml

@@ -1,3 +1,3 @@
 ---
 name: synapse
-version: 0.22.1
+version: 0.23.0

charts/synapse/templates/admin-ingress.yaml

@@ -4,9 +4,10 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: synapse-admin
-  annotations:
-    nginx.ingress.kubernetes.io/proxy-body-size: 50m
-    nginx.ingress.kubernetes.io/use-regex: "true"
+  {{- if or .Values.admin.ingress.annotations .Values.admin.ingress.commonAnnotations }}
+  {{ $annotations := merge .Values.admin.ingress.annotations .Values.admin.ingress.commonAnnotations }}
+  annotations: {{ toYaml $annotations | nindent 4 }}
+  {{- end }}
 spec:
   ingressClassName: nginx
   tls:

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

@@ -5,9 +5,10 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: matrix-authentication
-  annotations:
-    nginx.org/client-max-body-size: "50m"
-    nginx.ingress.kubernetes.io/proxy-body-size: "50m"
+  {{- if or .Values.matrixAuthentication.ingress.annotations .Values.matrixAuthentication.ingress.commonAnnotations }}
+  {{ $annotations := merge .Values.matrixAuthentication.ingress.annotations .Values.matrixAuthentication.ingress.commonAnnotations }}
+  annotations: {{ toYaml $annotations | nindent 4 }}
+  {{- end }}
 spec:
   ingressClassName: nginx
   tls:

charts/synapse/templates/synapse-ingress.yaml

@@ -3,10 +3,10 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: synapse
-  annotations:
-    nginx.org/client-max-body-size: "50m"
-    nginx.ingress.kubernetes.io/proxy-body-size: "50m"
-    nginx.ingress.kubernetes.io/proxy-read-timeout: "320"
+  {{- if or .Values.ingress.annotations .Values.ingress.commonAnnotations }}
+  {{ $annotations := merge .Values.ingress.annotations .Values.ingress.commonAnnotations }}
+  annotations: {{ toYaml $annotations | nindent 4 }}
+  {{- end }}
 spec:
   ingressClassName: nginx
   tls:

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

@@ -3,8 +3,10 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: well-known
-  annotations:
-    nginx.ingress.kubernetes.io/use-regex: "true"
+  {{- if or .Values.wellKnown.ingress.annotations .Values.wellKnown.ingress.commonAnnotations }}
+  {{ $annotations := merge .Values.wellKnown.ingress.annotations .Values.wellKnown.ingress.commonAnnotations }}
+  annotations: {{ toYaml $annotations | nindent 4 }}
+  {{- end }}
 spec:
   ingressClassName: nginx
   tls:

charts/synapse/values.yaml

@@ -210,6 +210,11 @@ experimentalFeatures:
 
 ingress:
   secretName: ''
+  commonAnnotations:
+    nginx.org/client-max-body-size: "50m"
+    nginx.ingress.kubernetes.io/proxy-body-size: "50m"
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "320"
+  annotations: {}
   masterRoutes:
     - "/_matrix/"
     - "/_synapse/"
@@ -340,6 +345,10 @@ admin:
     enabled: true
     secretName: ''
     serverName: NOT-CONFIGURED
+    commonAnnotations:
+      nginx.ingress.kubernetes.io/proxy-body-size: 50m
+      nginx.ingress.kubernetes.io/use-regex: "true"
+    annotations: {}
   image:
     repository: "ghcr.io/etkecc/synapse-admin"
     tag: "v0.11.0-etke42"
@@ -442,6 +451,10 @@ matrixAuthentication:
     enabled: true
     host: NOT-CONFIGURED
     secretName: ''
+    commonAnnotations:
+      nginx.org/client-max-body-size: "50m"
+      nginx.ingress.kubernetes.io/proxy-body-size: "50m"
+    annotations:  {}
   config:
     clients: []
     database:
@@ -529,6 +542,10 @@ wellKnown:
   tolerations: []
   affinity: {}
   updateStrategy: {}
+  ingress:
+    commonAnnotations:
+      nginx.ingress.kubernetes.io/use-regex: "true"
+    annotations: {}
   resources:
     requests:
       cpu: 20m