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 "[DCAE] Version updates for Kohn"
[oom.git]
/
kubernetes
/
aai
/
values.yaml
diff --git
a/kubernetes/aai/values.yaml
b/kubernetes/aai/values.yaml
index
ed61778
..
94f2bea
100644
(file)
--- a/
kubernetes/aai/values.yaml
+++ b/
kubernetes/aai/values.yaml
@@
-33,6
+33,7
@@
global: # global defaults
aafEnabled: true
msbEnabled: true
aafEnabled: true
msbEnabled: true
+ centralizedLoggingEnabled: true
cassandra:
#This will instantiate AAI cassandra cluster, default:shared cassandra.
cassandra:
#This will instantiate AAI cassandra cluster, default:shared cassandra.
@@
-202,8
+203,9
@@
global: # global defaults
passwd: AAI
# Active spring profiles for the resources microservice
passwd: AAI
# Active spring profiles for the resources microservice
+ # aaf-auth profile will be automatically set if aaf enabled is set to true
profiles:
profiles:
- active: production,dmaap,aaf-auth
+ active: production,dmaap
#
,aaf-auth
# Notification event specific properties
notification:
# Notification event specific properties
notification:
@@
-213,6
+215,7
@@
global: # global defaults
# Schema specific properties that include supported versions of api
schema:
# Specifies if the connection should be one way ssl, two way ssl or no auth
# Schema specific properties that include supported versions of api
schema:
# Specifies if the connection should be one way ssl, two way ssl or no auth
+ # will be set to no-auth if tls is disabled
service:
client: one-way-ssl
# Specifies which translator to use if it has schema-service, then it will make a rest request to schema service
service:
client: one-way-ssl
# Specifies which translator to use if it has schema-service, then it will make a rest request to schema service
@@
-228,11
+231,11
@@
global: # global defaults
version:
# Current version of the REST API
api:
version:
# Current version of the REST API
api:
- default: v2
3
+ default: v2
7
# Specifies which version the depth parameter is configurable
depth: v11
# List of all the supported versions of the API
# Specifies which version the depth parameter is configurable
depth: v11
# List of all the supported versions of the API
- list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23
+ list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23
,v24,v25,v26,v27
# Specifies from which version related link should appear
related:
link: v11
# Specifies from which version related link should appear
related:
link: v11
@@
-249,12
+252,12
@@
global: # global defaults
# Keystore configuration password and filename
keystore:
filename: aai_keystore
# Keystore configuration password and filename
keystore:
filename: aai_keystore
- passwd: OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
+ passwd: OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
# changeit
# Truststore configuration password and filename
truststore:
filename: aai_keystore
# Truststore configuration password and filename
truststore:
filename: aai_keystore
- passwd: OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
+ passwd: OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
# changeit
# Specifies a list of files to be included in auth volume
auth:
# Specifies a list of files to be included in auth volume
auth:
@@
-274,6
+277,21
@@
global: # global defaults
# since when this is enabled, it prints a lot of information to console
enabled: false
# since when this is enabled, it prints a lot of information to console
enabled: false
+aai-babel:
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-aai'
+aai-graphadmin:
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-aai'
+aai-modelloader:
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-aai'
+aai-resources:
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-aai'
+aai-schema-service:
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-aai'
+aai-sparky-be:
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-aai'
+aai-traversal:
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-aai'
+
#################################################################
# Certificate configuration
#################################################################
#################################################################
# Certificate configuration
#################################################################
@@
-331,6
+349,12
@@
nodeSelector: {}
affinity: {}
affinity: {}
+# HAProxy configuration to block HTTP requests to AAI based on configurable URL patterns
+haproxy:
+ requestBlocking:
+ enabled: false
+ customConfigs: []
+
# probe configuration parameters
liveness:
initialDelaySeconds: 10
# probe configuration parameters
liveness:
initialDelaySeconds: 10
@@
-346,6
+370,8
@@
liveness:
# --set aai.global.cassandra.serviceName=aai-cassandra
cassandra:
nameOverride: aai-cassandra
# --set aai.global.cassandra.serviceName=aai-cassandra
cassandra:
nameOverride: aai-cassandra
+ serviceAccount:
+ nameOverride: aai-cassandra
replicaCount: 3
service:
name: aai-cassandra
replicaCount: 3
service:
name: aai-cassandra
@@
-359,13
+385,13
@@
readiness:
service:
type: NodePort
service:
type: NodePort
- portName:
aai-ssl
+ portName:
http
externalPort: 8443
internalPort: 8443
nodePort: 33
externalPort: 8443
internalPort: 8443
nodePort: 33
- # POLICY hotfix - Note this must be temporary
-
# See https://jira.onap.org/browse/POLICY-51
0
- aaiServiceClusterIp:
+ externalPlainPort: 80
+
internalPlainPort: 808
0
+ nodeport: 33
ingress:
enabled: false
ingress:
enabled: false
@@
-373,8
+399,8
@@
ingress:
- baseaddr: "aai.api"
name: "aai"
port: 8443
- baseaddr: "aai.api"
name: "aai"
port: 8443
- config:
- ssl: "redirect"
+
config:
+
ssl: "redirect"
resources:
small:
resources:
small:
@@
-392,3
+418,9
@@
resources:
cpu: 2
memory: 2Gi
unlimited: {}
cpu: 2
memory: 2Gi
unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+ nameOverride: aai
+ roles:
+ - read