diff options
Diffstat (limited to 'kubernetes/cps/components')
| -rw-r--r-- | kubernetes/cps/components/Makefile | 4 | ||||
| -rw-r--r-- | kubernetes/cps/components/cps-core/Chart.yaml | 28 | ||||
| -rw-r--r-- | kubernetes/cps/components/cps-core/requirements.yaml | 36 | ||||
| -rw-r--r-- | kubernetes/cps/components/cps-core/values.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/cps/components/cps-temporal/Chart.yaml | 22 | ||||
| -rw-r--r-- | kubernetes/cps/components/cps-temporal/requirements.yaml | 35 | ||||
| -rw-r--r-- | kubernetes/cps/components/cps-temporal/values.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml | 19 | ||||
| -rw-r--r-- | kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml | 32 | ||||
| -rw-r--r-- | kubernetes/cps/components/ncmp-dmi-plugin/values.yaml | 3 |
10 files changed, 68 insertions, 117 deletions
diff --git a/kubernetes/cps/components/Makefile b/kubernetes/cps/components/Makefile index db8704c2ca..9a84ab8375 100644 --- a/kubernetes/cps/components/Makefile +++ b/kubernetes/cps/components/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/cps/components/cps-core/Chart.yaml b/kubernetes/cps/components/cps-core/Chart.yaml index 2d9274ee9b..c1ef7202a7 100644 --- a/kubernetes/cps/components/cps-core/Chart.yaml +++ b/kubernetes/cps/components/cps-core/Chart.yaml @@ -1,5 +1,6 @@ # Copyright (C) Pantheon.tech, Orange # 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,30 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 description: ONAP Configuration Persistance Service (CPS) - Core name: cps-core -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' + condition: global.postgres.localCluster + - name: postgres-init + version: ~10.x-0 + repository: '@local' + condition: not global.postgres.localCluster + #condition: global.postgres.postgresInit + - name: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local'
\ No newline at end of file diff --git a/kubernetes/cps/components/cps-core/requirements.yaml b/kubernetes/cps/components/cps-core/requirements.yaml deleted file mode 100644 index 8a4ffbec81..0000000000 --- a/kubernetes/cps/components/cps-core/requirements.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (C) 2021 Pantheon.tech, 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: postgres - version: ~9.x-0 - repository: '@local' - condition: global.postgres.localCluster - - name: postgres-init - version: ~9.x-0 - repository: '@local' - condition: not global.postgres.localCluster - #condition: global.postgres.postgresInit - - name: readinessCheck - 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/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml index eb7aa54130..a482152582 100644 --- a/kubernetes/cps/components/cps-core/values.yaml +++ b/kubernetes/cps/components/cps-core/values.yaml @@ -78,11 +78,10 @@ service: targetPort: *mgt_port prometheus: - enabled: true + enabled: false metrics: serviceMonitor: - enabled: true port: http-management ## specify target port if name is not given to the port in the service definition ## diff --git a/kubernetes/cps/components/cps-temporal/Chart.yaml b/kubernetes/cps/components/cps-temporal/Chart.yaml index 99ff4221f8..502131bc7c 100644 --- a/kubernetes/cps/components/cps-temporal/Chart.yaml +++ b/kubernetes/cps/components/cps-temporal/Chart.yaml @@ -1,6 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (c) 2021 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. @@ -17,7 +18,24 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= -apiVersion: v1 +apiVersion: v2 description: ONAP Configuration Persistance Service (CPS) - Temporal name: cps-temporal -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: timescaledb + version: ~10.x-0 + repository: '@local' + - name: readinessCheck + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local'
\ No newline at end of file diff --git a/kubernetes/cps/components/cps-temporal/requirements.yaml b/kubernetes/cps/components/cps-temporal/requirements.yaml deleted file mode 100644 index 442261dad5..0000000000 --- a/kubernetes/cps/components/cps-temporal/requirements.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# ============LICENSE_START======================================================= -# Copyright (c) 2021 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. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= - -dependencies: - - name: common - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: timescaledb - version: ~9.x-0 - repository: '@local' - - name: readinessCheck - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml index f8311697f5..8b3f16b64c 100644 --- a/kubernetes/cps/components/cps-temporal/values.yaml +++ b/kubernetes/cps/components/cps-temporal/values.yaml @@ -45,7 +45,7 @@ containerPort: &svc_port 8080 managementPort: &mgt_port 8081 prometheus: - enabled: true + enabled: false service: type: ClusterIP @@ -60,7 +60,6 @@ service: metrics: serviceMonitor: - enabled: true port: http-management ## specify target port if name is not given to the port in the service definition ## diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml index 729eeb2c77..10c2aab323 100644 --- a/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml +++ b/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml @@ -1,6 +1,7 @@ # ============LICENSE_START======================================================= # 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. @@ -17,7 +18,21 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= -apiVersion: v1 +apiVersion: v2 description: ONAP Configuration Persistance Service (CPS) - NCMP-DMI-Plugin name: ncmp-dmi-plugin -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: serviceAccount + version: ~10.x-0 + repository: '@local'
\ No newline at end of file diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml deleted file mode 100644 index 1814a7b281..0000000000 --- a/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml +++ /dev/null @@ -1,32 +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. -# -# SPDX-License-Identifier: Apache-2.0 -# ============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: serviceAccount - version: ~9.x-0 - repository: '@local' diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml index a4a56dee80..753b8baaff 100644 --- a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml +++ b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml @@ -52,7 +52,7 @@ containerPort: &svc_port 8080 managementPort: &mgt_port 8081 prometheus: - enabled: true + enabled: false service: type: ClusterIP @@ -66,7 +66,6 @@ service: metrics: serviceMonitor: - enabled: true port: http-management ## specify target port if name is not given to the port in the service definition ## |