diff options
| author |   efiacor <fiachra.corcoran@est.tech> | 2021-10-12 14:10:49 +0100 |
|---|---|---|
| committer | efiacor <fiachra.corcoran@est.tech> | 2021-12-07 12:36:35 +0000 |
| commit | 370c6dc33e55bfee7b3b79bcc21481b02a3f1e24 (patch) | |
| tree | f687912dcc35388a56a4fdacd9bddc81c667ff95 /kubernetes/aaf | |
| parent | 71a47c57fa84a36bb12bf3b87ad0d18b142c8d37 (diff) | |
[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
Diffstat (limited to 'kubernetes/aaf')
40 files changed, 272 insertions, 483 deletions
diff --git a/kubernetes/aaf/Chart.yaml b/kubernetes/aaf/Chart.yaml index 0a4168b7da..2c51172dfb 100644 --- a/kubernetes/aaf/Chart.yaml +++ b/kubernetes/aaf/Chart.yaml @@ -1,6 +1,7 @@ # Copyright © 2018 ZTE # Modifications Copyright © 2018 AT&T, 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. @@ -14,7 +15,49 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP Application Authorization Framework name: aaf -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: aaf-cass + version: ~10.x-0 + repository: 'file://components/aaf-cass' + condition: aaf-authz.enabled + - name: aaf-cm + version: ~10.x-0 + repository: 'file://components/aaf-cm' + condition: aaf-authz.enabled + - name: aaf-fs + version: ~10.x-0 + repository: 'file://components/aaf-fs' + condition: aaf-authz.enabled + - name: aaf-gui + version: ~10.x-0 + repository: 'file://components/aaf-gui' + condition: aaf-authz.enabled + - name: aaf-hello + version: ~10.x-0 + repository: 'file://components/aaf-hello' + condition: aaf-hello.enabled + - name: aaf-locate + version: ~10.x-0 + repository: 'file://components/aaf-locate' + condition: aaf-authz.enabled + - name: aaf-oauth + version: ~10.x-0 + repository: 'file://components/aaf-oauth' + condition: aaf-authz.enabled + - name: aaf-service + version: ~10.x-0 + repository: 'file://components/aaf-service' + condition: aaf-authz.enabled + - name: aaf-sms + version: ~10.x-0 + repository: 'file://components/aaf-sms' + condition: aaf-sms.enabled + - name: aaf-sshsm + version: ~10.x-0 + repository: 'file://components/aaf-sshsm' + condition: aaf-sshsm.enabled diff --git a/kubernetes/aaf/Makefile b/kubernetes/aaf/Makefile index 764533e624..dbb84a1eff 100644 --- a/kubernetes/aaf/Makefile +++ b/kubernetes/aaf/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/aaf/components/Makefile b/kubernetes/aaf/components/Makefile index bf267b7720..f4c9784bc4 100644 --- a/kubernetes/aaf/components/Makefile +++ b/kubernetes/aaf/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/aaf/components/aaf-cass/Chart.yaml b/kubernetes/aaf/components/aaf-cass/Chart.yaml index ab6858ce8e..3f1394cc87 100644 --- a/kubernetes/aaf/components/aaf-cass/Chart.yaml +++ b/kubernetes/aaf/components/aaf-cass/Chart.yaml @@ -1,5 +1,6 @@ # Copyright © 2018 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,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP AAF cassandra name: aaf-cass -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' diff --git a/kubernetes/aaf/components/aaf-cass/requirements.yaml b/kubernetes/aaf/components/aaf-cass/requirements.yaml deleted file mode 100644 index ac7f3c6875..0000000000 --- a/kubernetes/aaf/components/aaf-cass/requirements.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright © 2020-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' diff --git a/kubernetes/aaf/components/aaf-cm/Chart.yaml b/kubernetes/aaf/components/aaf-cm/Chart.yaml index 8d0566eed9..ab91b7252b 100644 --- a/kubernetes/aaf/components/aaf-cm/Chart.yaml +++ b/kubernetes/aaf/components/aaf-cm/Chart.yaml @@ -1,6 +1,7 @@ # Copyright © 2017 Amdocs, Bell Canada # Modifications Copyright © 2018 AT&T, ZTE # 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,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP AAF Certificate Manager name: aaf-cm -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: aaf-templates + version: ~10.x-0 + repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-cm/requirements.yaml b/kubernetes/aaf/components/aaf-cm/requirements.yaml deleted file mode 100644 index 5086cc977c..0000000000 --- a/kubernetes/aaf/components/aaf-cm/requirements.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright © 2020-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: aaf-templates - version: ~9.x-0 - repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-fs/Chart.yaml b/kubernetes/aaf/components/aaf-fs/Chart.yaml index 28c05e71b1..72b7133f24 100644 --- a/kubernetes/aaf/components/aaf-fs/Chart.yaml +++ b/kubernetes/aaf/components/aaf-fs/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,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP AAF File Server name: aaf-fs -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: aaf-templates + version: ~10.x-0 + repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-fs/requirements.yaml b/kubernetes/aaf/components/aaf-fs/requirements.yaml deleted file mode 100644 index 5086cc977c..0000000000 --- a/kubernetes/aaf/components/aaf-fs/requirements.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright © 2020-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: aaf-templates - version: ~9.x-0 - repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-gui/Chart.yaml b/kubernetes/aaf/components/aaf-gui/Chart.yaml index 81a51e686c..be01174cea 100644 --- a/kubernetes/aaf/components/aaf-gui/Chart.yaml +++ b/kubernetes/aaf/components/aaf-gui/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,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP AAF GUI name: aaf-gui -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: aaf-templates + version: ~10.x-0 + repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-gui/requirements.yaml b/kubernetes/aaf/components/aaf-gui/requirements.yaml deleted file mode 100644 index 5086cc977c..0000000000 --- a/kubernetes/aaf/components/aaf-gui/requirements.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright © 2020-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: aaf-templates - version: ~9.x-0 - repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-hello/Chart.yaml b/kubernetes/aaf/components/aaf-hello/Chart.yaml index 872491428b..5a368d5430 100644 --- a/kubernetes/aaf/components/aaf-hello/Chart.yaml +++ b/kubernetes/aaf/components/aaf-hello/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,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP AAF Hello name: aaf-hello -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: aaf-templates + version: ~10.x-0 + repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-hello/requirements.yaml b/kubernetes/aaf/components/aaf-hello/requirements.yaml deleted file mode 100644 index 5086cc977c..0000000000 --- a/kubernetes/aaf/components/aaf-hello/requirements.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright © 2020-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: aaf-templates - version: ~9.x-0 - repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-locate/Chart.yaml b/kubernetes/aaf/components/aaf-locate/Chart.yaml index 947284df14..15ac5ee554 100644 --- a/kubernetes/aaf/components/aaf-locate/Chart.yaml +++ b/kubernetes/aaf/components/aaf-locate/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,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP AAF Locate name: aaf-locate -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: aaf-templates + version: ~10.x-0 + repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-locate/requirements.yaml b/kubernetes/aaf/components/aaf-locate/requirements.yaml deleted file mode 100644 index 5086cc977c..0000000000 --- a/kubernetes/aaf/components/aaf-locate/requirements.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright © 2020-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: aaf-templates - version: ~9.x-0 - repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-oauth/Chart.yaml b/kubernetes/aaf/components/aaf-oauth/Chart.yaml index 3c48c63cbf..31239e9f68 100644 --- a/kubernetes/aaf/components/aaf-oauth/Chart.yaml +++ b/kubernetes/aaf/components/aaf-oauth/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,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP AAF OAuth name: aaf-oauth -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: aaf-templates + version: ~10.x-0 + repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-oauth/requirements.yaml b/kubernetes/aaf/components/aaf-oauth/requirements.yaml deleted file mode 100644 index 5086cc977c..0000000000 --- a/kubernetes/aaf/components/aaf-oauth/requirements.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright © 2020-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: aaf-templates - version: ~9.x-0 - repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-service/Chart.yaml b/kubernetes/aaf/components/aaf-service/Chart.yaml index 33df46f21e..5cd6cc5a83 100644 --- a/kubernetes/aaf/components/aaf-service/Chart.yaml +++ b/kubernetes/aaf/components/aaf-service/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,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP AAF Service name: aaf-service -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: aaf-templates + version: ~10.x-0 + repository: 'file://../aaf-templates'
\ No newline at end of file diff --git a/kubernetes/aaf/components/aaf-service/requirements.yaml b/kubernetes/aaf/components/aaf-service/requirements.yaml deleted file mode 100644 index 5086cc977c..0000000000 --- a/kubernetes/aaf/components/aaf-service/requirements.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright © 2020-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: aaf-templates - version: ~9.x-0 - repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-sms/Chart.yaml b/kubernetes/aaf/components/aaf-sms/Chart.yaml index 3e315fbd40..c3e1692dc9 100644 --- a/kubernetes/aaf/components/aaf-sms/Chart.yaml +++ b/kubernetes/aaf/components/aaf-sms/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 Secret Management Service name: aaf-sms -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: certInitializer + version: ~10.x-0 + repository: '@local' + - name: aaf-sms-quorumclient + version: ~10.x-0 + repository: 'file://components/aaf-sms-quorumclient' + - name: aaf-sms-vault + version: ~10.x-0 + repository: 'file://components/aaf-sms-vault' diff --git a/kubernetes/aaf/components/aaf-sms/Makefile b/kubernetes/aaf/components/aaf-sms/Makefile index 4c79718d02..51d7de122c 100644 --- a/kubernetes/aaf/components/aaf-sms/Makefile +++ b/kubernetes/aaf/components/aaf-sms/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/aaf/components/aaf-sms/components/Makefile b/kubernetes/aaf/components/aaf-sms/components/Makefile index bf267b7720..f4c9784bc4 100644 --- a/kubernetes/aaf/components/aaf-sms/components/Makefile +++ b/kubernetes/aaf/components/aaf-sms/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/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml index 2b879571ad..b777223e89 100644 --- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml +++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/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,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP Secret Management Service Quorum Client name: aaf-sms-quorumclient -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' diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml deleted file mode 100644 index ac7f3c6875..0000000000 --- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright © 2020-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' diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml index b05165e4da..b3935d4372 100644 --- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml +++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/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,8 +14,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: Chart to launch Vault as SMS backend name: aaf-sms-vault appVersion: 0.9.5 -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' diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml deleted file mode 100644 index ac7f3c6875..0000000000 --- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright © 2020-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' diff --git a/kubernetes/aaf/components/aaf-sms/requirements.yaml b/kubernetes/aaf/components/aaf-sms/requirements.yaml deleted file mode 100644 index 0cbd2a2edd..0000000000 --- a/kubernetes/aaf/components/aaf-sms/requirements.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright © 2020-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: certInitializer - version: ~9.x-0 - repository: '@local' - - name: aaf-sms-quorumclient - version: ~9.x-0 - repository: 'file://components/aaf-sms-quorumclient' - - name: aaf-sms-vault - version: ~9.x-0 - repository: 'file://components/aaf-sms-vault' diff --git a/kubernetes/aaf/components/aaf-sshsm/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/Chart.yaml index 9bf0e7b47c..a7fd8f5fe2 100644 --- a/kubernetes/aaf/components/aaf-sshsm/Chart.yaml +++ b/kubernetes/aaf/components/aaf-sshsm/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,27 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP Hardware Security Components name: aaf-sshsm -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: aaf-sshsm-abrmd + version: ~10.x-0 + repository: 'file://components/aaf-sshsm-abrmd' + condition: aaf-sshsm-abrmd.enabled + - name: aaf-sshsm-distcenter + version: ~10.x-0 + repository: 'file://components/aaf-sshsm-distcenter' + condition: aaf-sshsm-distcenter.enabled + - name: aaf-sshsm-testca + version: ~10.x-0 + repository: 'file://components/aaf-sshsm-testca' + condition: aaf-sshsm-testca.testca.enabled diff --git a/kubernetes/aaf/components/aaf-sshsm/Makefile b/kubernetes/aaf/components/aaf-sshsm/Makefile index 4c79718d02..51d7de122c 100644 --- a/kubernetes/aaf/components/aaf-sshsm/Makefile +++ b/kubernetes/aaf/components/aaf-sshsm/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/aaf/components/aaf-sshsm/components/Makefile b/kubernetes/aaf/components/aaf-sshsm/components/Makefile index bf267b7720..f4c9784bc4 100644 --- a/kubernetes/aaf/components/aaf-sshsm/components/Makefile +++ b/kubernetes/aaf/components/aaf-sshsm/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/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml index 4908c68780..f9dd2b9cb2 100644 --- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml +++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/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,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP Trusted Platform Module Resource Manager name: aaf-sshsm-abrmd -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' diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml deleted file mode 100644 index 96c6cddeb8..0000000000 --- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2018 Intel Corporation, Inc -# 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' diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml index d237c7b92f..1f6b6f9afb 100644 --- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml +++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/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,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP Trusted Platform Module Distribution Center name: aaf-sshsm-distcenter -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' diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml deleted file mode 100644 index 96c6cddeb8..0000000000 --- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2018 Intel Corporation, Inc -# 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' diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml index baa354e490..73ff507f91 100644 --- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml +++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/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,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP Trusted Platform Module Test CA Service name: aaf-sshsm-testca -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' diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml deleted file mode 100644 index 96c6cddeb8..0000000000 --- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2018 Intel Corporation, Inc -# 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' diff --git a/kubernetes/aaf/components/aaf-sshsm/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/requirements.yaml deleted file mode 100644 index e39cac8f0f..0000000000 --- a/kubernetes/aaf/components/aaf-sshsm/requirements.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2018 Intel Corporation, Inc -# 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: aaf-sshsm-abrmd - version: ~9.x-0 - repository: 'file://components/aaf-sshsm-abrmd' - condition: aaf-sshsm-abrmd.enabled - - name: aaf-sshsm-distcenter - version: ~9.x-0 - repository: 'file://components/aaf-sshsm-distcenter' - condition: aaf-sshsm-distcenter.enabled - - name: aaf-sshsm-testca - version: ~9.x-0 - repository: 'file://components/aaf-sshsm-testca' - condition: aaf-sshsm-testca.testca.enabled diff --git a/kubernetes/aaf/components/aaf-templates/Chart.yaml b/kubernetes/aaf/components/aaf-templates/Chart.yaml index 708def6e19..9d0ecad16e 100644 --- a/kubernetes/aaf/components/aaf-templates/Chart.yaml +++ b/kubernetes/aaf/components/aaf-templates/Chart.yaml @@ -1,4 +1,5 @@ # Copyright © 2020-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. @@ -12,7 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP Application Authorization Framework Templates name: aaf-templates -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/aaf/components/aaf-templates/requirements.yaml b/kubernetes/aaf/components/aaf-templates/requirements.yaml deleted file mode 100644 index 392fda15b4..0000000000 --- a/kubernetes/aaf/components/aaf-templates/requirements.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright © 2020-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' diff --git a/kubernetes/aaf/requirements.yaml b/kubernetes/aaf/requirements.yaml deleted file mode 100644 index 2bf9b2862e..0000000000 --- a/kubernetes/aaf/requirements.yaml +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright © 2017 Amdocs, Bell Canada -# Modifications Copyright © 2018 AT&T -# Modifications Copyright © 2020-2021 Orange -# Modifications Copyright © 2020 Nokia -# -# 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: aaf-cass - version: ~9.x-0 - repository: 'file://components/aaf-cass' - condition: aaf-authz.enabled - - name: aaf-cm - version: ~9.x-0 - repository: 'file://components/aaf-cm' - condition: aaf-authz.enabled - - name: aaf-fs - version: ~9.x-0 - repository: 'file://components/aaf-fs' - condition: aaf-authz.enabled - - name: aaf-gui - version: ~9.x-0 - repository: 'file://components/aaf-gui' - condition: aaf-authz.enabled - - name: aaf-hello - version: ~9.x-0 - repository: 'file://components/aaf-hello' - condition: aaf-hello.enabled - - name: aaf-locate - version: ~9.x-0 - repository: 'file://components/aaf-locate' - condition: aaf-authz.enabled - - name: aaf-oauth - version: ~9.x-0 - repository: 'file://components/aaf-oauth' - condition: aaf-authz.enabled - - name: aaf-service - version: ~9.x-0 - repository: 'file://components/aaf-service' - condition: aaf-authz.enabled - - name: aaf-sms - version: ~9.x-0 - repository: 'file://components/aaf-sms' - condition: aaf-sms.enabled - - name: aaf-sshsm - version: ~9.x-0 - repository: 'file://components/aaf-sshsm' - condition: aaf-sshsm.enabled |