From ab60ee881400ae2747ebf1d61e518a2c13f351c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daria=20Domaga=C5=82a?=
 <40663133+dariadomagala@users.noreply.github.com>
Date: Wed, 16 Jun 2021 14:48:07 +0200
Subject: [PATCH] Remove old sub-charts from the new installation (#11483)

* Remove old sub-charts from new installation

* Overwrite proper value

* Use requirements to conditionally install subchart
---
 installation/resources/values.yaml                 | 8 +++++++-
 resources/helm-broker/values.yaml                  | 3 +++
 resources/service-catalog-addons/requirements.yaml | 2 +-
 resources/service-catalog-addons/values.yaml       | 3 +++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/installation/resources/values.yaml b/installation/resources/values.yaml
index 965857e74e46..1ee620373d27 100644
--- a/installation/resources/values.yaml
+++ b/installation/resources/values.yaml
@@ -39,4 +39,10 @@ rafter:
   controller-manager:
     minio:
       virtualservice:
-        enabled: false
\ No newline at end of file
+        enabled: false
+helm-broker:
+  addons-ui:
+    enabled: false
+service-catalog-addons:
+  service-catalog-ui: 
+    enabled: false
\ No newline at end of file
diff --git a/resources/helm-broker/values.yaml b/resources/helm-broker/values.yaml
index 4f7048dfa73d..4c50b2415199 100644
--- a/resources/helm-broker/values.yaml
+++ b/resources/helm-broker/values.yaml
@@ -44,6 +44,9 @@ defaultAddonsRepository: "https://github.com/kyma-project/addons/releases/downlo
 #   myRepo2: "https://github.com/myOrg/myRepo/releases/download/0.x.0/index.yaml"
 additionalAddonsRepositories: {}
 
+addons-ui:
+  enabled: true
+
 global:
   containerRegistry:
     path: eu.gcr.io/kyma-project
diff --git a/resources/service-catalog-addons/requirements.yaml b/resources/service-catalog-addons/requirements.yaml
index 557e11e3f9a6..b7fa9f204167 100644
--- a/resources/service-catalog-addons/requirements.yaml
+++ b/resources/service-catalog-addons/requirements.yaml
@@ -2,4 +2,4 @@ dependencies:
 - name: service-binding-usage-controller
   condition: service-binding-usage-controller.enabled
 - name: service-catalog-ui
-  condition: catalog-ui.enabled
+  condition: service-catalog-ui.enabled
diff --git a/resources/service-catalog-addons/values.yaml b/resources/service-catalog-addons/values.yaml
index ee8ea34688d0..9138dab88b99 100644
--- a/resources/service-catalog-addons/values.yaml
+++ b/resources/service-catalog-addons/values.yaml
@@ -1,3 +1,6 @@
+service-catalog-ui:
+  enabled: true
+
 global:
   containerRegistry:
     path: eu.gcr.io/kyma-project