diff options
Diffstat (limited to 'kubernetes/dcaegen2-services')
48 files changed, 535 insertions, 853 deletions
diff --git a/kubernetes/dcaegen2-services/Chart.yaml b/kubernetes/dcaegen2-services/Chart.yaml index 058d142659..609d78b6f4 100644 --- a/kubernetes/dcaegen2-services/Chart.yaml +++ b/kubernetes/dcaegen2-services/Chart.yaml @@ -2,6 +2,7 @@ # ================================================================================ # Copyright (c) 2020 J. F. Lucas. 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. @@ -16,8 +17,89 @@ # limitations under the License. # ============LICENSE_END========================================================= -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE Microservices name: dcaegen2-services -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' + - name: dcae-bbs-eventprocessor-ms + version: ~10.x-0 + repository: '@local' + condition: dcae-bbs-eventprocessor-ms.enabled + - name: dcae-datafile-collector + version: ~10.x-0 + repository: '@local' + condition: dcae-datafile-collector.enabled + - name: dcae-datalake-admin-ui + version: ~10.x-0 + repository: '@local' + condition: dcae-datalake-admin-ui.enabled + - name: dcae-datalake-des + version: ~10.x-0 + repository: '@local' + condition: dcae-datalake-des.enabled + - name: dcae-datalake-feeder + version: ~10.x-0 + repository: '@local' + condition: dcae-datalake-feeder.enabled + - name: dcae-heartbeat + version: ~10.x-0 + repository: '@local' + condition: dcae-heartbeat.enabled + - name: dcae-hv-ves-collector + version: ~10.x-0 + repository: '@local' + condition: dcae-hv-ves-collector.enabled + - name: dcae-kpi-ms + version: ~10.x-0 + repository: '@local' + condition: dcae-kpi-ms.enabled + - name: dcae-ms-healthcheck + version: ~10.x-0 + repository: '@local' + condition: dcae-ms-healthcheck.enabled + - name: dcae-pm-mapper + version: ~10.x-0 + repository: '@local' + condition: dcae-pm-mapper.enabled + - name: dcae-pmsh + version: ~10.x-0 + repository: '@local' + condition: dcae-pmsh.enabled + - name: dcae-prh + version: ~10.x-0 + repository: '@local' + condition: dcae-prh.enabled + - name: dcae-restconf-collector + version: ~10.x-0 + repository: '@local' + condition: dcae-restconf-collector.enabled + - name: dcae-slice-analysis-ms + version: ~10.x-0 + repository: '@local' + condition: dcae-slice-analysis-ms.enabled + - name: dcae-snmptrap-collector + version: ~10.x-0 + repository: '@local' + condition: dcae-snmptrap-collector.enabled + - name: dcae-son-handler + version: ~10.x-0 + repository: '@local' + condition: dcae-son-handler.enabled + - name: dcae-tcagen2 + version: ~10.x-0 + repository: '@local' + condition: dcae-tcagen2.enabled + - name: dcae-ves-collector + version: ~10.x-0 + repository: '@local' + condition: dcae-ves-collector.enabled + - name: dcae-ves-mapper + version: ~10.x-0 + repository: '@local' + condition: dcae-ves-mapper.enabled diff --git a/kubernetes/dcaegen2-services/Makefile b/kubernetes/dcaegen2-services/Makefile index 70bb031af3..0e0560c68e 100644 --- a/kubernetes/dcaegen2-services/Makefile +++ b/kubernetes/dcaegen2-services/Makefile @@ -36,7 +36,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 @@ -47,7 +47,7 @@ package-%: lint-% @sleep 3 clean: - @rm -f */requirements.lock + @rm -f */Chart.lock @rm -f *tgz */charts/*tgz @rm -rf $(PACKAGE_DIR) %: diff --git a/kubernetes/dcaegen2-services/common/Makefile b/kubernetes/dcaegen2-services/common/Makefile index db8704c2ca..9a84ab8375 100644 --- a/kubernetes/dcaegen2-services/common/Makefile +++ b/kubernetes/dcaegen2-services/common/Makefile @@ -43,7 +43,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 @@ -54,7 +54,7 @@ package-%: lint-% @sleep 3 clean: - @rm -f */requirements.lock + @rm -f */Chart.lock @rm -f *tgz */charts/*tgz @rm -rf $(PACKAGE_DIR) diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml index 6f9b3fd0e7..b3c0146aed 100644 --- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml +++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml @@ -2,6 +2,7 @@ # ================================================================================ # Copyright (c) 2020 J. F. Lucas. 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. @@ -16,8 +17,13 @@ # limitations under the License. # ============LICENSE_END========================================================= -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE Microservices Common templates name: dcaegen2-services-common -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml deleted file mode 100644 index 03f8b38bbc..0000000000 --- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2021 J. F. Lucas. 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' diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl index aac0f4b3a9..5ba7d2977a 100644 --- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl +++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl @@ -229,10 +229,12 @@ policies: {{- $policy := default dict .Values.policies -}} {{- $policyRls := default $commonRelease $policy.policyRelease -}} {{- $drFeedConfig := default "" .Values.drFeedConfig -}} - +{{- $dcaeName := print (include "common.fullname" .) }} +{{- $dcaeLabel := (dict "dcaeMicroserviceName" $dcaeName) -}} +{{- $dot := . -}} apiVersion: apps/v1 kind: Deployment -metadata: {{- include "common.resourceMetadata" . | nindent 2 }} +metadata: {{- include "common.resourceMetadata" (dict "dot" $dot "labels" $dcaeLabel) | nindent 2 }} spec: replicas: 1 selector: {{- include "common.selectors" . | nindent 4 }} diff --git a/kubernetes/dcaegen2-services/components/Makefile b/kubernetes/dcaegen2-services/components/Makefile index 284f99de6b..0f8aa99e0e 100644 --- a/kubernetes/dcaegen2-services/components/Makefile +++ b/kubernetes/dcaegen2-services/components/Makefile @@ -36,7 +36,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 @@ -47,7 +47,7 @@ package-%: lint-% @sleep 5 clean: - @rm -f */requirements.lock + @rm -f */Chart.lock @rm -f *tgz */charts/*tgz @rm -rf $(PACKAGE_DIR) diff --git a/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml index 65944ff296..5463d37a6e 100644 --- a/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml @@ -2,6 +2,7 @@ # ============================================================================ # Copyright (c) 2021 AT&T Intellectual Property # 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. @@ -16,8 +17,25 @@ # limitations under the License. # ================================= LICENSE_END ============================== -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE BBS-EventProcessor Microservice name: dcae-bbs-eventprocessor-ms -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' + - name: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/requirements.yaml deleted file mode 100644 index b02251cc51..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/requirements.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# ================================ LICENSE_START ============================= -# ============================================================================ -# Copyright (c) 2021 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. -# ================================= LICENSE_END ============================== - -dependencies: - - name: common - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml index 2c5ecf9136..36edd4b6ae 100644 --- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml @@ -2,6 +2,7 @@ # ============================================================================ # Copyright (C) 2021 Nordix Foundation. # 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. @@ -16,8 +17,28 @@ # limitations under the License. # ================================= LICENSE_END ============================== -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE DataFile Collector Helm charts name: dcae-datafile-collector -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' + - name: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' + - name: certManagerCertificate + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/requirements.yaml deleted file mode 100644 index a8c98985e3..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/requirements.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# ================================ LICENSE_START ============================= -# ============================================================================ -# Copyright (C) 2021 Nordix Foundation. -# 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. -# ================================= LICENSE_END ============================== - -dependencies: - - name: common - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: certManagerCertificate - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml index 24bb8e054a..d61a50c7bd 100644 --- a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml @@ -2,6 +2,7 @@ # ================================================================================ # Copyright (c) 2021 Wipro Limited. # 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. @@ -16,8 +17,25 @@ # limitations under the License. # ============LICENSE_END========================================================= -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE datalake-admin-ui helm chart name: dcae-datalake-admin-ui -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: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/requirements.yaml deleted file mode 100644 index af5b3bc1df..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/requirements.yaml +++ /dev/null @@ -1,34 +0,0 @@ -#============LICENSE_START======================================================== -# ================================================================================ -# Copyright (c) 2021 Wipro Limited. -# 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. -# ============LICENSE_END========================================================= - -dependencies: - - name: common - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml index aa4c2178b1..7d2f36c350 100644 --- a/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml @@ -2,6 +2,7 @@ # ============================================================================ # Copyright (C) 2021 Wipro Limited. # 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. @@ -16,8 +17,25 @@ # limitations under the License. # ================================= LICENSE_END ============================== -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE Datalake DES MS charts name: dcae-datalake-des -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: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-des/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-des/requirements.yaml deleted file mode 100644 index 0faf38079b..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-datalake-des/requirements.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# ================================ LICENSE_START ============================= -# ============================================================================ -# Copyright (C) 2021 Wipro Limited. -# 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. -# ================================= LICENSE_END ============================== - -dependencies: - - name: common - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml index 1b70dcd823..c62cbd1a0f 100644 --- a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml @@ -2,6 +2,7 @@ # ============================================================================ # Copyright (C) 2021 Wipro Limited # 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. @@ -16,8 +17,28 @@ # limitations under the License. # ================================= LICENSE_END ============================== -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE Datalake feeder MS charts name: dcae-datalake-feeder -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' + - name: postgres + version: ~10.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' + - name: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/requirements.yaml deleted file mode 100644 index a14fca9a35..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/requirements.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# ================================ LICENSE_START ============================= -# ============================================================================ -# Copyright (C) 2021 Wipro Limited. -# 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. -# ================================= LICENSE_END ============================== - -dependencies: - - name: common - version: ~9.x-0 - repository: '@local' - - name: postgres - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml index a350b9326d..207052f077 100644 --- a/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml @@ -2,6 +2,7 @@ # ============================================================================ # Copyright (c) 2021 AT&T Intellectual Property # 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. @@ -16,8 +17,28 @@ # limitations under the License. # ================================= LICENSE_END ============================== -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE Heartbeat Microservice name: dcae-heartbeat -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' + - name: postgres + version: ~10.x-0 + repository: '@local' + - name: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-heartbeat/requirements.yaml deleted file mode 100644 index dc8d47fc7d..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-heartbeat/requirements.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# ================================ LICENSE_START ============================= -# ============================================================================ -# Copyright (c) 2021 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. -# ================================= LICENSE_END ============================== - -dependencies: - - name: common - version: ~9.x-0 - repository: '@local' - - name: postgres - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml index 149b149951..30d73f3844 100644 --- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml @@ -2,6 +2,7 @@ # ================================================================================ # Copyright (c) 2021 J. F. Lucas. 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. @@ -16,8 +17,28 @@ # limitations under the License. # ============LICENSE_END========================================================= -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE HV VES collector name: dcae-hv-ves-collector -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: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: certManagerCertificate + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml deleted file mode 100644 index a0878282e2..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (c) 2021 J. F. Lucas. All rights reserved. -# Copyright (c) 2021 Nokia. All rights reserved. -# Copyright (c) 2021 AT&T. 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: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: certManagerCertificate - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml index 4fa84cbbc4..53b070ea90 100644 --- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml @@ -2,6 +2,7 @@ # ================================================================================ # Copyright (c) 2021 Wipro Limited. # 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. @@ -16,8 +17,25 @@ # limitations under the License. # ============LICENSE_END========================================================= -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE KPI MS chart name: dcae-kpi-ms -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' + - name: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/requirements.yaml deleted file mode 100644 index 824c63772c..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/requirements.yaml +++ /dev/null @@ -1,34 +0,0 @@ -#============LICENSE_START======================================================== -# ================================================================================ -# Copyright (c) 2021 Wipro Limited. -# 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. -# ============LICENSE_END========================================================= - -dependencies: - - name: common - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml index dbd20127cf..73331aa66a 100644 --- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml @@ -4,6 +4,7 @@ # Modifications Copyright © 2018 Amdocs, Bell Canada # Copyright (c) 2021 J. F. Lucas. 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. @@ -18,8 +19,19 @@ # limitations under the License. # ============LICENSE_END========================================================= -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: ONAP DCAE Microservice Health Check name: dcae-ms-healthcheck -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/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml deleted file mode 100644 index 747117cfd2..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml +++ /dev/null @@ -1,29 +0,0 @@ -#============LICENSE_START======================================================== -#================================================================================= -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. -# Modifications Copyright © 2018 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. -# ============LICENSE_END========================================================= - -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/dcaegen2-services/components/dcae-ms-healthcheck/templates/deployment.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/templates/deployment.yaml index 2b3ab328b5..4a51c7f9d8 100644 --- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/templates/deployment.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/templates/deployment.yaml @@ -59,6 +59,8 @@ spec: value: {{ include "common.namespace" . }} - name: HELM_RELEASE value: {{ include "common.release" . }} + - name: DEPLOY_LABEL + value: {{ .Values.deployLabel }} volumes: - name: {{ include "common.fullname" . }}-expected-components configMap: diff --git a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml index 58ae706e0a..3b47e7f70e 100644 --- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml @@ -31,6 +31,11 @@ service: - port: 8080 name: http +# Label on DCAE microservice deployments +# (Used by healthcheck code to find deployments +# created after initial DCAE installation) +deployLabel: dcaeMicroserviceName + # probe configuration parameters liveness: initialDelaySeconds: 10 @@ -43,7 +48,7 @@ readiness: initialDelaySeconds: 10 periodSeconds: 10 # application image -image: onap/org.onap.dcaegen2.deployments.healthcheck-container:2.3.0 +image: onap/org.onap.dcaegen2.deployments.healthcheck-container:2.4.0 # Resource Limit flavor -By Default using small flavor: small diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml index 5bd9b41ca6..d3a128f653 100644 --- a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml @@ -2,6 +2,7 @@ # ============================================================================ # Copyright (C) 2021 Nordix Foundation. # 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. @@ -16,8 +17,25 @@ # limitations under the License. # ================================= LICENSE_END ============================== -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE PM-Mapper Helm charts name: dcae-pm-mapper -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' + - name: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: 'file://../../common/dcaegen2-services-common' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/requirements.yaml deleted file mode 100644 index 404489c7ce..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/requirements.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# ================================ LICENSE_START ============================= -# ============================================================================ -# Copyright (C) 2021 Nordix Foundation. -# 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. -# ================================= LICENSE_END ============================== - -dependencies: - - name: common - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: 'file://../../common/dcaegen2-services-common' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml index 49ccae41ac..25f25e69cb 100644 --- a/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml @@ -3,6 +3,7 @@ # Copyright (C) 2021 Nordix Foundation. # Copyright (c) 2021 AT&T. 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. @@ -17,8 +18,28 @@ # limitations under the License. # ================================= LICENSE_END ============================== -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE PMSH Service name: dcae-pmsh -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' + - name: postgres + version: ~10.x-0 + repository: '@local' + - name: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-pmsh/requirements.yaml deleted file mode 100644 index 68c9165c5b..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-pmsh/requirements.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# ================================ LICENSE_START ============================= -# ============================================================================ -# Copyright (C) 2021 Nordix Foundation. -# 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. -# ================================= LICENSE_END ============================== - -dependencies: - - name: common - version: ~9.x-0 - repository: '@local' - - name: postgres - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml index 862033240a..14e5e87b89 100644 --- a/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml @@ -2,6 +2,7 @@ # ================================================================================ # Copyright (c) 2021 J. F. Lucas. 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. @@ -16,8 +17,25 @@ # limitations under the License. # ============LICENSE_END========================================================= -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE PRH name: dcae-prh -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: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml deleted file mode 100644 index 8006092485..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (c) 2021 J. F. Lucas. All rights reserved. -# Copyright (c) 2021 AT&T. 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: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml index 60445b11db..cec9575e9b 100644 --- a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml @@ -2,6 +2,7 @@ # ============================================================================ # Copyright (c) 2021 AT&T Intellectual Property # 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. @@ -16,8 +17,25 @@ # limitations under the License. # ================================= LICENSE_END ============================== -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE RESTConf Collector name: dcae-restconf-collector -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' + - name: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/requirements.yaml deleted file mode 100644 index b02251cc51..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/requirements.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# ================================ LICENSE_START ============================= -# ============================================================================ -# Copyright (c) 2021 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. -# ================================= LICENSE_END ============================== - -dependencies: - - name: common - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml index b77f104318..bee29cd923 100644 --- a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml @@ -2,6 +2,7 @@ # ================================================================================ # Copyright (c) 2021 Wipro Limited. # 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. @@ -16,8 +17,28 @@ # limitations under the License. # ============LICENSE_END========================================================= -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE SliceAnalysis MS charts name: dcae-slice-analysis-ms -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' + - name: postgres + version: ~10.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' + - name: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/requirements.yaml deleted file mode 100644 index ed0ce49ae1..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/requirements.yaml +++ /dev/null @@ -1,37 +0,0 @@ -#============LICENSE_START======================================================== -# ================================================================================ -# Copyright (c) 2021 Wipro Limited. -# 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. -# ============LICENSE_END========================================================= - -dependencies: - - name: common - version: ~9.x-0 - repository: '@local' - - name: postgres - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml index 57beb718ba..3cd71a357e 100644 --- a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml @@ -2,6 +2,7 @@ # ============================================================================ # Copyright (c) 2021 AT&T Intellectual Property # 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. @@ -16,8 +17,25 @@ # limitations under the License. # ================================= LICENSE_END ============================== -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE SNMPTrap Collector name: dcae-snmptrap-collector -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' + - name: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/requirements.yaml deleted file mode 100644 index b02251cc51..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/requirements.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# ================================ LICENSE_START ============================= -# ============================================================================ -# Copyright (c) 2021 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. -# ================================= LICENSE_END ============================== - -dependencies: - - name: common - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml index 707d31d0a4..895f642283 100644 --- a/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml @@ -2,6 +2,7 @@ # ============================================================================ # Copyright (C) 2021 Wipro Limited. # 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. @@ -16,8 +17,28 @@ # limitations under the License. # ============= LICENSE_END ================================================== -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE Son-handler helm chart name: dcae-son-handler -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' + - name: postgres + version: ~10.x-0 + repository: '@local' + - name: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/requirements.yaml deleted file mode 100644 index 99f0fb70bc..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-son-handler/requirements.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# ============= LICENSE_START ================================================ -# ============================================================================ -# Copyright (C) 2021 Wipro Limited. -# 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. -# ============= LICENSE_END ================================================== - -dependencies: - - name: common - version: ~9.x-0 - repository: '@local' - - name: postgres - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml index 6b91fe35e4..c5f4efea11 100644 --- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml @@ -2,6 +2,7 @@ # ================================================================================ # Copyright (c) 2021 J. F. Lucas. 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. @@ -16,8 +17,31 @@ # limitations under the License. # ============LICENSE_END========================================================= -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE TCA (Gen 2) name: dcae-tcagen2 -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: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' + - name: mongo + version: ~10.x-0 + repository: '@local'
\ No newline at end of file diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml deleted file mode 100644 index a5ab9d6e2f..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 2020 J. F. Lucas. All rights reserved. -# Copyright (c) 2021 AT&T. 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: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' - - name: mongo - version: ~9.x-0 - repository: '@local'
\ No newline at end of file diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml index 43e893be70..8022b79365 100644 --- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml @@ -2,6 +2,7 @@ # ================================================================================ # Copyright (c) 2021 J. F. Lucas. 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. @@ -16,8 +17,28 @@ # limitations under the License. # ============LICENSE_END========================================================= -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE VES Collector name: dcae-ves-collector -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: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: certManagerCertificate + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml deleted file mode 100644 index a0878282e2..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (c) 2021 J. F. Lucas. All rights reserved. -# Copyright (c) 2021 Nokia. All rights reserved. -# Copyright (c) 2021 AT&T. 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: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: certManagerCertificate - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml index 92fdb21e87..2097a9723d 100644 --- a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml @@ -2,6 +2,7 @@ # ============================================================================ # Copyright (c) 2021 AT&T Intellectual Property # 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. @@ -16,8 +17,25 @@ # limitations under the License. # ================================= LICENSE_END ============================== -apiVersion: v1 -appVersion: "Honolulu" +apiVersion: v2 +appVersion: "Jakarta" description: DCAE VES-Mapper Microservice name: dcae-ves-mapper -version: 9.0.0 +version: 10.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' + - name: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/requirements.yaml deleted file mode 100644 index b02251cc51..0000000000 --- a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/requirements.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# ================================ LICENSE_START ============================= -# ============================================================================ -# Copyright (c) 2021 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. -# ================================= LICENSE_END ============================== - -dependencies: - - name: common - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: dcaegen2-services-common - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/dcaegen2-services/requirements.yaml b/kubernetes/dcaegen2-services/requirements.yaml deleted file mode 100644 index b3432d3e8a..0000000000 --- a/kubernetes/dcaegen2-services/requirements.yaml +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright (c) 2021 J. F. Lucas. All rights reserved. -# Copyright (c) 2021 AT&T. All rights reserved. -# Modifications Copyright (C) 2021 Nordix Foundation. -# 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: dcae-bbs-eventprocessor-ms - version: ~9.x-0 - repository: '@local' - condition: dcae-bbs-eventprocessor-ms.enabled - - name: dcae-datafile-collector - version: ~9.x-0 - repository: '@local' - condition: dcae-datafile-collector.enabled - - name: dcae-datalake-admin-ui - version: ~9.x-0 - repository: '@local' - condition: dcae-datalake-admin-ui.enabled - - name: dcae-datalake-des - version: ~9.x-0 - repository: '@local' - condition: dcae-datalake-des.enabled - - name: dcae-datalake-feeder - version: ~9.x-0 - repository: '@local' - condition: dcae-datalake-feeder.enabled - - name: dcae-heartbeat - version: ~9.x-0 - repository: '@local' - condition: dcae-heartbeat.enabled - - name: dcae-hv-ves-collector - version: ~9.x-0 - repository: '@local' - condition: dcae-hv-ves-collector.enabled - - name: dcae-kpi-ms - version: ~9.x-0 - repository: '@local' - condition: dcae-kpi-ms.enabled - - name: dcae-ms-healthcheck - version: ~9.x-0 - repository: '@local' - condition: dcae-ms-healthcheck.enabled - - name: dcae-pm-mapper - version: ~9.x-0 - repository: '@local' - condition: dcae-pm-mapper.enabled - - name: dcae-pmsh - version: ~9.x-0 - repository: '@local' - condition: dcae-pmsh.enabled - - name: dcae-prh - version: ~9.x-0 - repository: '@local' - condition: dcae-prh.enabled - - name: dcae-restconf-collector - version: ~9.x-0 - repository: '@local' - condition: dcae-restconf-collector.enabled - - name: dcae-slice-analysis-ms - version: ~9.x-0 - repository: '@local' - condition: dcae-slice-analysis-ms.enabled - - name: dcae-snmptrap-collector - version: ~9.x-0 - repository: '@local' - condition: dcae-snmptrap-collector.enabled - - name: dcae-son-handler - version: ~9.x-0 - repository: '@local' - condition: dcae-son-handler.enabled - - name: dcae-tcagen2 - version: ~9.x-0 - repository: '@local' - condition: dcae-tcagen2.enabled - - name: dcae-ves-collector - version: ~9.x-0 - repository: '@local' - condition: dcae-ves-collector.enabled - - name: dcae-ves-mapper - version: ~9.x-0 - repository: '@local' - condition: dcae-ves-mapper.enabled |