[PORTALNG] Remove hardcoded /auth from the keycloak urls in bff

- add /auth to bff KEYCLOAK_URL [1]
- adjust KEYCLOAK_URL's to use keycloakx-http.keycloak

[1] since it was removed from the application.yml

Issue-ID: PORTALNG-85
Change-Id: I919cfc29494e30e891e732f63f56edd9f6579864
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/kubernetes/portal-ng/components/portal-ng-bff/values.yaml b/kubernetes/portal-ng/components/portal-ng-bff/values.yaml
index b02bdb9..b8b7c3d 100644 (file)
--- a/kubernetes/portal-ng/components/portal-ng-bff/values.yaml
+++ b/kubernetes/portal-ng/components/portal-ng-bff/values.yaml
@@ -39,7 +39,7 @@ probes:
     failureThreshold: 4
 
 env:
-  KEYCLOAK_URL: http://keycloak-http.keycloak
+  KEYCLOAK_URL: http://keycloakx-http.keycloak/auth
   KEYCLOAK_REALM: ONAP
   HISTORY_URL: http://portal-ng-history:9002
   PREFERENCES_URL: http://portal-ng-preferences:9001

diff --git a/kubernetes/portal-ng/components/portal-ng-history/values.yaml b/kubernetes/portal-ng/components/portal-ng-history/values.yaml
index 1b7bd57..dc99984 100644 (file)
--- a/kubernetes/portal-ng/components/portal-ng-history/values.yaml
+++ b/kubernetes/portal-ng/components/portal-ng-history/values.yaml
@@ -46,7 +46,7 @@ secretEnv:
   MONGO_DATABASE: history
 
 env:
-  KEYCLOAK_URL: http://keycloak-http.keycloak
+  KEYCLOAK_URL: http://keycloakx-http.keycloak
   KEYCLOAK_REALM: ONAP
   MONGO_HOST: history-mongodb
   MONGO_PORT: 27017

diff --git a/kubernetes/portal-ng/components/portal-ng-preferences/values.yaml b/kubernetes/portal-ng/components/portal-ng-preferences/values.yaml
index 87dc337..2f6d1ba 100644 (file)
--- a/kubernetes/portal-ng/components/portal-ng-preferences/values.yaml
+++ b/kubernetes/portal-ng/components/portal-ng-preferences/values.yaml
@@ -47,7 +47,7 @@ secretEnv:
   MONGO_DATABASE: Preferences
 
 env:
-  KEYCLOAK_URL: http://keycloak-http.keycloak
+  KEYCLOAK_URL: http://keycloakx-http.keycloak
   KEYCLOAK_REALM: ONAP
   MONGO_HOST: preferences-mongodb
   MONGO_PORT: 27017

diff --git a/kubernetes/portal-ng/components/portal-ng-ui/values.yaml b/kubernetes/portal-ng/components/portal-ng-ui/values.yaml
index 88e88f1..bf28766 100644 (file)
--- a/kubernetes/portal-ng/components/portal-ng-ui/values.yaml
+++ b/kubernetes/portal-ng/components/portal-ng-ui/values.yaml
@@ -87,7 +87,7 @@ env:
   BFF_URL: http://portal-ng-bff.onap.svc.cluster.local:9080
   NGINX_PORT: 8080
   KEYCLOAK_REALM: ONAP
-  KEYCLOAK_INTERNAL_URL: http://keycloak-http.keycloak.svc.cluster.local
+  KEYCLOAK_INTERNAL_URL: http://keycloakx-http.keycloak.svc.cluster.local
   KEYCLOAK_HOSTNAME: https://keycloak-ui.simpledemo.onap.org
 
 #Pods Service Account