Add separate ingressfor the APIM gateway

ob-pattern-1/confs/obkm/repository/conf/identity/identity.xml

@@ -161,11 +161,11 @@
         <OAuth1RequestTokenUrl>${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth/request-token</OAuth1RequestTokenUrl>
         <OAuth1AuthorizeUrl>${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth/authorize-url</OAuth1AuthorizeUrl>
         <OAuth1AccessTokenUrl>${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth/access-token</OAuth1AccessTokenUrl>
-        <OAuth2AuthzEPUrl>${carbon.protocol}://wso2-obam-service:8243/authorize</OAuth2AuthzEPUrl>
-        <OAuth2TokenEPUrl>${carbon.protocol}://wso2-obam-service:8243/token</OAuth2TokenEPUrl>
+        <OAuth2AuthzEPUrl>${carbon.protocol}://wso2-obam-gateway/authorize</OAuth2AuthzEPUrl>
+        <OAuth2TokenEPUrl>${carbon.protocol}://wso2-obam-gateway/token</OAuth2TokenEPUrl>
         <OAuth2RevokeEPUrl>${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth2/revoke</OAuth2RevokeEPUrl>
         <OAuth2IntrospectEPUrl>${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth2/introspect</OAuth2IntrospectEPUrl>
-        <OAuth2UserInfoEPUrl>${carbon.protocol}://wso2-obam-service:8243/userinfo</OAuth2UserInfoEPUrl>
+        <OAuth2UserInfoEPUrl>${carbon.protocol}://wso2-obam-gateway/userinfo</OAuth2UserInfoEPUrl>
         <OIDCCheckSessionEPUrl>${carbon.protocol}://${carbon.host}:${carbon.management.port}/oidc/checksession</OIDCCheckSessionEPUrl>
         <OIDCLogoutEPUrl>${carbon.protocol}://${carbon.host}:${carbon.management.port}/oidc/logout</OIDCLogoutEPUrl>
         <OAuth2ConsentPage>${carbon.protocol}://wso2-obkm-service:${carbon.management.port}/ob/authenticationendpoint/oauth2_authz.do</OAuth2ConsentPage>
@@ -176,7 +176,7 @@
         <OIDCWebFingerEPUrl>${carbon.protocol}://wso2-obkm-service:${carbon.management.port}/.well-known/webfinger</OIDCWebFingerEPUrl>
         <!-- For tenants below urls will be modified as https://<hostname>:<port>/t/<tenant domain>/<path>-->
         <!--OB DCR url-->
-        <OAuth2DCREPUrl>${carbon.protocol}://wso2-obam-service:8243/register</OAuth2DCREPUrl>
+        <OAuth2DCREPUrl>${carbon.protocol}://wso2-obam-gateway/register</OAuth2DCREPUrl>
         <OAuth2JWKSPage>${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth2/jwks</OAuth2JWKSPage>
         <OIDCDiscoveryEPUrl>${carbon.protocol}://wso2-obkm-service:${carbon.management.port}/oauth2/oidcdiscovery</OIDCDiscoveryEPUrl>
         <!-- Default validity period for Authorization Code in seconds -->
@@ -377,7 +377,7 @@
                 If that doesn't satisfy uncomment the following config and explicitly configure the value
             -->
             <!--openbanking_hostname Required in OB-->
-            <IDTokenIssuerID>https://wso2-obam-service:8243/token</IDTokenIssuerID>
+            <IDTokenIssuerID>https://wso2-obam-gateway/token</IDTokenIssuerID>
             <IDTokenCustomClaimsCallBackHandler>org.wso2.carbon.identity.openidconnect.SAMLAssertionClaimsCallback</IDTokenCustomClaimsCallBackHandler>
             <IDTokenExpiration>3600</IDTokenExpiration>
             <UserInfoJWTSignatureAlgorithm>SHA256withRSA</UserInfoJWTSignatureAlgorithm>

ob-pattern-1/templates/obam/wso2ob-pattern-1-obam-service.yaml

@@ -36,4 +36,4 @@ spec:
   - name: pass-through-https
     port: 8243
     targetPort: 8243
-    protocol: TCP
+    protocol: TCP

ob-pattern-1/templates/obkm/configMaps/wso2ob-pattern-1-obkm-bin.yaml

@@ -28,4 +28,3 @@ data:
       {{ . }}
     {{- end }}
   {{- end }}
-

ob-pattern-1/templates/obkm/wso2ob-pattern-1-obkm-service.yaml

@@ -29,4 +29,3 @@ spec:
     port: 9446
     targetPort: 9446
     protocol: TCP
-

ob-pattern-1/templates/wso2ob-pattern-1-obam-gateway-ingress.yaml

@@ -0,0 +1,35 @@
+# Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: wso2ob-pattern-1-obam-gateway-ingress
+  namespace: {{ .Release.namespace }}
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
+spec:
+  tls:
+  - hosts:
+    - {{ .Values.wso2.deployment.wso2obam.gateway.hostname  }}
+  rules:
+  - host: {{ .Values.wso2.deployment.wso2obam.gateway.hostname  }}
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: wso2ob-pattern-1-obam-service
+          servicePort: 8243

ob-pattern-1/templates/wso2ob-pattern-1-obam-ingress.yaml

@@ -28,7 +28,6 @@ spec:
   tls:
   - hosts:
     - {{ .Values.wso2.deployment.wso2obam.hostname  }}
-    - {{ .Values.wso2.deployment.wso2obam.gateway.hostname  }}
   rules:
   - host: {{ .Values.wso2.deployment.wso2obam.hostname  }}
     http:
@@ -37,10 +36,3 @@ spec:
         backend:
           serviceName: wso2ob-pattern-1-obam-service
           servicePort: 9443
-  - host: {{ .Values.wso2.deployment.wso2obam.gateway.hostname  }}
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: wso2ob-pattern-1-obam-service
-          servicePort: 8243