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 "[SO] Add multicloud endpoint to cnf adapter"
[oom.git]
/
kubernetes
/
so
/
values.yaml
diff --git
a/kubernetes/so/values.yaml
b/kubernetes/so/values.yaml
index
5258e81
..
f0bb7d1
100755
(executable)
--- a/
kubernetes/so/values.yaml
+++ b/
kubernetes/so/values.yaml
@@
-1,5
+1,6
@@
# Copyright © 2018 AT&T USA
# Copyright © 2020 Huawei
# Copyright © 2018 AT&T USA
# Copyright © 2020 Huawei
+# Copyright © 2021 Orange
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@@
-56,12
+57,6
@@
global:
auth: 3EDC974C5CD7FE54C47C7490AF4D3B474CDD7D0FFA35A7ACDE3E209631E45F428976EAC0858874F17390A13149E63C90281DD8D20456
defaultCloudOwner: onap
auth: 3EDC974C5CD7FE54C47C7490AF4D3B474CDD7D0FFA35A7ACDE3E209631E45F428976EAC0858874F17390A13149E63C90281DD8D20456
defaultCloudOwner: onap
- client:
- certs:
- truststore: /app/client/org.onap.so.trust.jks
- keystore: /app/client/org.onap.so.jks
- trustStorePassword: LHN4Iy5DKlcpXXdWZ0pDNmNjRkhJIzpI
- keyStorePassword: c280b25hcA==
certificates:
path: /etc/ssl/certs
share_path: /usr/local/share/ca-certificates/
certificates:
path: /etc/ssl/certs
share_path: /usr/local/share/ca-certificates/
@@
-108,12
+103,6
@@
secrets:
login: '{{ .Values.dbCreds.adminName }}'
password: '{{ .Values.dbCreds.adminPassword }}'
passwordPolicy: generate
login: '{{ .Values.dbCreds.adminName }}'
password: '{{ .Values.dbCreds.adminPassword }}'
passwordPolicy: generate
- - uid: 'so-onap-certs'
- name: &so-certs '{{ include "common.release" . }}-so-certs'
- externalSecret: '{{ tpl (default "" .Values.certSecret) . }}'
- type: generic
- filePaths:
- - resources/config/certificates/msb-ca.crt
- uid: 'mso-key'
name: &mso-key '{{ include "common.release" . }}-mso-key'
type: password
- uid: 'mso-key'
name: &mso-key '{{ include "common.release" . }}-mso-key'
type: password
@@
-173,7
+162,7
@@
dbCreds:
userName: so_user
adminName: so_admin
userName: so_user
adminName: so_admin
-image: onap/so/api-handler-infra:1.
7.10
+image: onap/so/api-handler-infra:1.
8.2
server:
aaf:
server:
aaf:
@@
-218,7
+207,6
@@
soHelpers:
certInitializer:
nameOverride: so-apih-cert-init
credsPath: /opt/app/osaaf/local
certInitializer:
nameOverride: so-apih-cert-init
credsPath: /opt/app/osaaf/local
- certSecret: *so-certs
containerPort: *containerPort
# Resource Limit flavor -By Default using small
containerPort: *containerPort
# Resource Limit flavor -By Default using small
@@
-337,7
+325,7
@@
so-mariadb:
userCredsExternalSecret: *dbUserCredsSecretName
adminCredsExternalSecret: *dbAdminCredsSecretName
userCredsExternalSecret: *dbUserCredsSecretName
adminCredsExternalSecret: *dbAdminCredsSecretName
-so-
monitoring
:
+so-
admin-cockpit
:
enabled: true
db:
<<: *dbSecrets
enabled: true
db:
<<: *dbSecrets
@@
-377,15
+365,22
@@
so-sdnc-adapter:
enabled: true
db:
<<: *dbSecrets
enabled: true
db:
<<: *dbSecrets
+ mso:
+ msoKeySecret: *mso-key
so-ve-vnfm-adapter:
enabled: false
so-ve-vnfm-adapter:
enabled: false
-so-
vfc
-adapter:
+so-
etsi-sol005
-adapter:
enabled: true
db:
<<: *dbSecrets
enabled: true
db:
<<: *dbSecrets
-so-
vnfm
-adapter:
+so-
etsi-sol003
-adapter:
enabled: true
enabled: true
+#Pods Service Account
+serviceAccount:
+ nameOverride: so
+ roles:
+ - read