From b8cb3a7b5712f6e1c43e691d946792d214a8e5c6 Mon Sep 17 00:00:00 2001
From: "Kwiatosz, Krzysztof" <kwiatekus@users.noreply.github.com>
Date: Thu, 8 Aug 2019 14:37:08 +0200
Subject: [PATCH 1/9] Merge catalog-ui, instances-ui, brokers-ui deployments

---
 .../charts/brokers-ui/Chart.yaml              |  5 ---
 .../brokers-ui/templates/configmap.yaml       | 13 -------
 .../brokers-ui/templates/deployment.yaml      | 35 -------------------
 .../charts/brokers-ui/templates/service.yaml  | 19 ----------
 .../charts/brokers-ui/values.yaml             | 12 -------
 .../charts/catalog-ui/.helmignore             | 21 -----------
 .../charts/catalog-ui/Chart.yaml              |  5 ---
 .../charts/catalog-ui/templates/_helpers.tpl  | 16 ---------
 .../catalog-ui/templates/configmap.yaml       | 13 -------
 .../templates/destination-rule.yaml           |  9 -----
 .../charts/catalog-ui/templates/service.yaml  | 19 ----------
 .../charts/catalog-ui/values.yaml             | 13 -------
 .../charts/instances-ui/.helmignore           | 21 -----------
 .../charts/instances-ui/Chart.yaml            |  5 ---
 .../instances-ui/templates/_helpers.tpl       | 16 ---------
 .../instances-ui/templates/deployment.yaml    | 35 -------------------
 .../templates/destination-rule.yaml           |  9 -----
 .../instances-ui/templates/service.yaml       | 19 ----------
 .../charts/instances-ui/values.yaml           | 13 -------
 .../.helmignore                               |  0
 .../charts/service-catalog-ui/Chart.yaml      |  5 +++
 .../templates/_helpers.tpl                    |  0
 .../templates/brokers-microfrontend.yaml      |  0
 .../templates/brokers-virtualservice.yaml}    |  4 +--
 .../templates/catalog-microfrontend.yaml}     |  0
 .../templates/catalog-virtualservice.yaml}    |  4 +--
 .../templates/configmap.yaml                  |  1 -
 .../templates/deployment.yaml                 | 12 +++++--
 .../templates/destination-rule.yaml           |  0
 .../templates/instances-microfrontend.yaml    |  0
 .../templates/instances-virtualservice.yaml}  |  4 +--
 .../service-catalog-ui/templates/service.yaml | 29 +++++++++++++++
 .../charts/service-catalog-ui/values.yaml     | 23 ++++++++++++
 33 files changed, 72 insertions(+), 308 deletions(-)
 delete mode 100644 resources/service-catalog-addons/charts/brokers-ui/Chart.yaml
 delete mode 100644 resources/service-catalog-addons/charts/brokers-ui/templates/configmap.yaml
 delete mode 100644 resources/service-catalog-addons/charts/brokers-ui/templates/deployment.yaml
 delete mode 100644 resources/service-catalog-addons/charts/brokers-ui/templates/service.yaml
 delete mode 100644 resources/service-catalog-addons/charts/brokers-ui/values.yaml
 delete mode 100644 resources/service-catalog-addons/charts/catalog-ui/.helmignore
 delete mode 100644 resources/service-catalog-addons/charts/catalog-ui/Chart.yaml
 delete mode 100644 resources/service-catalog-addons/charts/catalog-ui/templates/_helpers.tpl
 delete mode 100644 resources/service-catalog-addons/charts/catalog-ui/templates/configmap.yaml
 delete mode 100644 resources/service-catalog-addons/charts/catalog-ui/templates/destination-rule.yaml
 delete mode 100644 resources/service-catalog-addons/charts/catalog-ui/templates/service.yaml
 delete mode 100644 resources/service-catalog-addons/charts/catalog-ui/values.yaml
 delete mode 100644 resources/service-catalog-addons/charts/instances-ui/.helmignore
 delete mode 100644 resources/service-catalog-addons/charts/instances-ui/Chart.yaml
 delete mode 100644 resources/service-catalog-addons/charts/instances-ui/templates/_helpers.tpl
 delete mode 100644 resources/service-catalog-addons/charts/instances-ui/templates/deployment.yaml
 delete mode 100644 resources/service-catalog-addons/charts/instances-ui/templates/destination-rule.yaml
 delete mode 100644 resources/service-catalog-addons/charts/instances-ui/templates/service.yaml
 delete mode 100644 resources/service-catalog-addons/charts/instances-ui/values.yaml
 rename resources/service-catalog-addons/charts/{brokers-ui => service-catalog-ui}/.helmignore (100%)
 create mode 100644 resources/service-catalog-addons/charts/service-catalog-ui/Chart.yaml
 rename resources/service-catalog-addons/charts/{brokers-ui => service-catalog-ui}/templates/_helpers.tpl (100%)
 rename resources/service-catalog-addons/charts/{brokers-ui => service-catalog-ui}/templates/brokers-microfrontend.yaml (100%)
 rename resources/service-catalog-addons/charts/{brokers-ui/templates/virtualservice.yaml => service-catalog-ui/templates/brokers-virtualservice.yaml} (85%)
 rename resources/service-catalog-addons/charts/{catalog-ui/templates/service-catalog-microfrontend.yaml => service-catalog-ui/templates/catalog-microfrontend.yaml} (100%)
 rename resources/service-catalog-addons/charts/{instances-ui/templates/virtualservice.yaml => service-catalog-ui/templates/catalog-virtualservice.yaml} (85%)
 rename resources/service-catalog-addons/charts/{instances-ui => service-catalog-ui}/templates/configmap.yaml (91%)
 rename resources/service-catalog-addons/charts/{catalog-ui => service-catalog-ui}/templates/deployment.yaml (65%)
 rename resources/service-catalog-addons/charts/{brokers-ui => service-catalog-ui}/templates/destination-rule.yaml (100%)
 rename resources/service-catalog-addons/charts/{instances-ui => service-catalog-ui}/templates/instances-microfrontend.yaml (100%)
 rename resources/service-catalog-addons/charts/{catalog-ui/templates/virtualservice.yaml => service-catalog-ui/templates/instances-virtualservice.yaml} (84%)
 create mode 100644 resources/service-catalog-addons/charts/service-catalog-ui/templates/service.yaml
 create mode 100644 resources/service-catalog-addons/charts/service-catalog-ui/values.yaml

