[PORTAL-NG] Ui is exposed on wrong port

- adjust port mapping in service to map to 8080

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

diff --git a/kubernetes/portal-ng/components/portal-ng-ui/templates/deployment.yaml b/kubernetes/portal-ng/components/portal-ng-ui/templates/deployment.yaml
index 96f21f8..6a16384 100644 (file)
--- a/kubernetes/portal-ng/components/portal-ng-ui/templates/deployment.yaml
+++ b/kubernetes/portal-ng/components/portal-ng-ui/templates/deployment.yaml
@@ -36,13 +36,13 @@ spec:
           livenessProbe:
             httpGet:
               path: /
-              port: http
+              port: {{ .Values.service.internalPort}}
             initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
             failureThreshold: {{ .Values.probes.liveness.failureThreshold }}
           readinessProbe:
             httpGet:
               path: /
-              port: http
+              port: {{ .Values.service.internalPort}}
             initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
             failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
           volumeMounts:

diff --git a/kubernetes/portal-ng/components/portal-ng-ui/values.yaml b/kubernetes/portal-ng/components/portal-ng-ui/values.yaml
index c213bcf..88e88f1 100644 (file)
--- a/kubernetes/portal-ng/components/portal-ng-ui/values.yaml
+++ b/kubernetes/portal-ng/components/portal-ng-ui/values.yaml
@@ -46,10 +46,11 @@ partOf: portal
 
 service:
   type: ClusterIP
-  port: 80
+  internalPort: 8080
   ports:
     - name: http
       port: 80
+      port_protocol: http
 
 ingress:
   enabled: true
@@ -84,12 +85,10 @@ affinity: {}
 
 env:
   BFF_URL: http://portal-ng-bff.onap.svc.cluster.local:9080
-  NGINX_PORT: 80
+  NGINX_PORT: 8080
   KEYCLOAK_REALM: ONAP
   KEYCLOAK_INTERNAL_URL: http://keycloak-http.keycloak.svc.cluster.local
-# CLUSTER_NAMESERVER_IP address is needed in the openresty lua part of the nginx, because Lua don't find the nameserver without this setting.
-# The IP will be used in the nginx / Lua setting for the resolver. You can get this value from /etc/resolver
-  CLUSTER_NAMESERVER_IP: 169.254.25.10
+  KEYCLOAK_HOSTNAME: https://keycloak-ui.simpledemo.onap.org
 
 #Pods Service Account
 serviceAccount: