Merge pull request #29 from BouyguesTelecom/fix/ingress

variabilise ingress, with annotations & tls
BouyguesTelecom · Dec 12, 2024 · 6a81dce · 6a81dce
2 parents 7b6fb70 + 74f792c
commit 6a81dce
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 18 deletions.
diff --git a/opensource/templates/nginx/nginx-ingress.yaml b/opensource/templates/nginx/nginx-ingress.yaml
@@ -3,25 +3,32 @@ kind: Ingress
 metadata:
     name: nginx-ingress
     annotations:
-        kubernetes.io/ingress.class: nginx
+    {{- range $key, $value := .Values.ingress.annotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
 spec:
-    ingressClassName: nginx
+    ingressClassName: {{ .Values.ingress.className }}
+    {{- if .Values.ingress.tls }}
+    tls:
+        -   hosts:
+                - {{ .Values.env }}.{{ .Values.domain }}
+            secretName: {{ ..Release.Name }}-tls-certificate
+    {{- end }}
     rules:
-        - host: '{{.Values.env}}{{.Values.domain}}'
+        - host: '{{ .Values.env }}.{{ .Values.domain }}'
           http:
               paths:
-                  -   path: {{ if hasKey .Values.mediaProvider "apiPrefix" }}{{ .Values.mediaProvider.apiPrefix }}/assets/media{{ else }}/assets/media{{ end }}
-                      pathType: ImplementationSpecific
-                      backend:
-                          service:
-                              name: nginx
-                              port:
-                                  number: 80
-                  -   path: {{ if hasKey .Values.mediaProvider "apiPrefix" }}{{ .Values.mediaProvider.apiPrefix }}/catalog{{ else }}/catalog{{ end }}
-                      pathType: ImplementationSpecific
-                      backend:
-                          service:
-                              name: nginx
-                              port:
-                                  number: 80
-
+                  - path: {{ if hasKey .Values.mediaProvider "apiPrefix" }}{{ .Values.mediaProvider.apiPrefix }}/assets/media{{ else }}/assets/media{{ end }}
+                    pathType: ImplementationSpecific
+                    backend:
+                        service:
+                            name: nginx
+                            port:
+                                number: 80
+                  - path: {{ if hasKey .Values.mediaProvider "apiPrefix" }}{{ .Values.mediaProvider.apiPrefix }}/catalog{{ else }}/catalog{{ end }}
+                    pathType: ImplementationSpecific
+                    backend:
+                        service:
+                            name: nginx
+                            port:
+                                number: 80
diff --git a/opensource/values.local.yaml b/opensource/values.local.yaml
@@ -1,5 +1,10 @@
 local: true
 
+ingress:
+    className: nginx
+    annotations:
+        kubernetes.io/ingress.class: nginx
+
 redis:
     service: redis-service
     dumpFolderPath: '/dumps'

diff --git a/opensource/values.yaml b/opensource/values.yaml
@@ -1,3 +1,8 @@
+ingress:
+    className: nginx
+    annotations:
+        kubernetes.io/ingress.class: nginx
+
 redis:
     service: redis-service
     dumpFolderPath: '/dumps'