Merge catalog-ui instances-ui brokers-ui deployments (#5261)

Merge catalog-ui, instances-ui, brokers-ui deployments
kyma-project · Aug 13, 2019 · 1897f8c · 1897f8c
1 parent fc9218b
commit 1897f8c
Show file tree

Hide file tree

Showing 34 changed files with 184 additions and 325 deletions.
diff --git a/resources/service-catalog-addons/charts/brokers-ui/Chart.yaml b/resources/service-catalog-addons/charts/brokers-ui/Chart.yaml
diff --git a/resources/service-catalog-addons/charts/brokers-ui/templates/configmap.yaml b/resources/service-catalog-addons/charts/brokers-ui/templates/configmap.yaml
diff --git a/resources/service-catalog-addons/charts/brokers-ui/templates/deployment.yaml b/resources/service-catalog-addons/charts/brokers-ui/templates/deployment.yaml
diff --git a/resources/service-catalog-addons/charts/brokers-ui/templates/service.yaml b/resources/service-catalog-addons/charts/brokers-ui/templates/service.yaml
diff --git a/resources/service-catalog-addons/charts/brokers-ui/values.yaml b/resources/service-catalog-addons/charts/brokers-ui/values.yaml
diff --git a/resources/service-catalog-addons/charts/catalog-ui/.helmignore b/resources/service-catalog-addons/charts/catalog-ui/.helmignore
diff --git a/resources/service-catalog-addons/charts/catalog-ui/Chart.yaml b/resources/service-catalog-addons/charts/catalog-ui/Chart.yaml
diff --git a/resources/service-catalog-addons/charts/catalog-ui/templates/_helpers.tpl b/resources/service-catalog-addons/charts/catalog-ui/templates/_helpers.tpl
diff --git a/resources/service-catalog-addons/charts/catalog-ui/templates/configmap.yaml b/resources/service-catalog-addons/charts/catalog-ui/templates/configmap.yaml
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
diff --git a/resources/service-catalog-addons/charts/catalog-ui/templates/service.yaml b/resources/service-catalog-addons/charts/catalog-ui/templates/service.yaml
diff --git a/resources/service-catalog-addons/charts/catalog-ui/values.yaml b/resources/service-catalog-addons/charts/catalog-ui/values.yaml
diff --git a/resources/service-catalog-addons/charts/instances-ui/.helmignore b/resources/service-catalog-addons/charts/instances-ui/.helmignore
diff --git a/resources/service-catalog-addons/charts/instances-ui/Chart.yaml b/resources/service-catalog-addons/charts/instances-ui/Chart.yaml
diff --git a/resources/service-catalog-addons/charts/instances-ui/templates/_helpers.tpl b/resources/service-catalog-addons/charts/instances-ui/templates/_helpers.tpl
diff --git a/resources/service-catalog-addons/charts/instances-ui/templates/configmap.yaml b/resources/service-catalog-addons/charts/instances-ui/templates/configmap.yaml
diff --git a/resources/service-catalog-addons/charts/instances-ui/templates/deployment.yaml b/resources/service-catalog-addons/charts/instances-ui/templates/deployment.yaml
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
diff --git a/resources/service-catalog-addons/charts/instances-ui/templates/service.yaml b/resources/service-catalog-addons/charts/instances-ui/templates/service.yaml
diff --git a/resources/service-catalog-addons/charts/instances-ui/values.yaml b/resources/service-catalog-addons/charts/instances-ui/values.yaml
diff --git a/...alog-addons/charts/brokers-ui/.helmignore → ...ons/charts/service-catalog-ui/.helmignore b/...alog-addons/charts/brokers-ui/.helmignore → ...ons/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
@@ -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: 84af8337
diff --git a/.../charts/brokers-ui/templates/_helpers.tpl → ...service-catalog-ui/templates/_helpers.tpl b/.../charts/brokers-ui/templates/_helpers.tpl → ...service-catalog-ui/templates/_helpers.tpl
diff --git a/...s-ui/templates/brokers-microfrontend.yaml → ...g-ui/templates/brokers-microfrontend.yaml b/...s-ui/templates/brokers-microfrontend.yaml → ...g-ui/templates/brokers-microfrontend.yaml
diff --git a/.../brokers-ui/templates/virtualservice.yaml → ...-ui/templates/brokers-virtualservice.yaml b/.../brokers-ui/templates/virtualservice.yaml → ...-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:

diff --git a/...plates/service-catalog-microfrontend.yaml → ...g-ui/templates/catalog-microfrontend.yaml b/...plates/service-catalog-microfrontend.yaml → ...g-ui/templates/catalog-microfrontend.yaml
diff --git a/...nstances-ui/templates/virtualservice.yaml → ...-ui/templates/catalog-virtualservice.yaml b/...nstances-ui/templates/virtualservice.yaml → ...-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: