From 4a91b9019729c1b812184b49e22921429e5b1d3a Mon Sep 17 00:00:00 2001
From: "lin.huang" <lin.huang@apulis.com>
Date: Sun, 1 Oct 2023 10:49:29 +0800
Subject: [PATCH] change chart script:change Ingress rule with a rewrite
 annotation

---
 .../services/charts/openim-msggateway/values.yaml         | 8 +++++---
 manifest/helm-charts/services/values.yaml                 | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/manifest/helm-charts/services/charts/openim-msggateway/values.yaml b/manifest/helm-charts/services/charts/openim-msggateway/values.yaml
index 10f586a94..bec5d4f46 100644
--- a/manifest/helm-charts/services/charts/openim-msggateway/values.yaml
+++ b/manifest/helm-charts/services/charts/openim-msggateway/values.yaml
@@ -42,14 +42,16 @@ service:
 
 ingress:
   enabled: true
-  className: ""
-  annotations: {}
+  className: "nginx"
+  annotations:
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
+    nginx.ingress.kubernetes.io/use-regex: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
   hosts:
     - host:
       paths:
-        - path: /msg_gateway
+        - path: /msg_gateway(/|$)(.*)
           pathType: Prefix
   tls: []
   #  - secretName: chart-example-tls
diff --git a/manifest/helm-charts/services/values.yaml b/manifest/helm-charts/services/values.yaml
index 6babd5ce0..8f9e5b494 100644
--- a/manifest/helm-charts/services/values.yaml
+++ b/manifest/helm-charts/services/values.yaml
@@ -43,13 +43,15 @@ service:
 ingress:
   enabled: true
   className: "nginx"
-  annotations: {}
+  annotations:
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
+    nginx.ingress.kubernetes.io/use-regex: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
   hosts:
     - host: 
       paths:
-        - path: /openim-api
+        - path: /api(/|$)(.*)
           pathType: Prefix
   tls: []
   #  - secretName: chart-example-tls