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/elasticsearch/Chart.yaml | 27 ++++++++++++++-- kubernetes/common/elasticsearch/Makefile | 4 +-- .../common/elasticsearch/components/Makefile | 4 +-- .../elasticsearch/components/curator/Chart.yaml | 13 ++++++-- .../components/curator/requirements.yaml | 22 ------------- .../elasticsearch/components/data/Chart.yaml | 13 ++++++-- .../components/data/requirements.yaml | 22 ------------- .../elasticsearch/components/master/Chart.yaml | 15 ++++++--- .../components/master/requirements.yaml | 22 ------------- kubernetes/common/elasticsearch/requirements.yaml | 36 ---------------------- 10 files changed, 62 insertions(+), 116 deletions(-) delete mode 100644 kubernetes/common/elasticsearch/components/curator/requirements.yaml delete mode 100644 kubernetes/common/elasticsearch/components/data/requirements.yaml delete mode 100644 kubernetes/common/elasticsearch/components/master/requirements.yaml delete mode 100644 kubernetes/common/elasticsearch/requirements.yaml (limited to 'kubernetes/common/elasticsearch') diff --git a/kubernetes/common/elasticsearch/Chart.yaml b/kubernetes/common/elasticsearch/Chart.yaml index 225e6c3816..6f6df2247d 100644 --- a/kubernetes/common/elasticsearch/Chart.yaml +++ b/kubernetes/common/elasticsearch/Chart.yaml @@ -1,5 +1,6 @@ # Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies # 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. @@ -14,7 +15,29 @@ # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP elasticsearch name: elasticsearch -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: 'file://../common' + - name: master + version: ~10.x-0 + repository: 'file://components/master' + - name: data + version: ~10.x-0 + repository: 'file://components/data' + condition: elasticsearch.data.enabled,data.enabled + - name: curator + version: ~10.x-0 + repository: 'file://components/curator' + condition: elasticsearch.curator.enabled,curator.enabled + - name: certInitializer + version: ~10.x-0 + repository: 'file://../certInitializer' + - name: repositoryGenerator + version: ~10.x-0 + repository: 'file://../repositoryGenerator' diff --git a/kubernetes/common/elasticsearch/Makefile b/kubernetes/common/elasticsearch/Makefile index 4c79718d02..51d7de122c 100644 --- a/kubernetes/common/elasticsearch/Makefile +++ b/kubernetes/common/elasticsearch/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/common/elasticsearch/components/Makefile b/kubernetes/common/elasticsearch/components/Makefile index f2e7a1fb82..1ea8433a9c 100644 --- a/kubernetes/common/elasticsearch/components/Makefile +++ b/kubernetes/common/elasticsearch/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/common/elasticsearch/components/curator/Chart.yaml b/kubernetes/common/elasticsearch/components/curator/Chart.yaml index 1e51feca30..b1e80f034c 100644 --- a/kubernetes/common/elasticsearch/components/curator/Chart.yaml +++ b/kubernetes/common/elasticsearch/components/curator/Chart.yaml @@ -1,5 +1,6 @@ # Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies # 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. @@ -14,7 +15,15 @@ # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP elasticsearch curator name: curator -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' \ No newline at end of file diff --git a/kubernetes/common/elasticsearch/components/curator/requirements.yaml b/kubernetes/common/elasticsearch/components/curator/requirements.yaml deleted file mode 100644 index e9170767dd..0000000000 --- a/kubernetes/common/elasticsearch/components/curator/requirements.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies -# 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' diff --git a/kubernetes/common/elasticsearch/components/data/Chart.yaml b/kubernetes/common/elasticsearch/components/data/Chart.yaml index 2218befc4e..fc5d402a95 100644 --- a/kubernetes/common/elasticsearch/components/data/Chart.yaml +++ b/kubernetes/common/elasticsearch/components/data/Chart.yaml @@ -1,5 +1,6 @@ # Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies # 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. @@ -14,7 +15,15 @@ # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP elasticsearch data name: data -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' diff --git a/kubernetes/common/elasticsearch/components/data/requirements.yaml b/kubernetes/common/elasticsearch/components/data/requirements.yaml deleted file mode 100644 index 6212efabe3..0000000000 --- a/kubernetes/common/elasticsearch/components/data/requirements.yaml +++ /dev/null @@ -1,22 +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: common - version: ~9.x-0 - repository: 'file://../../../common' - - name: repositoryGenerator - version: ~9.x-0 - repository: 'file://../../../repositoryGenerator' diff --git a/kubernetes/common/elasticsearch/components/master/Chart.yaml b/kubernetes/common/elasticsearch/components/master/Chart.yaml index 49ed5d0e8d..01ee8f3c20 100644 --- a/kubernetes/common/elasticsearch/components/master/Chart.yaml +++ b/kubernetes/common/elasticsearch/components/master/Chart.yaml @@ -1,5 +1,6 @@ # Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies # 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,9 +14,15 @@ # See the License for the specific language governing permissions and # limitations under the License. - - -apiVersion: v1 +apiVersion: v2 description: ONAP elasticsearch master name: master -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' diff --git a/kubernetes/common/elasticsearch/components/master/requirements.yaml b/kubernetes/common/elasticsearch/components/master/requirements.yaml deleted file mode 100644 index 6212efabe3..0000000000 --- a/kubernetes/common/elasticsearch/components/master/requirements.yaml +++ /dev/null @@ -1,22 +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: common - version: ~9.x-0 - repository: 'file://../../../common' - - name: repositoryGenerator - version: ~9.x-0 - repository: 'file://../../../repositoryGenerator' diff --git a/kubernetes/common/elasticsearch/requirements.yaml b/kubernetes/common/elasticsearch/requirements.yaml deleted file mode 100644 index c41b3603e9..0000000000 --- a/kubernetes/common/elasticsearch/requirements.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies -# 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: master - version: ~9.x-0 - repository: 'file://components/master' - - name: data - version: ~9.x-0 - repository: 'file://components/data' - condition: elasticsearch.data.enabled,data.enabled - - name: curator - version: ~9.x-0 - repository: 'file://components/curator' - condition: elasticsearch.curator.enabled,curator.enabled - - name: certInitializer - version: ~9.x-0 - repository: 'file://../certInitializer' - - name: repositoryGenerator - version: ~9.x-0 - repository: 'file://../repositoryGenerator' -- cgit 1.2.3-korg