diff options
author | Bruno Sakoto <bruno.sakoto@bell.ca> | 2022-01-21 07:45:27 -0500 |
---|---|---|
committer | Bruno Sakoto <bruno.sakoto@bell.ca> | 2022-02-28 08:29:40 -0500 |
commit | e1661bdc0f82fe98a11a723de54e9b6b13418b43 (patch) | |
tree | 11ae4cde760ba6cedd46980cd408c03706df66be | |
parent | 9b553160a2bd8b2302513811f511181c0b3b6424 (diff) |
[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)
-rw-r--r-- | kubernetes/cps/components/cps-core/requirements.yaml | 6 | ||||
-rw-r--r-- | kubernetes/cps/components/cps-core/values.yaml | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/kubernetes/cps/components/cps-core/requirements.yaml b/kubernetes/cps/components/cps-core/requirements.yaml index 8a4ffbec81..9283c6a0fb 100644 --- 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 a6df12c376..303ba49752 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. @@ -197,6 +198,7 @@ logging: # Postgres overriding defaults in the postgres ################################################################# postgres: + postgresInit: true nameOverride: &postgresName cps-core-postgres service: name: *postgresName |