Merge pull request #75 from ministryofjustice/fix-ingress-share-real

Revert share ingress to dedicated hostname + enable redirect to /share
ministryofjustice · Jul 16, 2024 · 6cda4f5 · 6cda4f5
2 parents a682b79 + ca20a8c
commit 6cda4f5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/alfresco-content-services/templates/ingress-share.yaml b/alfresco-content-services/templates/ingress-share.yaml
@@ -15,6 +15,10 @@ metadata:
     nginx.ingress.kubernetes.io/session-cookie-path: "/share"
     nginx.ingress.kubernetes.io/session-cookie-max-age: "604800"
     nginx.ingress.kubernetes.io/session-cookie-expires: "604800"
+    nginx.ingress.kubernetes.io/configuration-snippet: |
+      if ($request_uri = "/") {
+        return 301 /share/page/;
+      }
     {{- include "ingress_annotations" .Values.share }}
     {{- if ne .Values.share.ingress.hostName .Values.repository.ingress.hostName }}
     {{- include "ingress_vhost_annotations" .Values.share }}
@@ -25,13 +29,20 @@ spec:
   ingressClassName: default
   tls:
     - hosts:
-        - {{ .Release.Namespace }}.{{ .Values.repository.ingress.hostName }}
+        - share.{{ .Release.Namespace }}.{{ .Values.repository.ingress.hostName }}
       secretName: share-ingress-cert
   rules:
-    - host: {{ .Release.Namespace }}.{{ .Values.repository.ingress.hostName }}
+    - host: share.{{ .Release.Namespace }}.{{ .Values.repository.ingress.hostName }}
       http:
         paths:
-          - path: {{ .Values.share.ingress.path }}
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ template "content-services.shortname" . }}-share
+                port:
+                  number: {{  .Values.share.service.externalPort }}
+          - path: /share/page/
             pathType: Prefix
             backend:
               service:

diff --git a/alfresco-content-services/values.yaml b/alfresco-content-services/values.yaml
@@ -642,7 +642,7 @@ share:
     type: ClusterIP
     externalPort: 80
   ingress:
-    path: /share
+    path: /
     annotations: {}
     tls: []
     #  - secretName: chart-example-tls