Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[DMAAP-MR] Bump MR image version"
[oom.git]
/
kubernetes
/
cps
/
values.yaml
diff --git
a/kubernetes/cps/values.yaml
b/kubernetes/cps/values.yaml
old mode 100644
(file)
new mode 100755
(executable)
index
ee797a5
..
ea4639f
--- a/
kubernetes/cps/values.yaml
+++ b/
kubernetes/cps/values.yaml
@@
-1,4
+1,4
@@
-# Copyright (C) 2021 Pantheon.tech, Orange
+# Copyright (C) 2021 Pantheon.tech, Orange
, Bell Canada.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-29,6
+29,12
@@
secrets:
login: '{{ .Values.postgres.config.pgUserName }}'
password: '{{ .Values.postgres.config.pgUserPassword }}'
passwordPolicy: generate
login: '{{ .Values.postgres.config.pgUserName }}'
password: '{{ .Values.postgres.config.pgUserPassword }}'
passwordPolicy: generate
+ - uid: app-user-creds
+ type: basicAuth
+ externalSecret: '{{ tpl (default "" .Values.config.appUserExternalSecret) . }}'
+ login: '{{ .Values.config.appUserName }}'
+ password: '{{ .Values.config.appUserPassword }}'
+ passwordPolicy: generate
#################################################################
# Global configuration defaults.
#################################################################
# Global configuration defaults.
@@
-41,7
+47,7
@@
global:
virtualhost:
baseurl: "simpledemo.onap.org"
virtualhost:
baseurl: "simpledemo.onap.org"
-image: onap/cps-and-nf-proxy:
0
.0.1
+image: onap/cps-and-nf-proxy:
1
.0.1
containerPort: &svc_port 8080
service:
containerPort: &svc_port 8080
service:
@@
-113,9
+119,20
@@
securityContext:
#################################################################
# Application configuration defaults.
#################################################################
#################################################################
# Application configuration defaults.
#################################################################
+
+config:
+
+ # Set it for pre loading xnfdata, else set to null
+ liquibaseLabels: xnf-data-preload
+
+ # REST API basic authentication credentials (passsword is generated if not provided)
+ appUserName: cpsuser
+ #appUserPassword:
+
logging:
level: INFO
path: /tmp
logging:
level: INFO
path: /tmp
+
#################################################################
# Postgres overriding defaults in the postgres
#################################################################
#################################################################
# Postgres overriding defaults in the postgres
#################################################################
@@
-140,4
+157,4
@@
postgres:
readinessCheck:
wait_for:
readinessCheck:
wait_for:
- - cps-postgres
\ No newline at end of file
+ - cps-postgres