From 370c6dc33e55bfee7b3b79bcc21481b02a3f1e24 Mon Sep 17 00:00:00 2001 From: efiacor 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 Change-Id: I03c5290eee9e40f76eacbf171e774204cf5fb1c0 Issue-ID: OOM-2845 --- kubernetes/common/network-name-gen/Chart.yaml | 21 +++++++++++++-- .../common/network-name-gen/requirements.yaml | 30 ---------------------- 2 files changed, 19 insertions(+), 32 deletions(-) delete mode 100644 kubernetes/common/network-name-gen/requirements.yaml (limited to 'kubernetes/common/network-name-gen') diff --git a/kubernetes/common/network-name-gen/Chart.yaml b/kubernetes/common/network-name-gen/Chart.yaml index 3f549276ce..2712596e9b 100644 --- a/kubernetes/common/network-name-gen/Chart.yaml +++ b/kubernetes/common/network-name-gen/Chart.yaml @@ -1,5 +1,6 @@ # Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. # 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,23 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: Name Generation Micro Service name: network-name-gen -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: 'file://../common' + - name: repositoryGenerator + version: ~10.x-0 + repository: 'file://../repositoryGenerator' + - name: mariadb-galera + version: ~10.x-0 + repository: 'file://../mariadb-galera' + condition: global.mariadbGalera.localCluster + - name: mariadb-init + version: ~10.x-0 + repository: 'file://../mariadb-init' + condition: not global.mariadbGalera.localCluster \ No newline at end of file diff --git a/kubernetes/common/network-name-gen/requirements.yaml b/kubernetes/common/network-name-gen/requirements.yaml deleted file mode 100644 index 88b6a3d968..0000000000 --- a/kubernetes/common/network-name-gen/requirements.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. -# 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: 'file://../common' - - name: repositoryGenerator - version: ~9.x-0 - repository: 'file://../repositoryGenerator' - - name: mariadb-galera - version: ~9.x-0 - repository: 'file://../mariadb-galera' - condition: global.mariadbGalera.localCluster - - name: mariadb-init - version: ~9.x-0 - repository: 'file://../mariadb-init' - condition: not global.mariadbGalera.localCluster -- cgit