diff --git a/resources/service-catalog-addons/charts/brokers-ui/Chart.yaml b/resources/service-catalog-addons/charts/brokers-ui/Chart.yaml
deleted file mode 100644
index 02c0792b82a7..000000000000
--- a/resources/service-catalog-addons/charts/brokers-ui/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-name: brokers-ui
-description: Service Broker UI for Kyma Console
-version: 0.1.0
-appVersion: a9d158d5
diff --git a/resources/service-catalog-addons/charts/brokers-ui/templates/configmap.yaml b/resources/service-catalog-addons/charts/brokers-ui/templates/configmap.yaml
deleted file mode 100644
index 6071c89d5412..000000000000
--- a/resources/service-catalog-addons/charts/brokers-ui/templates/configmap.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Chart.Name }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: brokers-ui
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-data:
-  config.js: |
-    window.clusterConfig = {
-      graphqlApiUrl: 'https://console-backend.{{ .Values.global.ingress.domainName }}/graphql'
-    };
\ No newline at end of file
diff --git a/resources/service-catalog-addons/charts/brokers-ui/templates/deployment.yaml b/resources/service-catalog-addons/charts/brokers-ui/templates/deployment.yaml
deleted file mode 100644
index c79c51e4550a..000000000000
--- a/resources/service-catalog-addons/charts/brokers-ui/templates/deployment.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: {{ template "fullname" . }}
-  labels:
-    app: {{ template "name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  template:
-    metadata:
-      annotations:
-        sidecar.istio.io/inject: "false"
-      labels:
-        app: {{ template "name" . }}
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.global.containerRegistry.path }}{{ .Values.image.dir }}/brokers-ui:{{ .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - containerPort: {{ .Values.service.internalPort }}
-          volumeMounts:
-          - name: config
-            mountPath: /var/public/config
-      volumes:
-      - name: config
-        configMap:
-          name: {{ .Chart.Name }}
-          items:
-          - key: config.js
-            path: config.js
diff --git a/resources/service-catalog-addons/charts/brokers-ui/templates/service.yaml b/resources/service-catalog-addons/charts/brokers-ui/templates/service.yaml
deleted file mode 100644
index 7724fbf80cdb..000000000000
--- a/resources/service-catalog-addons/charts/brokers-ui/templates/service.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "fullname" . }}
-  annotations:
-    "auth.istio.io/{{ .Values.service.externalPort }}": NONE
-  labels:
-    app: {{ template "name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  ports:
-  - port: {{ .Values.service.externalPort }}
-    targetPort: {{ .Values.service.internalPort }}
-    protocol: TCP
-    name: http2
-  selector:
-    app: {{ template "name" . }}
diff --git a/resources/service-catalog-addons/charts/brokers-ui/values.yaml b/resources/service-catalog-addons/charts/brokers-ui/values.yaml
deleted file mode 100644
index 27a7fa08478f..000000000000
--- a/resources/service-catalog-addons/charts/brokers-ui/values.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: brokers
-replicaCount: 1
-image:
-  dir: ""
-  pullPolicy: IfNotPresent
-service:
-  internalPort: 80
-  externalPort: 80
-  protocol: TCP
-virtualservice:
-  enabled: true
-  annotations: {}
diff --git a/resources/service-catalog-addons/charts/catalog-ui/.helmignore b/resources/service-catalog-addons/charts/catalog-ui/.helmignore
deleted file mode 100644
index f0c131944441..000000000000
--- a/resources/service-catalog-addons/charts/catalog-ui/.helmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
diff --git a/resources/service-catalog-addons/charts/catalog-ui/Chart.yaml b/resources/service-catalog-addons/charts/catalog-ui/Chart.yaml
deleted file mode 100644
index 1bdadc375d00..000000000000
--- a/resources/service-catalog-addons/charts/catalog-ui/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-name: catalog-ui
-description: Catalog Service UI for Kyma Console
-version: 0.1.0
-appVersion: a9d158d5
diff --git a/resources/service-catalog-addons/charts/catalog-ui/templates/_helpers.tpl b/resources/service-catalog-addons/charts/catalog-ui/templates/_helpers.tpl
deleted file mode 100644
index f0d83d2edba6..000000000000
--- a/resources/service-catalog-addons/charts/catalog-ui/templates/_helpers.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/resources/service-catalog-addons/charts/catalog-ui/templates/configmap.yaml b/resources/service-catalog-addons/charts/catalog-ui/templates/configmap.yaml
deleted file mode 100644
index 8ac869ddfbd8..000000000000
--- a/resources/service-catalog-addons/charts/catalog-ui/templates/configmap.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Chart.Name }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: catalog-service-ui
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-data:
-  config.js: |
-    window.clusterConfig = {
-      graphqlApiUrl: 'https://console-backend.{{ .Values.global.ingress.domainName }}/graphql'
-    };
\ No newline at end of file
diff --git a/resources/service-catalog-addons/charts/catalog-ui/templates/destination-rule.yaml b/resources/service-catalog-addons/charts/catalog-ui/templates/destination-rule.yaml
deleted file mode 100644
index 26b48a289481..000000000000
--- a/resources/service-catalog-addons/charts/catalog-ui/templates/destination-rule.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: "networking.istio.io/v1alpha3"
-kind: "DestinationRule"
-metadata:
-  name: {{ template "fullname" . }}
-spec:
-  host: {{ template "fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
-  trafficPolicy:
-    tls:
-      mode: DISABLE
\ No newline at end of file
diff --git a/resources/service-catalog-addons/charts/catalog-ui/templates/service.yaml b/resources/service-catalog-addons/charts/catalog-ui/templates/service.yaml
deleted file mode 100644
index 8f03ee36b81e..000000000000
--- a/resources/service-catalog-addons/charts/catalog-ui/templates/service.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    "auth.istio.io/{{ .Values.service.externalPort }}": NONE    
-  name: {{ template "fullname" . }}
-  labels:
-    app: {{ template "name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  ports:
-  - port: {{ .Values.service.internalPort }}
-    targetPort: {{ .Values.service.externalPort }}
-    protocol: TCP
-    name: http2
-  selector:
-    app: {{ template "name" . }}
\ No newline at end of file
diff --git a/resources/service-catalog-addons/charts/catalog-ui/values.yaml b/resources/service-catalog-addons/charts/catalog-ui/values.yaml
deleted file mode 100644
index a761caa274e5..000000000000
--- a/resources/service-catalog-addons/charts/catalog-ui/values.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: catalog
-replicaCount: 1
-image:
-  dir: ""
-  pullPolicy: IfNotPresent
-service:
-  internalPort: 80
-  externalPort: 80
-  protocol: TCP
-virtualservice:
-  enabled: true
-  annotations: {}
-resources: {}
diff --git a/resources/service-catalog-addons/charts/instances-ui/.helmignore b/resources/service-catalog-addons/charts/instances-ui/.helmignore
deleted file mode 100644
index f0c131944441..000000000000
--- a/resources/service-catalog-addons/charts/instances-ui/.helmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
diff --git a/resources/service-catalog-addons/charts/instances-ui/Chart.yaml b/resources/service-catalog-addons/charts/instances-ui/Chart.yaml
deleted file mode 100644
index be78b81a0f23..000000000000
--- a/resources/service-catalog-addons/charts/instances-ui/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-name: instances-ui
-description: Catalog Service Instances UI embedded in the Console
-version: 0.1.0
-appVersion: a9d158d5
diff --git a/resources/service-catalog-addons/charts/instances-ui/templates/_helpers.tpl b/resources/service-catalog-addons/charts/instances-ui/templates/_helpers.tpl
deleted file mode 100644
index f0d83d2edba6..000000000000
--- a/resources/service-catalog-addons/charts/instances-ui/templates/_helpers.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/resources/service-catalog-addons/charts/instances-ui/templates/deployment.yaml b/resources/service-catalog-addons/charts/instances-ui/templates/deployment.yaml
deleted file mode 100644
index a16cd1330d6e..000000000000
--- a/resources/service-catalog-addons/charts/instances-ui/templates/deployment.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: {{ template "fullname" . }}
-  labels:
-    app: {{ template "name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  template:
-    metadata:
-      annotations:
-        sidecar.istio.io/inject: "false"
-      labels:
-        app: {{ template "name" . }}
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.global.containerRegistry.path }}{{ .Values.image.dir }}/instances-ui:{{ .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - containerPort: {{ .Values.service.internalPort }}
-          volumeMounts:
-          - name: config
-            mountPath: /var/public/config
-      volumes:
-      - name: config
-        configMap:
-          name: {{ .Chart.Name }}-config
-          items:
-          - key: config.js
-            path: config.js
diff --git a/resources/service-catalog-addons/charts/instances-ui/templates/destination-rule.yaml b/resources/service-catalog-addons/charts/instances-ui/templates/destination-rule.yaml
deleted file mode 100644
index 26b48a289481..000000000000
--- a/resources/service-catalog-addons/charts/instances-ui/templates/destination-rule.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: "networking.istio.io/v1alpha3"
-kind: "DestinationRule"
-metadata:
-  name: {{ template "fullname" . }}
-spec:
-  host: {{ template "fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
-  trafficPolicy:
-    tls:
-      mode: DISABLE
\ No newline at end of file
diff --git a/resources/service-catalog-addons/charts/instances-ui/templates/service.yaml b/resources/service-catalog-addons/charts/instances-ui/templates/service.yaml
deleted file mode 100644
index 8f03ee36b81e..000000000000
--- a/resources/service-catalog-addons/charts/instances-ui/templates/service.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    "auth.istio.io/{{ .Values.service.externalPort }}": NONE    
-  name: {{ template "fullname" . }}
-  labels:
-    app: {{ template "name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  ports:
-  - port: {{ .Values.service.internalPort }}
-    targetPort: {{ .Values.service.externalPort }}
-    protocol: TCP
-    name: http2
-  selector:
-    app: {{ template "name" . }}
\ No newline at end of file
diff --git a/resources/service-catalog-addons/charts/instances-ui/values.yaml b/resources/service-catalog-addons/charts/instances-ui/values.yaml
deleted file mode 100644
index b2ca67eb67e0..000000000000
--- a/resources/service-catalog-addons/charts/instances-ui/values.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: instances
-replicaCount: 1
-image:
-  dir: ""
-  pullPolicy: IfNotPresent
-service:
-  internalPort: 80
-  externalPort: 80
-  protocol: TCP
-virtualservice:
-  enabled: true
-  annotations: {}
-resources: {}
diff --git a/resources/service-catalog-addons/charts/brokers-ui/.helmignore b/resources/service-catalog-addons/charts/service-catalog-ui/.helmignore
similarity index 100%
rename from resources/service-catalog-addons/charts/brokers-ui/.helmignore
rename to resources/service-catalog-addons/charts/service-catalog-ui/.helmignore
diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/Chart.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/Chart.yaml
new file mode 100644
index 000000000000..ce49fb30db8d
--- /dev/null
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+name: service-catalog-ui
+description: Service Catalog UI, Instances UI, Broker UI for Kyma Console
+version: 0.1.0
+appVersion: xxxx
diff --git a/resources/service-catalog-addons/charts/brokers-ui/templates/_helpers.tpl b/resources/service-catalog-addons/charts/service-catalog-ui/templates/_helpers.tpl
similarity index 100%
rename from resources/service-catalog-addons/charts/brokers-ui/templates/_helpers.tpl
rename to resources/service-catalog-addons/charts/service-catalog-ui/templates/_helpers.tpl
diff --git a/resources/service-catalog-addons/charts/brokers-ui/templates/brokers-microfrontend.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/brokers-microfrontend.yaml
similarity index 100%
rename from resources/service-catalog-addons/charts/brokers-ui/templates/brokers-microfrontend.yaml
rename to resources/service-catalog-addons/charts/service-catalog-ui/templates/brokers-microfrontend.yaml
diff --git a/resources/service-catalog-addons/charts/brokers-ui/templates/virtualservice.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/brokers-virtualservice.yaml
similarity index 85%
rename from resources/service-catalog-addons/charts/brokers-ui/templates/virtualservice.yaml
rename to resources/service-catalog-addons/charts/service-catalog-ui/templates/brokers-virtualservice.yaml
index 3fb872c5d26e..fa589eca7e41 100644
--- a/resources/service-catalog-addons/charts/brokers-ui/templates/virtualservice.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/templates/brokers-virtualservice.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.virtualservice.enabled }}
 {{- $serviceName := include "fullname" . -}}
-{{- $servicePort := .Values.service.externalPort -}}
+{{- $servicePort := .Values.brokers.service.externalPort -}}
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
@@ -19,7 +19,7 @@ metadata:
 {{- end }}
 spec:
   hosts:
-  - {{ .Values.name }}.{{ .Values.global.ingress.domainName }}
+  - {{ .Values.brokers.hostname }}.{{ .Values.global.ingress.domainName }}
   gateways:
   - {{ .Values.global.istio.gateway.name }}
   http:
diff --git a/resources/service-catalog-addons/charts/catalog-ui/templates/service-catalog-microfrontend.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/catalog-microfrontend.yaml
similarity index 100%
rename from resources/service-catalog-addons/charts/catalog-ui/templates/service-catalog-microfrontend.yaml
rename to resources/service-catalog-addons/charts/service-catalog-ui/templates/catalog-microfrontend.yaml
diff --git a/resources/service-catalog-addons/charts/instances-ui/templates/virtualservice.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/catalog-virtualservice.yaml
similarity index 85%
rename from resources/service-catalog-addons/charts/instances-ui/templates/virtualservice.yaml
rename to resources/service-catalog-addons/charts/service-catalog-ui/templates/catalog-virtualservice.yaml
index 3fb872c5d26e..cad78c4ca0e4 100644
--- a/resources/service-catalog-addons/charts/instances-ui/templates/virtualservice.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/templates/catalog-virtualservice.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.virtualservice.enabled }}
 {{- $serviceName := include "fullname" . -}}
-{{- $servicePort := .Values.service.externalPort -}}
+{{- $servicePort := .Values.catalog.service.externalPort -}}
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
@@ -19,7 +19,7 @@ metadata:
 {{- end }}
 spec:
   hosts:
-  - {{ .Values.name }}.{{ .Values.global.ingress.domainName }}
+  - {{ .Values.catalog.hostname }}.{{ .Values.global.ingress.domainName }}
   gateways:
   - {{ .Values.global.istio.gateway.name }}
   http:
diff --git a/resources/service-catalog-addons/charts/instances-ui/templates/configmap.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/configmap.yaml
similarity index 91%
rename from resources/service-catalog-addons/charts/instances-ui/templates/configmap.yaml
rename to resources/service-catalog-addons/charts/service-catalog-ui/templates/configmap.yaml
index 90598041e822..25f92337c5db 100644
--- a/resources/service-catalog-addons/charts/instances-ui/templates/configmap.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/templates/configmap.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ .Chart.Name }}-config
-  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ .Chart.Name }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
diff --git a/resources/service-catalog-addons/charts/catalog-ui/templates/deployment.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml
similarity index 65%
rename from resources/service-catalog-addons/charts/catalog-ui/templates/deployment.yaml
rename to resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml
index b14f179379c3..a3bf63c77977 100644
--- a/resources/service-catalog-addons/charts/catalog-ui/templates/deployment.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml
@@ -19,13 +19,19 @@ spec:
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.global.containerRegistry.path }}{{ .Values.image.dir }}/catalog-ui:{{ .Chart.AppVersion }}"
+          image: "{{ .Values.global.containerRegistry.path }}{{ .Values.image.dir }}/service-catalog-ui:{{ .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
-            - containerPort: {{ .Values.service.internalPort }}
+            - containerPort: {{ .Values.service.catalog.internalPort }}
+            - containerPort: {{ .Values.service.instances.internalPort }}
+            - containerPort: {{ .Values.service.brokers.internalPort }}
           volumeMounts:
           - name: config
-            mountPath: /var/public/config
+            mountPath: /var/catalog-public/config
+          - name: config
+            mountPath: /var/instances-public/config
+          - name: config
+            mountPath: /var/brokers-public/config
       volumes:
       - name: config
         configMap:
diff --git a/resources/service-catalog-addons/charts/brokers-ui/templates/destination-rule.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/destination-rule.yaml
similarity index 100%
rename from resources/service-catalog-addons/charts/brokers-ui/templates/destination-rule.yaml
rename to resources/service-catalog-addons/charts/service-catalog-ui/templates/destination-rule.yaml
diff --git a/resources/service-catalog-addons/charts/instances-ui/templates/instances-microfrontend.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/instances-microfrontend.yaml
similarity index 100%
rename from resources/service-catalog-addons/charts/instances-ui/templates/instances-microfrontend.yaml
rename to resources/service-catalog-addons/charts/service-catalog-ui/templates/instances-microfrontend.yaml
diff --git a/resources/service-catalog-addons/charts/catalog-ui/templates/virtualservice.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/instances-virtualservice.yaml
similarity index 84%
rename from resources/service-catalog-addons/charts/catalog-ui/templates/virtualservice.yaml
rename to resources/service-catalog-addons/charts/service-catalog-ui/templates/instances-virtualservice.yaml
index 3fb872c5d26e..af205559fe9b 100644
--- a/resources/service-catalog-addons/charts/catalog-ui/templates/virtualservice.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/templates/instances-virtualservice.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.virtualservice.enabled }}
 {{- $serviceName := include "fullname" . -}}
