Adding ror.nhn.no ingress

NorskHelsenett · Jan 12, 2025 · 4113068 · 4113068
1 parent 3ab1ff8
commit 4113068
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 1 deletion.
diff --git a/charts/ror-webapp/templates/configmap.yaml b/charts/ror-webapp/templates/configmap.yaml
@@ -26,3 +26,33 @@ data:
         "timeout": 30000
       }
     }
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ror-web-cm-config2
+data:
+  config.json: |
+    {
+      "auth": {
+          "issuer": "{{ .Values.web.authUrl }}",
+          "clientId": "ror.nhn.no",
+          "redirectUri": "/auth/callback",
+          "scope": "profile email groups",
+          "response_type": "id_token token",
+          "requireHttps": true,
+          "strictDiscoveryDocumentValidation": true
+      },
+      "regex": {
+          "forms": "^[@()\\/:?\\r\\n.,a-zA-Z æøåÆØÅ0-9_-]+$"
+      },
+      "rowsPerPage": [10, 25, 50, 75, 100],
+      "rows": 25,
+      "rorApi": "{{ .Values.web.apiUrl2 }}",
+      "sse": {
+        "postfixUrl": "/v1/events/listen",
+        "method": "GET",
+        "timeout": 30000
+      }
+    }
diff --git a/charts/ror-webapp/templates/deployment.yaml b/charts/ror-webapp/templates/deployment.yaml
@@ -69,6 +69,6 @@ spec:
       volumes:
         - name: json-configmap-volume
           configMap:
-            name: ror-web-cm-config
+            name: ror-web-cm-config2
         - name: tmp-volume
           emptyDir: {}
diff --git a/charts/ror-webapp/templates/ingress-helsenett.yaml b/charts/ror-webapp/templates/ingress-helsenett.yaml
@@ -17,10 +17,22 @@ spec:
               number: {{ .Values.service.port }}
         path: {{ .Values.ingress.path }}
         pathType: {{ .Values.ingress.pathType }}
+  - host: {{ .Values.web.host2 }}
+    http:
+      paths:
+      - backend:
+          service:
+            name: {{ include "ror-admin.fullname" . }}
+            port:
+              number: {{ .Values.service.port }}
+        path: {{ .Values.ingress.path }}
+        pathType: {{ .Values.ingress.pathType }}
   tls:
   - hosts:
     - {{ .Values.web.host }}
     secretName: nhn-ror-admin-tls
+    - {{ .Values.web.host2 }}
+    secretName: nhn-ror-admin-tls
 ---
 apiVersion: ako.vmware.com/v1alpha1
 kind: HostRule

diff --git a/charts/ror-webapp/values.yaml b/charts/ror-webapp/values.yaml
@@ -4,7 +4,9 @@
 enabled: true
 web:
   host: ror.sky.test.nhn.no
+  host2: ror.nhn.no
   apiUrl: https://api.ror.sky.test.nhn.no
+  apiUrl2: https://api.ror.nhn.no
   authUrl: https://auth.sky.nhn.no/dex
 replicaCount: 3
 image: