summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2022-02-25 14:23:53 +0000
committerGerrit Code Review <gerrit@onap.org>2022-02-25 14:23:53 +0000
commitc3406c5f911be5b675e72765b6e2c5cfc2326e12 (patch)
tree59a2bb5b50bb0b7538e765536e16518258caa25a
parentf3316e5260b5dce6ce71c77a1b99cf78395ae6b4 (diff)
parent838981352b45ef8851d99eeaf94257b29b2ab63c (diff)
Merge "[CPS] Fix postgres init job dependency"
-rw-r--r--kubernetes/cps/components/cps-core/Chart.yaml6
-rw-r--r--kubernetes/cps/components/cps-core/values.yaml4
2 files changed, 6 insertions, 4 deletions
diff --git a/kubernetes/cps/components/cps-core/Chart.yaml b/kubernetes/cps/components/cps-core/Chart.yaml
index c1ef7202a7..95201a0d4a 100644
--- a/kubernetes/cps/components/cps-core/Chart.yaml
+++ b/kubernetes/cps/components/cps-core/Chart.yaml
@@ -1,6 +1,7 @@
-# Copyright (C) Pantheon.tech, Orange
+# Copyright (C) Pantheon.tech, Orange
# Modifications Copyright © 2021 Orange
# Modifications Copyright © 2021 Nordix Foundation
+# Modifications Copyright (C) 2022 Bell Canada
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -30,8 +31,7 @@ dependencies:
- name: postgres-init
version: ~10.x-0
repository: '@local'
- condition: not global.postgres.localCluster
- #condition: global.postgres.postgresInit
+ condition: postgres.postgresInit
- name: readinessCheck
version: ~10.x-0
repository: '@local'
diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index e67cfb250a..3da5d170b7 100644
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -1,4 +1,5 @@
-# Copyright (C) 2021 Pantheon.tech, Orange, Bell Canada.
+# Copyright (C) 2021 Pantheon.tech, Orange, Bell Canada.
+# Modifications Copyright (C) 2022 Bell Canada
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -200,6 +201,7 @@ logging:
# Postgres overriding defaults in the postgres
#################################################################
postgres:
+ postgresInit: true
nameOverride: &postgresName cps-core-postgres
service:
name: *postgresName