-{{- $servicePort := .Values.service.externalPort -}}
+{{- $servicePort := .Values.instances.service.externalPort -}}
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
@@ -19,7 +19,7 @@ metadata:
 {{- end }}
 spec:
   hosts:
-  - {{ .Values.name }}.{{ .Values.global.ingress.domainName }}
+  - {{ .Values.instances.hostname }}.{{ .Values.global.ingress.domainName }}
   gateways:
   - {{ .Values.global.istio.gateway.name }}
   http:
diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/templates/service.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/service.yaml
new file mode 100644
index 000000000000..8db111f6b916
--- /dev/null
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/templates/service.yaml
@@ -0,0 +1,29 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "fullname" . }}
+  annotations:
+    "auth.istio.io/{{ .Values.catalog.service.externalPort }}": NONE
+    "auth.istio.io/{{ .Values.instances.service.externalPort }}": NONE
+    "auth.istio.io/{{ .Values.brokers.service.externalPort }}": NONE
+  labels:
+    app: {{ template "name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  ports:
+  - port: {{ .Values.catalog.service.externalPort }}
+    targetPort: {{ .Values.catalog.service.internalPort }}
+    protocol: TCP
+    name: http2-catalog
+  - port: {{ .Values.instances.service.externalPort }}
+    targetPort: {{ .Values.instances.service.internalPort }}
+    protocol: TCP
+    name: http2-instances
+  - port: {{ .Values.brokers.service.externalPort }}
+    targetPort: {{ .Values.brokers.service.internalPort }}
+    protocol: TCP
+    name: http2-brokers
+  selector:
+    app: {{ template "name" . }}
diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/values.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/values.yaml
new file mode 100644
index 000000000000..531a152f5f5c
--- /dev/null
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/values.yaml
@@ -0,0 +1,23 @@
+replicaCount: 1
+image:
+  dir: ""
+  pullPolicy: IfNotPresent
+catalog:
+  service:
+    internalPort: 8080
+    externalPort: 8080
+  hostname: catalog
+instances:
+  service:
+    internalPort: 8081
+    externalPort: 8081
+  hostname: instances
+brokers:
+  service:
+    internalPort: 8082
+    externalPort: 8082
+  hostname: brokers  
+protocol: TCP
+virtualservice:
+  enabled: true
+  annotations: {}

From 59051d5e71f2e12fd66dfe7fbce47765f7b75cbb Mon Sep 17 00:00:00 2001
From: "Kwiatosz, Krzysztof" <kwiatekus@users.noreply.github.com>
Date: Thu, 8 Aug 2019 15:53:28 +0200
Subject: [PATCH 2/9] Use pr image from prow

---
 .../service-catalog-addons/charts/service-catalog-ui/Chart.yaml | 2 +-
 .../charts/service-catalog-ui/values.yaml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/Chart.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/Chart.yaml
index ce49fb30db8d..480d760d6168 100644
--- a/resources/service-catalog-addons/charts/service-catalog-ui/Chart.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 name: service-catalog-ui
 description: Service Catalog UI, Instances UI, Broker UI for Kyma Console
 version: 0.1.0
-appVersion: xxxx
+appVersion: PR-1152
diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/values.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/values.yaml
index 531a152f5f5c..2c47d6a872ec 100644
--- a/resources/service-catalog-addons/charts/service-catalog-ui/values.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/values.yaml
@@ -1,6 +1,6 @@
 replicaCount: 1
 image:
-  dir: ""
+  dir: "/pr"
   pullPolicy: IfNotPresent
 catalog:
   service:

From 50993f99a4b53432156c052b9540f95e8a13739c Mon Sep 17 00:00:00 2001
From: "Kwiatosz, Krzysztof" <kwiatekus@users.noreply.github.com>
Date: Thu, 8 Aug 2019 16:07:20 +0200
Subject: [PATCH 3/9] Fix problem in deployment.yaml

---
 .../charts/service-catalog-ui/templates/deployment.yaml     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml
index a3bf63c77977..f48733e141d0 100644
--- a/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml
@@ -22,9 +22,9 @@ spec:
           image: "{{ .Values.global.containerRegistry.path }}{{ .Values.image.dir }}/service-catalog-ui:{{ .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
-            - containerPort: {{ .Values.service.catalog.internalPort }}
-            - containerPort: {{ .Values.service.instances.internalPort }}
-            - containerPort: {{ .Values.service.brokers.internalPort }}
+            - containerPort: {{ .Values.catalog.service.internalPort }}
+            - containerPort: {{ .Values.instances.service.internalPort }}
+            - containerPort: {{ .Values.brokers.service.internalPort }}
           volumeMounts:
           - name: config
             mountPath: /var/catalog-public/config

From 9f72179233805061f84aba052e86760b93dcaa4d Mon Sep 17 00:00:00 2001
From: "Kwiatosz, Krzysztof" <kwiatekus@users.noreply.github.com>
Date: Fri, 9 Aug 2019 08:11:08 +0200
Subject: [PATCH 4/9] Fix name clash for virtualserviceses

---
 .../service-catalog-ui/templates/brokers-virtualservice.yaml    | 2 +-
 .../service-catalog-ui/templates/catalog-virtualservice.yaml    | 2 +-
 .../service-catalog-ui/templates/instances-virtualservice.yaml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/templates/brokers-virtualservice.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/brokers-virtualservice.yaml
index fa589eca7e41..12b4b1719551 100644
--- a/resources/service-catalog-addons/charts/service-catalog-ui/templates/brokers-virtualservice.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/templates/brokers-virtualservice.yaml
@@ -8,7 +8,7 @@ metadata:
   annotations:
 {{ toYaml .Values.virtualservice.annotations | indent 4 }}
 {{- end }}
-  name: {{ template "fullname" . }}
+  name: {{ template "fullname" . }}-brokers
   labels:
     app: {{ template "name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/templates/catalog-virtualservice.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/catalog-virtualservice.yaml
index cad78c4ca0e4..ca5ca7593ab7 100644
--- a/resources/service-catalog-addons/charts/service-catalog-ui/templates/catalog-virtualservice.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/templates/catalog-virtualservice.yaml
@@ -8,7 +8,7 @@ metadata:
   annotations:
 {{ toYaml .Values.virtualservice.annotations | indent 4 }}
 {{- end }}
-  name: {{ template "fullname" . }}
+  name: {{ template "fullname" . }}-catalog
   labels:
     app: {{ template "name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/templates/instances-virtualservice.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/instances-virtualservice.yaml
index af205559fe9b..ac6c4ded784d 100644
--- a/resources/service-catalog-addons/charts/service-catalog-ui/templates/instances-virtualservice.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/templates/instances-virtualservice.yaml
@@ -8,7 +8,7 @@ metadata:
   annotations:
 {{ toYaml .Values.virtualservice.annotations | indent 4 }}
 {{- end }}
-  name: {{ template "fullname" . }}
+  name: {{ template "fullname" . }}-instances
   labels:
     app: {{ template "name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

From 70765aeb4fe9c55a6deaa2d78c4a2501dafc9427 Mon Sep 17 00:00:00 2001
From: "Kwiatosz, Krzysztof" <kwiatekus@users.noreply.github.com>
Date: Fri, 9 Aug 2019 08:37:47 +0200
Subject: [PATCH 5/9] Fix configmap reference

---
 .../charts/service-catalog-ui/templates/configmap.yaml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/templates/configmap.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/configmap.yaml
index 25f92337c5db..c327236e0c6f 100644
--- a/resources/service-catalog-addons/charts/service-catalog-ui/templates/configmap.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/templates/configmap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Chart.Name }}-config
+  name: {{ .Chart.Name }}
   labels:
     app: {{ .Chart.Name }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}

From 923f98165a2c3f5f0cdd46b0b5f69d46bdac110b Mon Sep 17 00:00:00 2001
From: "Kwiatosz, Krzysztof" <kwiatekus@users.noreply.github.com>
Date: Fri, 9 Aug 2019 10:48:29 +0200
Subject: [PATCH 6/9] MAke nginx config injectable

---
 .../templates/configmap.yaml                  | 83 ++++++++++++++++++-
 .../templates/deployment.yaml                 |  8 ++
 2 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/templates/configmap.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/configmap.yaml
index c327236e0c6f..f6cb75925424 100644
--- a/resources/service-catalog-addons/charts/service-catalog-ui/templates/configmap.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/templates/configmap.yaml
@@ -11,4 +11,85 @@ data:
       catalogUrl: '/home/environments/{CURRENT_ENV}/catalog',
       graphqlApiUrl: 'https://console-backend.{{ .Values.global.ingress.domainName }}/graphql',
       subscriptionsApiUrl: 'wss://console-backend.{{ .Values.global.ingress.domainName }}/graphql',
-    };
\ No newline at end of file
+    };
+  nginx.conf: |
+    worker_processes 1;
+
+    events {
+        worker_connections  1024;
+    }
+
+    http {
+      default_type application/octet-stream;
+      include mime.types;
+      sendfile on;
+      tcp_nopush on;
+      tcp_nodelay on;
+      gzip on;
+      gzip_types    text/plain application/javascript application/x-javascript text/javascript text/xml text/css;
+      keepalive_timeout 5;
+      keepalive_requests 200;
+      reset_timedout_connection on;
+      server_tokens off;
+
+      server {
+        server_name catalog;
+        listen 8080 http2;
+        root /var/catalog-public;
+        port_in_redirect off;
+
+        location / {
+            try_files $uri$args $uri$args/ $uri $uri/ /;
+            add_header 'Cache-Control' 'public, max-age=300';
+            add_header Access-Control-Allow-Origin *;
+            add_header X-Content-Type-Options 'nosniff';
+        }
+
+        location /status {
+            access_log off;
+            stub_status;
+            add_header Access-Control-Allow-Origin *;
+        }
+      }
+
+      server {
+        server_name instances;
+        listen 8081 http2;
+        root /var/instances-public;
+        port_in_redirect off;
+
+        location / {
+            try_files $uri$args $uri$args/ $uri $uri/ /;
+            add_header 'Cache-Control' 'public, max-age=300';
+            add_header Access-Control-Allow-Origin *;
+            add_header X-Content-Type-Options 'nosniff';
+        }
+
+        location /status {
+            access_log off;
+            stub_status;
+            add_header Access-Control-Allow-Origin *;
+        }
+      }
+      
+      server {
+        server_name brokers;
+        listen 8082 http2;
+        root /var/brokers-public;
+        port_in_redirect off;
+
+        location / {
+            try_files $uri$args $uri$args/ $uri $uri/ /;
+            add_header 'Cache-Control' 'public, max-age=300';
+            add_header Access-Control-Allow-Origin *;
+            add_header X-Content-Type-Options 'nosniff';
+        }
+
+        location /status {
+            access_log off;
+            stub_status;
+            add_header Access-Control-Allow-Origin *;
+        }
+      }
+    }
+
diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml
index f48733e141d0..5d92e552ffca 100644
--- a/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml
@@ -32,6 +32,8 @@ spec:
             mountPath: /var/instances-public/config
           - name: config
             mountPath: /var/brokers-public/config
+          - name: nginx
+            mountPath: /etc/nginx/nginx.conf
       volumes:
       - name: config
         configMap:
@@ -39,3 +41,9 @@ spec:
           items:
           - key: config.js
             path: config.js
+      - name: nginx
+        configMap:
+          name: {{ .Chart.Name }}
+          items:
+          - key: nginx.conf
+            path: nginx.conf
\ No newline at end of file

From 401ce32a5b40d8d9b147242a1e3b47c017952a08 Mon Sep 17 00:00:00 2001
From: "Kwiatosz, Krzysztof" <kwiatekus@users.noreply.github.com>
Date: Fri, 9 Aug 2019 13:47:23 +0200
Subject: [PATCH 7/9] Fix nginx mounting point

---
 .../charts/service-catalog-ui/templates/configmap.yaml    | 4 ++--
 .../charts/service-catalog-ui/templates/deployment.yaml   | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/templates/configmap.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/configmap.yaml
index f6cb75925424..bbe09bbd6605 100644
--- a/resources/service-catalog-addons/charts/service-catalog-ui/templates/configmap.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/templates/configmap.yaml
@@ -21,7 +21,7 @@ data:
 
     http {
       default_type application/octet-stream;
-      include mime.types;
+      include /etc/nginx/mime.types;
       sendfile on;
       tcp_nopush on;
       tcp_nodelay on;
@@ -71,7 +71,7 @@ data:
             add_header Access-Control-Allow-Origin *;
         }
       }
-      
+
       server {
         server_name brokers;
         listen 8082 http2;
diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml
index 5d92e552ffca..d3079afc6346 100644
--- a/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml
@@ -21,6 +21,12 @@ spec:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.global.containerRegistry.path }}{{ .Values.image.dir }}/service-catalog-ui:{{ .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          command:
+          - nginx
+          - -c
+          - /nginx-conf/nginx.conf
+          - -g
+          - daemon off;
           ports:
             - containerPort: {{ .Values.catalog.service.internalPort }}
             - containerPort: {{ .Values.instances.service.internalPort }}
@@ -33,7 +39,7 @@ spec:
           - name: config
             mountPath: /var/brokers-public/config
           - name: nginx
-            mountPath: /etc/nginx/nginx.conf
+            mountPath: /nginx-config
       volumes:
       - name: config
         configMap:

From 5ea870f912c928677da0b66d487ba81ab57c88be Mon Sep 17 00:00:00 2001
From: "Kwiatosz, Krzysztof" <kwiatekus@users.noreply.github.com>
Date: Fri, 9 Aug 2019 14:32:56 +0200
Subject: [PATCH 8/9] Fix nginx mounting point

---
 .../charts/service-catalog-ui/templates/deployment.yaml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml
index d3079afc6346..2d9eb85706a7 100644
--- a/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/templates/deployment.yaml
@@ -24,7 +24,7 @@ spec:
           command:
           - nginx
           - -c
-          - /nginx-conf/nginx.conf
+          - /nginx-config/nginx.conf
           - -g
           - daemon off;
           ports:

From 9b18f77d32eb08c0b1f591a147f71bac37ebcf4e Mon Sep 17 00:00:00 2001
From: "Kwiatosz, Krzysztof" <kwiatekus@users.noreply.github.com>
Date: Mon, 12 Aug 2019 15:08:17 +0200
Subject: [PATCH 9/9] Bump service-catalog-ui version

---
 .../service-catalog-addons/charts/service-catalog-ui/Chart.yaml | 2 +-
 .../charts/service-catalog-ui/values.yaml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/Chart.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/Chart.yaml
index 480d760d6168..a98ef5de2120 100644
--- a/resources/service-catalog-addons/charts/service-catalog-ui/Chart.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 name: service-catalog-ui
 description: Service Catalog UI, Instances UI, Broker UI for Kyma Console
 version: 0.1.0
-appVersion: PR-1152
+appVersion: 84af8337
diff --git a/resources/service-catalog-addons/charts/service-catalog-ui/values.yaml b/resources/service-catalog-addons/charts/service-catalog-ui/values.yaml
index 2c47d6a872ec..1b6321306bd7 100644
--- a/resources/service-catalog-addons/charts/service-catalog-ui/values.yaml
+++ b/resources/service-catalog-addons/charts/service-catalog-ui/values.yaml
@@ -1,6 +1,6 @@
 replicaCount: 1
 image:
-  dir: "/pr"
+  dir:
   pullPolicy: IfNotPresent
 catalog:
   service: