[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

6 files changed, 37 insertions, 63 deletions

diff --git a/kubernetes/modeling/Chart.yaml b/kubernetes/modeling/Chart.yaml
index 7e7be74827..13b398b97f 100644
--- a/kubernetes/modeling/Chart.yaml
+++ b/kubernetes/modeling/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # 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,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
+apiVersion: v2
 description: ONAP Modeling (Modeling)
 name: modeling
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+  - name: modeling-etsicatalog
+    version: ~10.x-0
+    repository: 'file://components/modeling-etsicatalog'
diff --git a/kubernetes/modeling/Makefile b/kubernetes/modeling/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/modeling/Makefile
+++ b/kubernetes/modeling/Makefile
@@ -33,7 +33,7 @@ make-%:
 	@if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
-	@if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+	@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
 
 lint-%: dep-%
 	@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
 	@$(HELM_BIN) repo index $(PACKAGE_DIR)
 
 clean:
-	@rm -f */requirements.lock
+	@rm -f */Chart.lock
 	@rm -f *tgz */charts/*tgz
 	@rm -rf $(PACKAGE_DIR)
 %:
diff --git a/kubernetes/modeling/components/Makefile b/kubernetes/modeling/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/modeling/components/Makefile
+++ b/kubernetes/modeling/components/Makefile
@@ -33,7 +33,7 @@ make-%:
 	@if [ -f $*/Makefile ]; then make -C $*; fi
 
 dep-%: make-%
-	@if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+	@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
 
 lint-%: dep-%
 	@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
 	@$(HELM_BIN) repo index $(PACKAGE_DIR)
 
 clean:
-	@rm -f */requirements.lock
+	@rm -f */Chart.lock
 	@rm -f *tgz */charts/*tgz
 	@rm -rf $(PACKAGE_DIR)
 %:
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml b/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
index 942915b54e..8825c6fe67 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # 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,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
+apiVersion: v2
 description: ONAP Modeling - Etsicatalog
 name: modeling-etsicatalog
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+  - name: common
+    version: ~10.x-0
+    repository: '@local'
+  - name: mariadb-galera
+    version: ~10.x-0
+    repository: '@local'
+    condition: global.mariadbGalera.localCluster
+  - name: mariadb-init
+    version: ~10.x-0
+    repository: '@local'
+    condition: not global.mariadbGalera.localCluster
+  - name: readinessCheck
+    version: ~10.x-0
+    repository: '@local'
+  - name: repositoryGenerator
+    version: ~10.x-0
+    repository: '@local'
+  - name: serviceAccount
+    version: ~10.x-0
+    repository: '@local'
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml b/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml
deleted file mode 100644
index 686d93619e..0000000000
--- a/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright © 2020 Samung Electronics
-# 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: mariadb-galera
-    version: ~9.x-0
-    repository: '@local'
-    condition: global.mariadbGalera.localCluster
-  - name: mariadb-init
-    version: ~9.x-0
-    repository: '@local'
-    condition: not global.mariadbGalera.localCluster
-  - name: readinessCheck
-    version: ~9.x-0
-    repository: '@local'
-  - name: repositoryGenerator
-    version: ~9.x-0
-    repository: '@local'
-  - name: serviceAccount
-    version: ~9.x-0
-    repository: '@local'
diff --git a/kubernetes/modeling/requirements.yaml b/kubernetes/modeling/requirements.yaml
deleted file mode 100644
index af247fc556..0000000000
--- a/kubernetes/modeling/requirements.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# 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: modeling-etsicatalog
-    version: ~9.x-0
-    repository: 'file://components/modeling-etsicatalog'