diff options
Diffstat (limited to 'kubernetes/sdnc')
| -rw-r--r-- | kubernetes/sdnc/Chart.yaml | 62 | ||||
| -rw-r--r-- | kubernetes/sdnc/Makefile | 4 | ||||
| -rw-r--r-- | kubernetes/sdnc/components/Makefile | 4 | ||||
| -rw-r--r-- | kubernetes/sdnc/components/dmaap-listener/Chart.yaml | 15 | ||||
| -rw-r--r-- | kubernetes/sdnc/components/dmaap-listener/requirements.yaml | 25 | ||||
| -rw-r--r-- | kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml | 16 | ||||
| -rw-r--r-- | kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml | 25 | ||||
| -rw-r--r-- | kubernetes/sdnc/components/sdnc-prom/Chart.yaml | 16 | ||||
| -rw-r--r-- | kubernetes/sdnc/components/sdnc-prom/requirements.yaml | 25 | ||||
| -rw-r--r-- | kubernetes/sdnc/components/sdnc-web/Chart.yaml | 18 | ||||
| -rw-r--r-- | kubernetes/sdnc/components/sdnc-web/requirements.yaml | 29 | ||||
| -rw-r--r-- | kubernetes/sdnc/components/ueb-listener/Chart.yaml | 16 | ||||
| -rw-r--r-- | kubernetes/sdnc/components/ueb-listener/requirements.yaml | 25 | ||||
| -rw-r--r-- | kubernetes/sdnc/requirements.yaml | 73 |
14 files changed, 135 insertions, 218 deletions
diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml index c75a17c742..b30efc10c1 100644 --- a/kubernetes/sdnc/Chart.yaml +++ b/kubernetes/sdnc/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,64 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: SDN Controller name: sdnc -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: certManagerCertificate + version: ~10.x-0 + repository: '@local' + - name: logConfiguration + version: ~10.x-0 + repository: '@local' + - name: network-name-gen + version: ~10.x-0 + repository: '@local' + condition: network-name-gen.enabled + - name: dgbuilder + version: ~10.x-0 + repository: '@local' + condition: dgbuilder.enabled + - name: sdnc-prom + version: ~10.x-0 + repository: '@local' + condition: config.geoEnabled + - name: mariadb-galera + version: ~10.x-0 + repository: '@local' + condition: global.mariadbGalera.localCluster + - name: elasticsearch + version: ~10.x-0 + repository: '@local' + condition: config.sdnr.enabled + # conditions for sdnc-subcharts + - name: dmaap-listener + version: ~10.x-0 + repository: 'file://components/dmaap-listener/' + condition: sdnc.dmaap-listener.enabled,dmaap-listener.enabled + - name: ueb-listener + version: ~10.x-0 + repository: 'file://components/ueb-listener/' + condition: sdnc.ueb-listener.enabled,ueb-listener.enabled + - name: sdnc-ansible-server + version: ~10.x-0 + repository: 'file://components/sdnc-ansible-server/' + condition: sdnc.sdnc-ansible-server.enabled,sdnc-ansible-server.enabled + - name: sdnc-web + version: ~10.x-0 + repository: 'file://components/sdnc-web/' + condition: sdnc.sdnc-web.enabled,sdnc-web.enabled + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/sdnc/Makefile b/kubernetes/sdnc/Makefile index 32b3b728d7..88bcb82057 100644 --- a/kubernetes/sdnc/Makefile +++ b/kubernetes/sdnc/Makefile @@ -35,7 +35,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 @@ -50,7 +50,7 @@ endif @$(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/sdnc/components/Makefile b/kubernetes/sdnc/components/Makefile index 313cca8c27..7604b56342 100644 --- a/kubernetes/sdnc/components/Makefile +++ b/kubernetes/sdnc/components/Makefile @@ -35,7 +35,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 @@ -50,7 +50,7 @@ endif @$(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/sdnc/components/dmaap-listener/Chart.yaml b/kubernetes/sdnc/components/dmaap-listener/Chart.yaml index 29161ae194..1d027ee089 100644 --- a/kubernetes/sdnc/components/dmaap-listener/Chart.yaml +++ b/kubernetes/sdnc/components/dmaap-listener/Chart.yaml @@ -13,7 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: SDNC DMaaP Listener name: dmaap-listener -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: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/sdnc/components/dmaap-listener/requirements.yaml b/kubernetes/sdnc/components/dmaap-listener/requirements.yaml deleted file mode 100644 index 6056f41181..0000000000 --- a/kubernetes/sdnc/components/dmaap-listener/requirements.yaml +++ /dev/null @@ -1,25 +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: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml index 02447f161e..c61b4e012d 100644 --- a/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml +++ b/kubernetes/sdnc/components/sdnc-ansible-server/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: SDN-C Ansible Server name: sdnc-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' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml deleted file mode 100644 index 6056f41181..0000000000 --- a/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml +++ /dev/null @@ -1,25 +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: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/sdnc/components/sdnc-prom/Chart.yaml b/kubernetes/sdnc/components/sdnc-prom/Chart.yaml index f49cbbe2b3..956c6073dc 100644 --- a/kubernetes/sdnc/components/sdnc-prom/Chart.yaml +++ b/kubernetes/sdnc/components/sdnc-prom/Chart.yaml @@ -1,5 +1,6 @@ # Copyright © 2018 Amdocs # 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 SDNC Policy Driven Ownership Management name: sdnc-prom -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: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/sdnc/components/sdnc-prom/requirements.yaml b/kubernetes/sdnc/components/sdnc-prom/requirements.yaml deleted file mode 100644 index 0a47ac4fb8..0000000000 --- a/kubernetes/sdnc/components/sdnc-prom/requirements.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright © 2018 Amdocs -# 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: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/sdnc/components/sdnc-web/Chart.yaml b/kubernetes/sdnc/components/sdnc-web/Chart.yaml index 1482c3b91c..fbb7ca0cb2 100644 --- a/kubernetes/sdnc/components/sdnc-web/Chart.yaml +++ b/kubernetes/sdnc/components/sdnc-web/Chart.yaml @@ -13,7 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: SDN-C Web Server name: sdnc-web -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' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/sdnc/components/sdnc-web/requirements.yaml b/kubernetes/sdnc/components/sdnc-web/requirements.yaml deleted file mode 100644 index 96588e36bb..0000000000 --- a/kubernetes/sdnc/components/sdnc-web/requirements.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright © 2020 highstreet technologies GmbH -# 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: '@local' - - name: certInitializer - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/sdnc/components/ueb-listener/Chart.yaml b/kubernetes/sdnc/components/ueb-listener/Chart.yaml index 86407430ba..ffaa1b7cca 100644 --- a/kubernetes/sdnc/components/ueb-listener/Chart.yaml +++ b/kubernetes/sdnc/components/ueb-listener/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: SDNC UEB Listener name: ueb-listener -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: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/sdnc/components/ueb-listener/requirements.yaml b/kubernetes/sdnc/components/ueb-listener/requirements.yaml deleted file mode 100644 index 6056f41181..0000000000 --- a/kubernetes/sdnc/components/ueb-listener/requirements.yaml +++ /dev/null @@ -1,25 +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: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/sdnc/requirements.yaml b/kubernetes/sdnc/requirements.yaml deleted file mode 100644 index 58c8e60ae3..0000000000 --- a/kubernetes/sdnc/requirements.yaml +++ /dev/null @@ -1,73 +0,0 @@ - -# Copyright © 2017 Amdocs, Bell Canada, -# Copyright © 2020 highstreet technologies GmbH -# Copyright © 2021 Nokia -# 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: certManagerCertificate - version: ~9.x-0 - repository: '@local' - - name: logConfiguration - version: ~9.x-0 - repository: '@local' - - name: network-name-gen - version: ~9.x-0 - repository: '@local' - condition: network-name-gen.enabled - - name: dgbuilder - version: ~9.x-0 - repository: '@local' - condition: dgbuilder.enabled - - name: sdnc-prom - version: ~9.x-0 - repository: '@local' - condition: config.geoEnabled - - name: mariadb-galera - version: ~9.x-0 - repository: '@local' - condition: global.mariadbGalera.localCluster - - name: elasticsearch - version: ~9.x-0 - repository: '@local' - condition: config.sdnr.enabled - # conditions for sdnc-subcharts - - name: dmaap-listener - version: ~9.x-0 - repository: 'file://components/dmaap-listener/' - condition: sdnc.dmaap-listener.enabled,dmaap-listener.enabled - - name: ueb-listener - version: ~9.x-0 - repository: 'file://components/ueb-listener/' - condition: sdnc.ueb-listener.enabled,ueb-listener.enabled - - name: sdnc-ansible-server - version: ~9.x-0 - repository: 'file://components/sdnc-ansible-server/' - condition: sdnc.sdnc-ansible-server.enabled,sdnc-ansible-server.enabled - - name: sdnc-web - version: ~9.x-0 - repository: 'file://components/sdnc-web/' - condition: sdnc.sdnc-web.enabled,sdnc-web.enabled - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' |