Merge pull request #20927 from abpframework/auto-merge/rel-8-2/3033

Merge branch rel-8.3 with rel-8.2

docs/en/guides/ms-multi-tenant-domain-resolving.md

@@ -270,6 +270,7 @@ Your request from the browser to the subdomain will be accepted by the ingress-c
 
 Update your charts ingress.yaml files. Ex for **administration-ingress.yaml**:
 
+{%{
 ```yaml
 spec:
   tls:
@@ -303,6 +304,7 @@ spec:
             port:
               number: 80
 ```
+}%}
 
 **Update all the application, gateway and microservice ingress.yaml files.** Eventually, when deploy the application, you will be seeing:
 ![updated-ingress](../images/updated-ingress.png)
@@ -311,6 +313,7 @@ spec:
 
 Navigate to applications, gateways and microservices' **x-deployment.yaml** file and override the newly introduced `TenantDomain` key:
 
+{%{
 ```yaml
 ... Removed for brevity
 - name: "TenantDomain" # Add this key
@@ -319,11 +322,13 @@ Navigate to applications, gateways and microservices' **x-deployment.yaml** file
   value: "{{ .Values.config.authServer.authority }}"
 ...
 ```
+}%}
 
 > **Update all the application, gateway and microservice deployment.yaml files.** 
 
 **For AuthServer, also add the WildCardDomains that is used to handle subdomain *redirect* and *post_logout redirect* URIs to the authserver-deployment.yaml file:**
 
+{%{
 ```yaml
 ... Removed for brevity
 - name: "TenantDomain"
@@ -348,6 +353,7 @@ Navigate to applications, gateways and microservices' **x-deployment.yaml** file
   value: "{{ .Values.wildCardDomains.productService }}"
 ...
 ```
+}%}
 
 Afterwards, update the **values.yaml** file for all the sub-charts (administration, authserver etc):
 
@@ -383,7 +389,7 @@ wildCardDomains:
 After updating the **deployment.yaml** and **values.yaml** files of all the application, gateway and microservices' navigate to the **mystore chart values.yaml** file located under the k8s/Mystore/values.yaml that overrides all the sub-charts:
 
 **AuthServer:**
-
+{%{
 ```yaml
 # auth-server sub-chart override
 authserver:
@@ -402,11 +408,13 @@ authserver:
     saasService: "https://{0}.saas.mystore.dev"
     productService: "https://{0}.product.mystore.dev"  
 ```
+}%}
 
 You may also get CORS error when authenticating SwaggerUI of your gateways or microservices. Add Override the AuthServer CORS values with the subdomain to solve this problem:
 
 **identityService:**
 
+{%{
 ```yaml
 # identity-service sub-chart override
 identity:
@@ -416,9 +424,10 @@ identity:
     ... Removed for brevity
     tenantDomain: "https://{0}.identity.mystore.dev"
 ```
+}%}
 
 **administrationService:**
-
+{%{
 ```yaml
 # administration-service sub-chart override
 administration:
@@ -428,9 +437,11 @@ administration:
     ... Removed for brevity
     tenantDomain: "https://{0}.administration.mystore.dev" 
 ```
+}%}
 
 **saasService:**
 
+{%{
 ```yaml
 # saas-service sub-chart override
 saas:
@@ -440,9 +451,9 @@ saas:
     ... Removed for brevity
     tenantDomain: "https://{0}.saas.mystore.dev"
 ```
-
+}%}
 **productService:**
-
+{%{
 ```yaml
 # product-service sub-chart override
 product:
@@ -452,9 +463,10 @@ product:
     ... Removed for brevity
     tenantDomain: "https://{0}.product.mystore.dev"
 ```
+}%}
 
 **gateway-web:**
-
+{%{
 ```yaml
 # saas-service sub-chart override
 gateway-web:
@@ -464,9 +476,10 @@ gateway-web:
     ... Removed for brevity
     tenantDomain: "https://{0}.gateway-web.mystore.dev"
 ```
+}%}
 
 **gateway-web-public:**
-
+{%{
 ```yaml
 # gateway-web-public sub-chart override
 gateway-web-public:
@@ -476,9 +489,10 @@ gateway-web-public:
     ... Removed for brevity
     tenantDomain: "https://{0}.gateway-public.mystore.dev"
 ```
+}%}
 
 **publicweb:**
-
+{%{
 ```yaml
 # Public Web application sub-chart override
 publicweb:
@@ -489,9 +503,10 @@ publicweb:
       ... Removed for brevity
     tenantDomain: "https://{0}.mystore.dev"
 ```
+}%}
 
 **angular:**
-
+{%{
 ```yaml
 # Angular back-office application sub-chart override
 angular:
@@ -505,6 +520,7 @@ angular:
       strictDiscoveryDocumentValidation: false
       skipIssuerCheck: true
 ```
+}%}
 
 > If you are using Web or BlazorServer application for back-office, it is similar configuration with the public-web application