diff options
Diffstat (limited to 'kubernetes/appc')
| -rw-r--r-- | kubernetes/appc/Chart.yaml | 27 | ||||
| -rw-r--r-- | kubernetes/appc/Makefile | 4 | ||||
| -rw-r--r-- | kubernetes/appc/components/Makefile | 4 | ||||
| -rw-r--r-- | kubernetes/appc/components/appc-ansible-server/Chart.yaml | 13 | ||||
| -rw-r--r-- | kubernetes/appc/components/appc-ansible-server/requirements.yaml | 22 | ||||
| -rw-r--r-- | kubernetes/appc/components/appc-cdt/Chart.yaml | 16 | ||||
| -rw-r--r-- | kubernetes/appc/components/appc-cdt/requirements.yaml | 25 | ||||
| -rw-r--r-- | kubernetes/appc/requirements.yaml | 36 |
8 files changed, 54 insertions, 93 deletions
diff --git a/kubernetes/appc/Chart.yaml b/kubernetes/appc/Chart.yaml index 99b838899f..d08a83ec4d 100644 --- a/kubernetes/appc/Chart.yaml +++ b/kubernetes/appc/Chart.yaml @@ -1,6 +1,7 @@ # Copyright © 2017 Amdocs, Bell Canada # Modifications Copyright © 2018 AT&T # 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 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: Application Controller name: appc -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' + - name: dgbuilder + version: ~10.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' + - name: appc-ansible-server + version: ~10.x-0 + repository: 'file://components/appc-ansible-server' + condition: appc-ansible-server.enabled + - name: appc-cdt + version: ~10.x-0 + repository: 'file://components/appc-cdt' + condition: appc-cdt.enabled diff --git a/kubernetes/appc/Makefile b/kubernetes/appc/Makefile index 4c79718d02..51d7de122c 100644 --- a/kubernetes/appc/Makefile +++ b/kubernetes/appc/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/appc/components/Makefile b/kubernetes/appc/components/Makefile index f2e7a1fb82..1ea8433a9c 100644 --- a/kubernetes/appc/components/Makefile +++ b/kubernetes/appc/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/appc/components/appc-ansible-server/Chart.yaml b/kubernetes/appc/components/appc-ansible-server/Chart.yaml index 6896de06a6..6bdd1ecaef 100644 --- a/kubernetes/appc/components/appc-ansible-server/Chart.yaml +++ b/kubernetes/appc/components/appc-ansible-server/Chart.yaml @@ -1,5 +1,6 @@ # Copyright © 2018 Amdocs, Bell Canada, AT&T # 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 APPC Ansible Server name: appc-ansible-server -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/appc/components/appc-ansible-server/requirements.yaml b/kubernetes/appc/components/appc-ansible-server/requirements.yaml deleted file mode 100644 index 0cbc5060f2..0000000000 --- a/kubernetes/appc/components/appc-ansible-server/requirements.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright © 2018 Amdocs, Bell Canada, AT&T -# 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/appc/components/appc-cdt/Chart.yaml b/kubernetes/appc/components/appc-cdt/Chart.yaml index e8e41770f1..3cb22a4db6 100644 --- a/kubernetes/appc/components/appc-cdt/Chart.yaml +++ b/kubernetes/appc/components/appc-cdt/Chart.yaml @@ -1,5 +1,6 @@ # Copyright © 2018 AT&T, Amdocs, Bell Canada 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,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP APPC Self Service Controller Design Tool name: appc-cdt -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' + - name: certInitializer + version: ~10.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/appc/components/appc-cdt/requirements.yaml b/kubernetes/appc/components/appc-cdt/requirements.yaml deleted file mode 100644 index 517e284379..0000000000 --- a/kubernetes/appc/components/appc-cdt/requirements.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright © 2018 AT&T, Amdocs, Bell Canada 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: '@local' - - name: certInitializer - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/appc/requirements.yaml b/kubernetes/appc/requirements.yaml deleted file mode 100644 index 886e216704..0000000000 --- a/kubernetes/appc/requirements.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright © 2018 AT&T, Amdocs, Bell Canada 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: '@local' - - name: mariadb-galera - version: ~9.x-0 - repository: '@local' - - name: dgbuilder - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: appc-ansible-server - version: ~9.x-0 - repository: 'file://components/appc-ansible-server' - condition: appc-ansible-server.enabled - - name: appc-cdt - version: ~9.x-0 - repository: 'file://components/appc-cdt' - condition: appc-cdt.enabled |