Changed main.ts

DevoteamNL · Feb 28, 2024 · 5507165 · 5507165
1 parent 7672aad
commit 5507165
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/BuildandPushImage.yml b/.github/workflows/BuildandPushImage.yml
@@ -6,7 +6,7 @@ on:
   push:
     branches:
       - main
-      #- feat/ci-cd
+      - feat/ci-cd
   workflow_dispatch:
 jobs:
   build-and-push:

diff --git a/.github/workflows/DeployToAKS.yml b/.github/workflows/DeployToAKS.yml
@@ -38,7 +38,7 @@ on:
   push:
     branches:
       - main
-      - feat/ci-cd
+      #- feat/ci-cd
   workflow_dispatch:
 
 env:

diff --git a/helm-charts/dev/values.yaml b/helm-charts/dev/values.yaml
@@ -75,12 +75,13 @@ ingress:
   className: "nginx"
   port: 80
   annotations: 
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/ssl-redirect: "false"
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
 
   hosts:
-    - host: "dev-api.infini-connect.devoteam.nl"
+    - host: "dev.infini-connect.devoteam.nl"
       paths:
-        - path: /api
+        - path: /api(/|$)(.*)
           pathType: Prefix
   tls: []
   #  - secretName: chart-example-tls

diff --git a/helm-charts/prod/values.yaml b/helm-charts/prod/values.yaml
@@ -76,10 +76,11 @@ ingress:
   port: 80
   annotations: 
     nginx.ingress.kubernetes.io/ssl-redirect: "false"
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
   hosts:
     - host: "https://infini-connect.devoteam.nl"
       paths:
-        - path: /api
+        - path: /api(/|$)(.*)
           pathType: Prefix
   tls: []
   #  - secretName: chart-example-tls

diff --git a/src/main.ts b/src/main.ts
@@ -17,7 +17,7 @@ async function bootstrap() {
     .addBearerAuth()
     .build();
   const document = SwaggerModule.createDocument(app, options);
-  SwaggerModule.setup('/docs', app, document);
+  SwaggerModule.setup('/api/docs', app, document);
 
   await app.listen(8080);
 }