[CPS] Fix postgres init job dependency

Use global.postgres.postgresInit value

Issue-ID: CPS-861
Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
Change-Id: I45d4863a7a8dbc5ad4a5d2edde174469c4710c15
(cherry picked from commit 838981352b45ef8851d99eeaf94257b29b2ab63c)

diff --git a/kubernetes/cps/components/cps-core/requirements.yaml b/kubernetes/cps/components/cps-core/requirements.yaml
index 8a4ffbe..9283c6a 100644 (file)
--- a/kubernetes/cps/components/cps-core/requirements.yaml
+++ b/kubernetes/cps/components/cps-core/requirements.yaml
@@ -1,4 +1,5 @@
-#  Copyright (C) 2021 Pantheon.tech, Orange
+# Copyright (C) 2021 Pantheon.tech, Orange
+# 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.
@@ -23,8 +24,7 @@ dependencies:
   - name: postgres-init
     version: ~9.x-0
     repository: '@local'
-    condition: not global.postgres.localCluster
-    #condition: global.postgres.postgresInit
+    condition: postgres.postgresInit
   - name: readinessCheck
     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 a6df12c..303ba49 100644 (file)
--- 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.
@@ -197,6 +198,7 @@ logging:
 # Postgres overriding defaults in the postgres
 #################################################################
 postgres:
+  postgresInit: true
   nameOverride: &postgresName cps-core-postgres
   service:
     name: *postgresName