fix: ingress yaml not to use snippet

SE-Row-1 · Oct 27, 2024 · 6958d54 · 6958d54
1 parent 865355f
commit 6958d54
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/helm/nshm/templates/argocd-ingress.yaml b/helm/nshm/templates/argocd-ingress.yaml
@@ -3,9 +3,6 @@ kind: Ingress
 metadata:
   name: argocd-ingress
   namespace: argocd
-  annotations:
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-    nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
 spec:
   ingressClassName: nginx
   rules:
@@ -18,4 +15,4 @@ spec:
               service:
                 name: argocd-server
                 port:
-                  number: 443
+                  number: 80
diff --git a/helm/nshm/templates/nshm-ingress.yaml b/helm/nshm/templates/nshm-ingress.yaml
@@ -4,43 +4,42 @@ metadata:
   name: nshm-ingress
   namespace: nshm
   annotations:
-    nginx.ingress.kubernetes.io/configuration-snippet: |-
-      rewrite ^(/api)(.*) /$2 last;
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
 spec:
   ingressClassName: nginx
   rules:
     - host: www.nshm.store
       http:
         paths:
-          - path: /auth
+          - path: /api/auth(/|$)(.*)
             pathType: Prefix
             backend:
               service:
                 name: account
                 port:
                   number: 8081
-          - path: /accounts
+          - path: /api/accounts(/|$)(.*)
             pathType: Prefix
             backend:
               service:
                 name: account
                 port:
                   number: 8081
-          - path: /items
+          - path: /api/items(/|$)(.*)
             pathType: Prefix
             backend:
               service:
                 name: item
                 port:
                   number: 8082
-          - path: /wishlists
+          - path: /api/wishlists(/|$)(.*)
             pathType: Prefix
             backend:
               service:
                 name: wishlist
                 port:
                   number: 8083
-          - path: /notification
+          - path: /api/notification(/|$)(.*)
             pathType: Prefix
             backend:
               service:
@@ -61,3 +60,4 @@ spec:
                 name: web
                 port:
                   number: 3000
+