From 370c6dc33e55bfee7b3b79bcc21481b02a3f1e24 Mon Sep 17 00:00:00 2001
From: efiacor <fiachra.corcoran@est.tech>
Date: Tue, 12 Oct 2021 14:10:49 +0100
Subject: [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
---
 kubernetes/contrib/components/ejbca/Chart.yaml     | 27 +++++++++++++++--
 .../contrib/components/ejbca/requirements.yaml     | 35 ----------------------
 2 files changed, 25 insertions(+), 37 deletions(-)
 delete mode 100644 kubernetes/contrib/components/ejbca/requirements.yaml

(limited to 'kubernetes/contrib/components/ejbca')

diff --git a/kubernetes/contrib/components/ejbca/Chart.yaml b/kubernetes/contrib/components/ejbca/Chart.yaml
index 638c6db71a..2d683269af 100644
--- a/kubernetes/contrib/components/ejbca/Chart.yaml
+++ b/kubernetes/contrib/components/ejbca/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2020 Nokia
 # 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 EJBCA test server
 name: ejbca
-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: repositoryGenerator
+    version: ~10.x-0
+    repository: '@local'
+  - name: cmpv2Config
+    version: ~10.x-0
+    repository: '@local'
+  - name: serviceAccount
+    version: ~10.x-0
+    repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/contrib/components/ejbca/requirements.yaml b/kubernetes/contrib/components/ejbca/requirements.yaml
deleted file mode 100644
index dabf474ab6..0000000000
--- a/kubernetes/contrib/components/ejbca/requirements.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2020 Orange, Ericsson
-# 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: repositoryGenerator
-    version: ~9.x-0
-    repository: '@local'
-  - name: cmpv2Config
-    version: ~9.x-0
-    repository: '@local'
-  - name: serviceAccount
-    version: ~9.x-0
-    repository: '@local'
-- 
cgit 1.2.3-korg