From 6c94351d914b4dd0073a6e915ea3b50433be9741 Mon Sep 17 00:00:00 2001 From: pubudu538 Date: Fri, 25 Mar 2022 22:41:35 +0530 Subject: [PATCH] Updating APIM hostname --- resources/k8s-artifacts/apim/apim-config.yaml | 4 ++-- resources/k8s-artifacts/apim/apim-service.yaml | 3 +++ .../choreo-connect/choreo-connect-with-apim-ingress.yaml | 4 ++-- .../choreo-connect/config-toml-configmap-for-eventhub.yaml | 4 ++-- .../k8s-artifacts/choreo-connect/config-toml-configmap.yaml | 4 ++-- samples/istio/mtls-mode/README.md | 4 ++-- samples/istio/mtls-mode/gw_vs.yaml | 6 +++--- samples/istio/sidecar-mode/README.md | 4 ++-- samples/istio/sidecar-mode/gw_vs.yaml | 6 +++--- 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/resources/k8s-artifacts/apim/apim-config.yaml b/resources/k8s-artifacts/apim/apim-config.yaml index 3855dab019..11696330ff 100644 --- a/resources/k8s-artifacts/apim/apim-config.yaml +++ b/resources/k8s-artifacts/apim/apim-config.yaml @@ -19,7 +19,7 @@ metadata: data: deployment.toml: |- [server] - hostname = "apim.wso2.com" + hostname = "wso2apim" #offset=0 base_path = "${carbon.protocol}://${carbon.host}:${carbon.management.port}" #discard_empty_caches = false @@ -156,7 +156,7 @@ data: #enable_token_hashing = false [apim.devportal] - url = "https://apim.wso2.com/devportal" + url = "https://wso2apim/devportal" #enable_application_sharing = false #if application_sharing_type, application_sharing_impl both defined priority goes to application_sharing_impl #application_sharing_type = "default" #changed type, saml, default #todo: check the new config for rest api diff --git a/resources/k8s-artifacts/apim/apim-service.yaml b/resources/k8s-artifacts/apim/apim-service.yaml index 2096a72e09..62c7be3bfd 100644 --- a/resources/k8s-artifacts/apim/apim-service.yaml +++ b/resources/k8s-artifacts/apim/apim-service.yaml @@ -44,3 +44,6 @@ spec: - name: binary-auth port: 9711 targetPort: 9711 + - name: servlet-proxy-https + port: 443 + targetPort: 9443 diff --git a/resources/k8s-artifacts/choreo-connect/choreo-connect-with-apim-ingress.yaml b/resources/k8s-artifacts/choreo-connect/choreo-connect-with-apim-ingress.yaml index 2e135d3d0d..bd669d94b3 100644 --- a/resources/k8s-artifacts/choreo-connect/choreo-connect-with-apim-ingress.yaml +++ b/resources/k8s-artifacts/choreo-connect/choreo-connect-with-apim-ingress.yaml @@ -24,10 +24,10 @@ spec: tls: - hosts: - gw.wso2.com - - apim.wso2.com + - wso2apim secretName: tls-secret rules: - - host: apim.wso2.com + - host: wso2apim http: paths: - path: / diff --git a/resources/k8s-artifacts/choreo-connect/config-toml-configmap-for-eventhub.yaml b/resources/k8s-artifacts/choreo-connect/config-toml-configmap-for-eventhub.yaml index b2c22ed0fc..03f2dae5e3 100644 --- a/resources/k8s-artifacts/choreo-connect/config-toml-configmap-for-eventhub.yaml +++ b/resources/k8s-artifacts/choreo-connect/config-toml-configmap-for-eventhub.yaml @@ -67,7 +67,7 @@ data: [enforcer.security] [[enforcer.security.tokenService]] name = "Resident Key Manager" - issuer = "https://apim.wso2.com/oauth2/token" + issuer = "https://wso2apim/oauth2/token" certificateAlias = "wso2carbon" jwksURL = "" validateSubscription = false @@ -85,7 +85,7 @@ data: [[enforcer.security.tokenService]] name = "APIM Publisher" - issuer = "https://apim.wso2.com/publisher" + issuer = "https://wso2apim/publisher" validateSubscription = true certificateFilePath = "/home/wso2/security/truststore/wso2carbon.pem" diff --git a/resources/k8s-artifacts/choreo-connect/config-toml-configmap.yaml b/resources/k8s-artifacts/choreo-connect/config-toml-configmap.yaml index a73c484550..d19ae13ec7 100644 --- a/resources/k8s-artifacts/choreo-connect/config-toml-configmap.yaml +++ b/resources/k8s-artifacts/choreo-connect/config-toml-configmap.yaml @@ -66,7 +66,7 @@ data: [enforcer.security] [[enforcer.security.tokenService]] name = "Resident Key Manager" - issuer = "https://apim.wso2.com/oauth2/token" + issuer = "https://wso2apim/oauth2/token" certificateAlias = "wso2carbon" jwksURL = "" validateSubscription = false @@ -84,7 +84,7 @@ data: [[enforcer.security.tokenService]] name = "APIM Publisher" - issuer = "https://apim.wso2.com/publisher" + issuer = "https://wso2apim/publisher" validateSubscription = true certificateFilePath = "/home/wso2/security/truststore/wso2carbon.pem" diff --git a/samples/istio/mtls-mode/README.md b/samples/istio/mtls-mode/README.md index d66ec9747e..79cc78c54d 100644 --- a/samples/istio/mtls-mode/README.md +++ b/samples/istio/mtls-mode/README.md @@ -126,12 +126,12 @@ kubectl label namespace default istio-injection=enabled - Add an `/etc/host` entry for Choreo Connect and WSO2 API Manager ``` - 127.0.0.1 apim.wso2.com gw.wso2.com + 127.0.0.1 wso2apim gw.wso2.com ``` ### 5. Apply API Management for the microservice -- Access the Publisher portal - https://apim.wso2.com/publisher/ +- Access the Publisher portal - https://wso2apim/publisher/ Use admin:admin as the credentials. diff --git a/samples/istio/mtls-mode/gw_vs.yaml b/samples/istio/mtls-mode/gw_vs.yaml index ed62c97151..4d2945161b 100644 --- a/samples/istio/mtls-mode/gw_vs.yaml +++ b/samples/istio/mtls-mode/gw_vs.yaml @@ -29,7 +29,7 @@ spec: tls: mode: PASSTHROUGH hosts: - - "apim.wso2.com" + - "wso2apim" - "gw.wso2.com" --- apiVersion: networking.istio.io/v1alpha3 @@ -38,7 +38,7 @@ metadata: name: apim-virtualservice spec: hosts: - - "apim.wso2.com" + - "wso2apim" - "gw.wso2.com" gateways: - apim-gateway @@ -46,7 +46,7 @@ spec: - match: - port: 443 sniHosts: - - apim.wso2.com + - wso2apim route: - destination: host: wso2apim diff --git a/samples/istio/sidecar-mode/README.md b/samples/istio/sidecar-mode/README.md index adc740b935..5053e858fc 100644 --- a/samples/istio/sidecar-mode/README.md +++ b/samples/istio/sidecar-mode/README.md @@ -81,12 +81,12 @@ kubectl label namespace default istio-injection=enabled - Add an `/etc/host` entry for Choreo Connect and WSO2 API Manager ``` - 127.0.0.1 apim.wso2.com gw.wso2.com + 127.0.0.1 wso2apim gw.wso2.com ``` ### 4. Apply API Management for the microservice -- Access the Publisher portal - https://apim.wso2.com/publisher/ +- Access the Publisher portal - https://wso2apim/publisher/ Use admin:admin as the credentials. diff --git a/samples/istio/sidecar-mode/gw_vs.yaml b/samples/istio/sidecar-mode/gw_vs.yaml index ed62c97151..4d2945161b 100644 --- a/samples/istio/sidecar-mode/gw_vs.yaml +++ b/samples/istio/sidecar-mode/gw_vs.yaml @@ -29,7 +29,7 @@ spec: tls: mode: PASSTHROUGH hosts: - - "apim.wso2.com" + - "wso2apim" - "gw.wso2.com" --- apiVersion: networking.istio.io/v1alpha3 @@ -38,7 +38,7 @@ metadata: name: apim-virtualservice spec: hosts: - - "apim.wso2.com" + - "wso2apim" - "gw.wso2.com" gateways: - apim-gateway @@ -46,7 +46,7 @@ spec: - match: - port: 443 sniHosts: - - apim.wso2.com + - wso2apim route: - destination: host: wso2apim