Merge catalog-ui instances-ui brokers-ui deployments

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: PR-1152

resources/service-catalog-addons/charts/brokers-ui/templates/virtualservice.yaml → resources/service-catalog-addons/charts/service-catalog-ui/templates/brokers-virtualservice.yaml

@@ -1,14 +1,14 @@
 {{- if .Values.virtualservice.enabled }}
 {{- $serviceName := include "fullname" . -}}
-{{- $servicePort := .Values.service.externalPort -}}
+{{- $servicePort := .Values.brokers.service.externalPort -}}
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
 {{- if .Values.virtualservice.annotations }}
   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 "+" "_" }}
@@ -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:

resources/service-catalog-addons/charts/instances-ui/templates/virtualservice.yaml → resources/service-catalog-addons/charts/service-catalog-ui/templates/catalog-virtualservice.yaml

@@ -1,14 +1,14 @@
 {{- if .Values.virtualservice.enabled }}
 {{- $serviceName := include "fullname" . -}}
-{{- $servicePort := .Values.service.externalPort -}}
+{{- $servicePort := .Values.catalog.service.externalPort -}}
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
 {{- if .Values.virtualservice.annotations }}
   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 "+" "_" }}
@@ -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:

resources/service-catalog-addons/charts/instances-ui/templates/configmap.yaml → resources/service-catalog-addons/charts/service-catalog-ui/templates/configmap.yaml

@@ -1,8 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Chart.Name }}-config
-  namespace: {{ .Release.Namespace }}
+  name: {{ .Chart.Name }}
   labels:
     app: {{ .Chart.Name }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}