From fe7ac42a55ff767ce4a77eac56eeb4e913e5d909 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Thu, 28 Jan 2021 10:56:10 +0100
Subject: [PATCH] Merge requiremnts into Chart.yaml, upgrade apiVersion

---
 Chart.yaml        | 15 ++++++++++++++-
 requirements.yaml | 28 ----------------------------
 2 files changed, 14 insertions(+), 29 deletions(-)
 delete mode 100644 requirements.yaml

diff --git a/Chart.yaml b/Chart.yaml
index 5fde6188..dd863ac4 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,5 +1,18 @@
-apiVersion: v1
+apiVersion: v2
 description: |
   A helm chart for installing NextCloud and setting up ONLYOFFICE integration
 name: nextcloud-onlyoffice
 version: 0.2.4
+dependencies:
+  - name: nextcloud
+    version: 1.10.1
+    repository: https://nextcloud.github.io/helm/
+  - name: rabbitmq
+    version: 6.18.2
+    repository: https://charts.bitnami.com/bitnami
+  - name: redis
+    version: 10.5.7
+    repository: https://charts.bitnami.com/bitnami
+  - name: postgresql
+    version: 8.6.4
+    repository: https://charts.bitnami.com/bitnami
diff --git a/requirements.yaml b/requirements.yaml
deleted file mode 100644
index b1048538..00000000
--- a/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-dependencies:
-  - name: nextcloud/nextcloud
-    version: 1.10.1
-    repository: "https://nextcloud.github.io/helm/"
-    tags:
-      - nextcloud
-  - name: rabbitmq
-    version: 6.18.2
-    repository: "https://charts.bitnami.com/bitnami"
-    tags:
-      - onlyoffice
-      - rabbitmq
-      - queue
-  - name: redis
-    version: 10.5.7
-    repository: "https://charts.bitnami.com/bitnami"
-    tags:
-      - key-value-store
-      - redis
-      - onlyoffice
-  - name: postgresql
-    version: 8.6.4
-    repository: "https://charts.bitnami.com/bitnami"
-    tags:
-      - postgresql
-      - onlyoffice
-      - database
-- 
GitLab