summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Sakoto <bruno.sakoto@bell.ca>2022-03-14 22:50:52 -0400
committerBruno Sakoto <bruno.sakoto@bell.ca>2022-03-30 06:49:16 -0400
commitc97452091d6ab1283eaba768cd87ab500575a82a (patch)
tree9030a6748a4bb604b895ae697e46f5a9661887a3
parentc31d8a2625aab9f98f4fe0f457974584fbbd53b6 (diff)
[CPS] Configure roles-wrapper dependency
If needed, RBAC roles are created when deploying cps chart. This change is coming from the need to deploy cps chart standalone independently from onap main chart. A previous change has been made in https://gerrit.onap.org/r/c/oom/+/126713 and reverted with https://gerrit.onap.org/r/c/oom/+/126961 for onap main chart compatibility. Then this current change supports both integrated and standalone cps deployments depending on a configurable variable. Default deployment remains onap integrated one. Issue-ID: CPS-862 Change-Id: Ic787a8bcf9373f060a91966614a0145dec2a7c90 Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca> (cherry picked from commit 5470cda865785bd638aab556dfdb127ce97913ef)
-rw-r--r--kubernetes/cps/requirements.yaml6
-rwxr-xr-xkubernetes/cps/values.yaml3
2 files changed, 8 insertions, 1 deletions
diff --git a/kubernetes/cps/requirements.yaml b/kubernetes/cps/requirements.yaml
index bd9a80c957..317f7be806 100644
--- a/kubernetes/cps/requirements.yaml
+++ b/kubernetes/cps/requirements.yaml
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Bell Canada.
+# Copyright (C) 2021, 2022 Bell Canada.
# Modifications Copyright © 2021 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +17,10 @@ dependencies:
- name: common
version: ~9.x-0
repository: '@local'
+ - name: roles-wrapper
+ version: ~9.x-0
+ repository: '@local'
+ condition: standaloneDeployment
- name: cps-core
version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/cps/values.yaml b/kubernetes/cps/values.yaml
index 6093fa72fa..754b016fe8 100755
--- a/kubernetes/cps/values.yaml
+++ b/kubernetes/cps/values.yaml
@@ -32,6 +32,9 @@ secrets:
passwordPolicy: generate
passwordStrengthOverride: basic
+
+standaloneDeployment: false
+
global:
ingress:
virtualhost: