From ff9b2911c598135232dce856af273ed9303089fd Mon Sep 17 00:00:00 2001
From: Marian Koreniuk <moriarti@cp.if.ua>
Date: Thu, 8 Aug 2024 22:58:14 +0100
Subject: [PATCH] resolve conflicts

---
 packages/core/platform/bundles/distro-full.yaml    | 8 +++++++-
 packages/core/platform/bundles/paas-full.yaml      | 6 ++++++
 packages/system/dashboard/images/dashboard.tag     | 2 +-
 packages/system/dashboard/images/kubeapps-apis.tag | 2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/core/platform/bundles/distro-full.yaml b/packages/core/platform/bundles/distro-full.yaml
index 59a32fa9..4b9b4217 100644
--- a/packages/core/platform/bundles/distro-full.yaml
+++ b/packages/core/platform/bundles/distro-full.yaml
@@ -123,7 +123,13 @@ releases:
   releaseName: snapshot-controller
   chart: cozy-snapshot-controller
   namespace: cozy-snapshot-controller
-  dependsOn: [cilium,cert-manager-issuers]  
+  dependsOn: [cilium,cert-manager-issuers]
+
+- name: objectstorage-controller
+  releaseName: objectstorage-controller
+  chart: cozy-objectstorage-controller
+  namespace: cozy-objectstorage-controller
+  dependsOn: [cilium]
 
 - name: linstor
   releaseName: linstor
diff --git a/packages/core/platform/bundles/paas-full.yaml b/packages/core/platform/bundles/paas-full.yaml
index 65c259a6..b1f66617 100644
--- a/packages/core/platform/bundles/paas-full.yaml
+++ b/packages/core/platform/bundles/paas-full.yaml
@@ -161,6 +161,12 @@ releases:
   namespace: cozy-snapshot-controller
   dependsOn: [cilium,kubeovn,cert-manager-issuers]  
 
+- name: objectstorage-controller
+  releaseName: objectstorage-controller
+  chart: cozy-objectstorage-controller
+  namespace: cozy-objectstorage-controller
+  dependsOn: [cilium,kubeovn]
+
 - name: telepresence
   releaseName: traffic-manager
   chart: cozy-telepresence
diff --git a/packages/system/dashboard/images/dashboard.tag b/packages/system/dashboard/images/dashboard.tag
index d00b4418..6e88145f 100644
--- a/packages/system/dashboard/images/dashboard.tag
+++ b/packages/system/dashboard/images/dashboard.tag
@@ -1 +1 @@
-ghcr.io/aenix-io/cozystack/dashboard:latest
\ No newline at end of file
+ghcr.io/aenix-io/cozystack/dashboard:latest
diff --git a/packages/system/dashboard/images/kubeapps-apis.tag b/packages/system/dashboard/images/kubeapps-apis.tag
index 014e73fd..b87bc749 100644
--- a/packages/system/dashboard/images/kubeapps-apis.tag
+++ b/packages/system/dashboard/images/kubeapps-apis.tag
@@ -1 +1 @@
-ghcr.io/aenix-io/cozystack/kubeapps-apis:latest
\ No newline at end of file
+ghcr.io/aenix-io/cozystack/kubeapps-apis:latest