Merge branch 'master' into feat/summary/allow-for-disabling-task-owne…

…r-report-sender
equinor · Dec 5, 2024 · 3eea8d0 · 3eea8d0
2 parents 8bcdd53 + c651574
commit 3eea8d0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Fusion.Summary.Api/Deployment/k8s/deployment-ingress-test.yml b/src/Fusion.Summary.Api/Deployment/k8s/deployment-ingress-test.yml
@@ -4,14 +4,14 @@ metadata:
   name: summary-api-fusiondev-ingress
   annotations:
     kubernetes.io/tls-acme: "true"
-    kubernetes.io/ingress.class: nginx
+    kubernetes.io/ingress.class: ingress-nginx-fusiondev
     nginx.ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/proxy-buffer-size: "32k"
     nginx.org/client-max-body-size: "50m"
     nginx.ingress.kubernetes.io/client-max-body-size: "50m"
     nginx.ingress.kubernetes.io/proxy-body-size: "50m"
 spec:
-  ingressClassName: nginx
+  ingressClassName: ingress-nginx-fusiondev
   tls:
     - hosts:
         - fra-summary.{{ENVNAME}}.api.fusion-dev.net

diff --git a/src/Fusion.Summary.Api/Deployment/k8s/pr-deployment-env.yml b/src/Fusion.Summary.Api/Deployment/k8s/pr-deployment-env.yml
@@ -127,7 +127,7 @@ metadata:
     fusion-health/application: 'Fusion Summary'
     fusion-health/url: /_health/ready
 spec:
-  ingressClassName: nginx
+  ingressClassName: ingress-nginx-fusiondev
   tls:
   - hosts:
     - fra-summary-{{prNumber}}.pr.api.fusion-dev.net

diff --git a/src/backend/api/Fusion.Resources.Api/Deployment/k8s/deployment-ingress-test.yml b/src/backend/api/Fusion.Resources.Api/Deployment/k8s/deployment-ingress-test.yml
@@ -4,14 +4,14 @@ metadata:
   name: resources-api-fusion-ingress
   annotations:
     kubernetes.io/tls-acme: "true"
-    kubernetes.io/ingress.class: nginx
+    kubernetes.io/ingress.class: ingress-nginx-fusiondev
     nginx.ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/proxy-buffer-size: "32k"
     nginx.org/client-max-body-size: "50m"
     nginx.ingress.kubernetes.io/client-max-body-size: "50m"
     nginx.ingress.kubernetes.io/proxy-body-size: "50m"
 spec:
-  ingressClassName: nginx
+  ingressClassName: ingress-nginx-fusiondev
   tls:
     - hosts:
         - fra-resources.{{ENVNAME}}.api.fusion-dev.net

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
@@ -126,7 +126,7 @@ metadata:
     fusion-health/application: 'Fusion Resources'
     fusion-health/url: /_health/ready
 spec:
-  ingressClassName: nginx
+  ingressClassName: ingress-nginx-fusiondev
   tls:
   - hosts:
     - fra-resources-{{prNumber}}.pr.api.fusion-dev.net