[GLOBAL] Migrate to helm v3

Move all Chart.yaml to use apiVersion: 2
Move dependencies from requirements.yaml to Chart.yaml
Changes to all makeFiles
Changes to helm deploy plugin

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I03c5290eee9e40f76eacbf171e774204cf5fb1c0
Issue-ID: OOM-2845

4 files changed, 24 insertions, 38 deletions

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
index f1e00cdbeb..7af1a67d9a 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright 2018 Intel Corporation, Inc
 # Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +14,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
+apiVersion: v2
 description: ONAP Multicloud Prometheus
 name: multicloud-prometheus
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+  - name: common
+    version: ~10.x-0
+    repository: '@local'
+  - name: repositoryGenerator
+    version: ~10.x-0
+    repository: '@local'
+  - name: prometheus-alertmanager
+    version: ~10.x-0
+    repository: 'file://components/prometheus-alertmanager'
+  - name: prometheus-grafana
+    version: ~10.x-0
+    repository: 'file://components/prometheus-grafana'
+  - name: serviceAccount
+    version: ~10.x-0
+    repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
index 16a126acad..e2b3a265c7 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
+apiVersion: v2
 description: ONAP Multicloud Prometheus Alert Manager
 name: prometheus-alertmanager
-version: 9.0.0
+version: 10.0.0
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
index a6df6e1002..cf8cfc5633 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
+apiVersion: v2
 description: ONAP Multicloud Grafana for Prometheus
 name: prometheus-grafana
-version: 9.0.0
+version: 10.0.0
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
deleted file mode 100644
index eb40843bf1..0000000000
--- a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
-  - name: common
-    version: ~9.x-0
-    repository: '@local'
-  - name: repositoryGenerator
-    version: ~9.x-0
-    repository: '@local'
-  - name: prometheus-alertmanager
-    version: ~9.x-0
-    repository: 'file://components/prometheus-alertmanager'
-  - name: prometheus-grafana
-    version: ~9.x-0
-    repository: 'file://components/prometheus-grafana'
-  - name: serviceAccount
-    version: ~9.x-0
-    repository: '@local'