Updated dns

equinor · Nov 5, 2024 · a4ec36d · a4ec36d
1 parent 1c7c7f9
commit a4ec36d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/src/Fusion.Summary.Api/Deployment/k8s/deployment-ingress-prod.yml b/src/Fusion.Summary.Api/Deployment/k8s/deployment-ingress-prod.yml
@@ -37,7 +37,6 @@ metadata:
   annotations:
     kubernetes.io/tls-acme: "true"
     kubernetes.io/ingress.class: nginx
-    cert-manager.io/cluster-issuer: letsencrypt-equinor-issuer
     nginx.ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/proxy-buffer-size: "32k"
     nginx.org/client-max-body-size: "50m"
@@ -47,10 +46,10 @@ spec:
   ingressClassName: nginx
   tls:
   - hosts:
-    - resources.api.equinor.com
+    - fra-summary.api.equinor.com
     secretName: wildcard-tls-cert
   rules:
-    - host: resources.api.equinor.com
+    - host: fra-summary.api.equinor.com
       http:
         paths:
         - path: /

diff --git a/src/Fusion.Summary.Api/Deployment/k8s/deployment-ingress-test.yml b/src/Fusion.Summary.Api/Deployment/k8s/deployment-ingress-test.yml
@@ -14,10 +14,10 @@ metadata:
 spec:
   tls:
   - hosts:
-    - summary.{{ENVNAME}}.api.fusion-dev.net
+    - fra-summary.{{ENVNAME}}.api.fusion-dev.net
     secretName: wildcard-tls-cert
   rules:
-    - host: summary.{{ENVNAME}}.api.fusion-dev.net
+    - host: fra-summary.{{ENVNAME}}.api.fusion-dev.net
       http:
         paths:
         - path: /

diff --git a/src/Fusion.Summary.Api/Deployment/k8s/pr-deployment-env.yml b/src/Fusion.Summary.Api/Deployment/k8s/pr-deployment-env.yml
@@ -113,7 +113,6 @@ metadata:
     environment: pr
     prNumber: '{{prNumber}}'
   annotations:
-    kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/proxy-buffer-size: "32k"
     nginx.org/client-max-body-size: "50m"
@@ -123,17 +122,18 @@ metadata:
     fusion-health/application: 'Fusion Summary'
     fusion-health/url: /_health/ready
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
-    - summary-api-{{prNumber}}.pr.api.fusion-dev.net
+    - fra-summary-api-{{prNumber}}.pr.api.fusion-dev.net
     secretName: wildcard-tld-secret
 
   rules:
-    - host: summary-api-{{prNumber}}.pr.fusion-dev.net
+    - host: fra-summary-api-{{prNumber}}.pr.fusion-dev.net
       http:
         paths:
         - path: /
-          pathType: Prefix        
+          pathType: Prefix
           backend:
             service:
               name: summary-api-pr-{{prNumber}}

diff --git a/src/backend/api/Fusion.Resources.Api/Deployment/k8s/deployment-ingress-prod.yml b/src/backend/api/Fusion.Resources.Api/Deployment/k8s/deployment-ingress-prod.yml
@@ -37,7 +37,6 @@ metadata:
   annotations:
     kubernetes.io/tls-acme: "true"
     kubernetes.io/ingress.class: nginx
-    cert-manager.io/cluster-issuer: letsencrypt-equinor-issuer
     nginx.ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/proxy-buffer-size: "32k"
     nginx.org/client-max-body-size: "50m"

diff --git a/src/backend/api/Fusion.Resources.Api/Deployment/k8s/pr-deployment-env.yml b/src/backend/api/Fusion.Resources.Api/Deployment/k8s/pr-deployment-env.yml
@@ -112,7 +112,6 @@ metadata:
     environment: pr
     prNumber: '{{prNumber}}'
   annotations:
-    kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/proxy-buffer-size: "32k"
     nginx.org/client-max-body-size: "50m"
@@ -122,13 +121,14 @@ metadata:
     fusion-health/application: 'Fusion Resources'
     fusion-health/url: /_health/ready
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
-    - resources-{{prNumber}}.pr.api.fusion-dev.net
+    - fra-resources-{{prNumber}}.pr.api.fusion-dev.net
     secretName: wildcard-tls-secret
 
   rules:
-    - host: resources-{{prNumber}}.pr.api.fusion-dev.net
+    - host: fra-resources-{{prNumber}}.pr.api.fusion-dev.net
       http:
         paths:
         - path: /