summaryrefslogtreecommitdiffstats
path: root/kubernetes/cps/components
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/cps/components')
-rw-r--r--kubernetes/cps/components/cps-core/Chart.yaml3
-rw-r--r--kubernetes/cps/components/cps-core/requirements.yaml16
-rw-r--r--kubernetes/cps/components/cps-core/resources/config/application-helm.yml5
-rw-r--r--kubernetes/cps/components/cps-core/values.yaml24
-rw-r--r--kubernetes/cps/components/cps-temporal/Chart.yaml3
-rw-r--r--kubernetes/cps/components/cps-temporal/requirements.yaml11
-rw-r--r--kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml3
-rw-r--r--kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml11
8 files changed, 57 insertions, 19 deletions
diff --git a/kubernetes/cps/components/cps-core/Chart.yaml b/kubernetes/cps/components/cps-core/Chart.yaml
index 710032896e..2d9274ee9b 100644
--- a/kubernetes/cps/components/cps-core/Chart.yaml
+++ b/kubernetes/cps/components/cps-core/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright (C) Pantheon.tech, Orange
+# 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.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Configuration Persistance Service (CPS) - Core
name: cps-core
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cps/components/cps-core/requirements.yaml b/kubernetes/cps/components/cps-core/requirements.yaml
index d6b6712852..8a4ffbec81 100644
--- a/kubernetes/cps/components/cps-core/requirements.yaml
+++ b/kubernetes/cps/components/cps-core/requirements.yaml
@@ -14,17 +14,23 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: postgres
- version: ~8.x-0
+ 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: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/cps/components/cps-core/resources/config/application-helm.yml b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml
index 0bc7d5bccb..8f904efeae 100644
--- a/kubernetes/cps/components/cps-core/resources/config/application-helm.yml
+++ b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml
@@ -2,6 +2,7 @@
# Copyright (C) 2021 Pantheon.tech
# Modifications Copyright (C) 2020 Bell Canada.
# Modifications Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright (C) 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,7 +19,11 @@
spring:
datasource:
+{{- if .Values.global.postgres.localCluster }}
url: jdbc:postgresql://{{ .Values.postgres.service.name2 }}:5432/{{ .Values.postgres.config.pgDatabase }}
+{{- else }}
+ url: jdbc:postgresql://{{ .Values.global.postgres.service.name2 }}:5432/{{ .Values.postgres.config.pgDatabase }}
+{{- end }}
username: ${DB_USERNAME}
password: ${DB_PASSWORD}
driverClassName: org.postgresql.Driver
diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index 9d056f5785..d41c44ddbc 100644
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -52,6 +52,16 @@ global:
ingress:
virtualhost:
baseurl: "simpledemo.onap.org"
+ #Service Names of the postgres db to connect to.
+ #Override it to cps-postgres if localCluster is enabled.
+ postgres:
+ localCluster: false
+ service:
+ name: pgset
+ name2: tcp-pgset-primary
+ name3: tcp-pgset-replica
+ container:
+ name: postgres
image: onap/cps-and-ncmp:2.0.1
containerPort: &svc_port 8080
@@ -206,9 +216,21 @@ postgres:
pgUserExternalSecret: *pgUserCredsSecretName
pgRootPasswordExternalSecret: *pgRootPassSecretName
+postgres-init:
+ nameOverride: cps-postgres-init
+ config:
+ pgUserName: cps
+ pgDatabase: cpsdb
+ pgDataPath: data
+ pgUserExternalSecret: *pgUserCredsSecretName
+
+ # pgPrimaryPassword: password
+ # pgUserPassword: password
+ # pgRootPassword: password
+
readinessCheck:
wait_for:
- - *postgresName
+ - '{{ ternary .Values.postgres.service.name "postgres" .Values.global.postgres.localCluster }}'
minReadySeconds: 10
updateStrategy:
diff --git a/kubernetes/cps/components/cps-temporal/Chart.yaml b/kubernetes/cps/components/cps-temporal/Chart.yaml
index ab4bfe7e42..99ff4221f8 100644
--- a/kubernetes/cps/components/cps-temporal/Chart.yaml
+++ b/kubernetes/cps/components/cps-temporal/Chart.yaml
@@ -1,5 +1,6 @@
# ============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.
@@ -19,4 +20,4 @@
apiVersion: v1
description: ONAP Configuration Persistance Service (CPS) - Temporal
name: cps-temporal
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cps/components/cps-temporal/requirements.yaml b/kubernetes/cps/components/cps-temporal/requirements.yaml
index b2293db9af..442261dad5 100644
--- a/kubernetes/cps/components/cps-temporal/requirements.yaml
+++ b/kubernetes/cps/components/cps-temporal/requirements.yaml
@@ -1,5 +1,6 @@
# ============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.
@@ -18,17 +19,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: timescaledb
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
index e99111d859..729eeb2c77 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
@@ -1,5 +1,6 @@
# ============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.
@@ -19,4 +20,4 @@
apiVersion: v1
description: ONAP Configuration Persistance Service (CPS) - NCMP-DMI-Plugin
name: ncmp-dmi-plugin
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml
index d1fbdd3182..1814a7b281 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml
@@ -1,5 +1,6 @@
# ============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.
@@ -18,14 +19,14 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: readinessCheck
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: serviceAccount
- version: ~8.x-0
- repository: '@local' \ No newline at end of file
+ version: ~9.x-0
+ repository: '@local'