fix(services-bff): Fix ingress for portals (#17099)

* Fix ingress for portals * chore: charts update dirty files --------- Co-authored-by: snaerseljan <[email protected]> Co-authored-by: andes-it <[email protected]>
island-is · Dec 2, 2024 · af0d7f9 · af0d7f9
1 parent 71774d0
commit af0d7f9
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 2 deletions.
diff --git a/apps/api/infra/api.ts b/apps/api/infra/api.ts
@@ -477,5 +477,6 @@ export const serviceSetup = (services: {
       'application-system',
       'consultation-portal',
       'portals-admin',
+      'service-portal',
     )
 }
diff --git a/apps/services/bff/infra/admin-portal.infra.ts b/apps/services/bff/infra/admin-portal.infra.ts
@@ -73,4 +73,4 @@ export const serviceSetup = (
         paths: [`/${key}/bff`],
       },
     })
-    .grantNamespaces('identity-server')
+    .grantNamespaces('nginx-ingress-external', 'identity-server')
diff --git a/apps/services/bff/infra/my-pages-portal.infra.ts b/apps/services/bff/infra/my-pages-portal.infra.ts
@@ -72,4 +72,4 @@ export const serviceSetup = (
         paths: ['/bff'],
       },
     })
-    .grantNamespaces('identity-server')
+    .grantNamespaces('nginx-ingress-external', 'identity-server')
diff --git a/charts/islandis/values.dev.yaml b/charts/islandis/values.dev.yaml
@@ -422,6 +422,7 @@ api:
     - 'application-system'
     - 'consultation-portal'
     - 'portals-admin'
+    - 'service-portal'
   grantNamespacesEnabled: true
   healthCheck:
     liveness:
@@ -2312,6 +2313,7 @@ services-bff-portals-admin:
     REDIS_URL_NODE_01: '["clustercfg.general-redis-cluster-group.5fzau3.euw1.cache.amazonaws.com:6379"]'
     SERVERSIDE_FEATURES_ON: ''
   grantNamespaces:
+    - 'nginx-ingress-external'
     - 'identity-server'
   grantNamespacesEnabled: true
   healthCheck:
@@ -2397,6 +2399,7 @@ services-bff-portals-my-pages:
     REDIS_URL_NODE_01: '["clustercfg.general-redis-cluster-group.5fzau3.euw1.cache.amazonaws.com:6379"]'
     SERVERSIDE_FEATURES_ON: ''
   grantNamespaces:
+    - 'nginx-ingress-external'
     - 'identity-server'
   grantNamespacesEnabled: true
   healthCheck:

diff --git a/charts/islandis/values.prod.yaml b/charts/islandis/values.prod.yaml
@@ -410,6 +410,7 @@ api:
     - 'application-system'
     - 'consultation-portal'
     - 'portals-admin'
+    - 'service-portal'
   grantNamespacesEnabled: true
   healthCheck:
     liveness:
@@ -2181,6 +2182,7 @@ services-bff-portals-admin:
     REDIS_URL_NODE_01: '["clustercfg.general-redis-cluster-group.whakos.euw1.cache.amazonaws.com:6379"]'
     SERVERSIDE_FEATURES_ON: 'driving-license-use-v1-endpoint-for-v2-comms'
   grantNamespaces:
+    - 'nginx-ingress-external'
     - 'identity-server'
   grantNamespacesEnabled: true
   healthCheck:
@@ -2268,6 +2270,7 @@ services-bff-portals-my-pages:
     REDIS_URL_NODE_01: '["clustercfg.general-redis-cluster-group.whakos.euw1.cache.amazonaws.com:6379"]'
     SERVERSIDE_FEATURES_ON: 'driving-license-use-v1-endpoint-for-v2-comms'
   grantNamespaces:
+    - 'nginx-ingress-external'
     - 'identity-server'
   grantNamespacesEnabled: true
   healthCheck:

diff --git a/charts/islandis/values.staging.yaml b/charts/islandis/values.staging.yaml
@@ -422,6 +422,7 @@ api:
     - 'application-system'
     - 'consultation-portal'
     - 'portals-admin'
+    - 'service-portal'
   grantNamespacesEnabled: true
   healthCheck:
     liveness:
@@ -2050,6 +2051,7 @@ services-bff-portals-admin:
     REDIS_URL_NODE_01: '["clustercfg.general-redis-cluster-group.ab9ckb.euw1.cache.amazonaws.com:6379"]'
     SERVERSIDE_FEATURES_ON: ''
   grantNamespaces:
+    - 'nginx-ingress-external'
     - 'identity-server'
   grantNamespacesEnabled: true
   healthCheck:
@@ -2135,6 +2137,7 @@ services-bff-portals-my-pages:
     REDIS_URL_NODE_01: '["clustercfg.general-redis-cluster-group.ab9ckb.euw1.cache.amazonaws.com:6379"]'
     SERVERSIDE_FEATURES_ON: ''
   grantNamespaces:
+    - 'nginx-ingress-external'
     - 'identity-server'
   grantNamespacesEnabled: true
   healthCheck:

diff --git a/charts/services/api/values.dev.yaml b/charts/services/api/values.dev.yaml
@@ -171,6 +171,7 @@ grantNamespaces:
   - 'application-system'
   - 'consultation-portal'
   - 'portals-admin'
+  - 'service-portal'
 grantNamespacesEnabled: true
 healthCheck:
   liveness:

diff --git a/charts/services/api/values.prod.yaml b/charts/services/api/values.prod.yaml
@@ -171,6 +171,7 @@ grantNamespaces:
   - 'application-system'
   - 'consultation-portal'
   - 'portals-admin'
+  - 'service-portal'
 grantNamespacesEnabled: true
 healthCheck:
   liveness:

diff --git a/charts/services/api/values.staging.yaml b/charts/services/api/values.staging.yaml
@@ -171,6 +171,7 @@ grantNamespaces:
   - 'application-system'
   - 'consultation-portal'
   - 'portals-admin'
+  - 'service-portal'
 grantNamespacesEnabled: true
 healthCheck:
   liveness:

diff --git a/charts/services/services-bff-portals-admin/values.dev.yaml b/charts/services/services-bff-portals-admin/values.dev.yaml
@@ -39,6 +39,7 @@ env:
   REDIS_URL_NODE_01: '["clustercfg.general-redis-cluster-group.5fzau3.euw1.cache.amazonaws.com:6379"]'
   SERVERSIDE_FEATURES_ON: ''
 grantNamespaces:
+  - 'nginx-ingress-external'
   - 'identity-server'
 grantNamespacesEnabled: true
 healthCheck:

diff --git a/charts/services/services-bff-portals-admin/values.prod.yaml b/charts/services/services-bff-portals-admin/values.prod.yaml
@@ -39,6 +39,7 @@ env:
   REDIS_URL_NODE_01: '["clustercfg.general-redis-cluster-group.whakos.euw1.cache.amazonaws.com:6379"]'
   SERVERSIDE_FEATURES_ON: 'driving-license-use-v1-endpoint-for-v2-comms'
 grantNamespaces:
+  - 'nginx-ingress-external'
   - 'identity-server'
 grantNamespacesEnabled: true
 healthCheck:

diff --git a/charts/services/services-bff-portals-admin/values.staging.yaml b/charts/services/services-bff-portals-admin/values.staging.yaml
@@ -39,6 +39,7 @@ env:
   REDIS_URL_NODE_01: '["clustercfg.general-redis-cluster-group.ab9ckb.euw1.cache.amazonaws.com:6379"]'
   SERVERSIDE_FEATURES_ON: ''
 grantNamespaces:
+  - 'nginx-ingress-external'
   - 'identity-server'
 grantNamespacesEnabled: true
 healthCheck:

diff --git a/charts/services/services-bff-portals-my-pages/values.dev.yaml b/charts/services/services-bff-portals-my-pages/values.dev.yaml
@@ -39,6 +39,7 @@ env:
   REDIS_URL_NODE_01: '["clustercfg.general-redis-cluster-group.5fzau3.euw1.cache.amazonaws.com:6379"]'
   SERVERSIDE_FEATURES_ON: ''
 grantNamespaces:
+  - 'nginx-ingress-external'
   - 'identity-server'
 grantNamespacesEnabled: true
 healthCheck:

diff --git a/charts/services/services-bff-portals-my-pages/values.prod.yaml b/charts/services/services-bff-portals-my-pages/values.prod.yaml
@@ -39,6 +39,7 @@ env:
   REDIS_URL_NODE_01: '["clustercfg.general-redis-cluster-group.whakos.euw1.cache.amazonaws.com:6379"]'
   SERVERSIDE_FEATURES_ON: 'driving-license-use-v1-endpoint-for-v2-comms'
 grantNamespaces:
+  - 'nginx-ingress-external'
   - 'identity-server'
 grantNamespacesEnabled: true
 healthCheck:

diff --git a/charts/services/services-bff-portals-my-pages/values.staging.yaml b/charts/services/services-bff-portals-my-pages/values.staging.yaml
@@ -39,6 +39,7 @@ env:
   REDIS_URL_NODE_01: '["clustercfg.general-redis-cluster-group.ab9ckb.euw1.cache.amazonaws.com:6379"]'
   SERVERSIDE_FEATURES_ON: ''
 grantNamespaces:
+  - 'nginx-ingress-external'
   - 'identity-server'
 grantNamespacesEnabled: true
 healthCheck: