Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[AAI] Deploy latest AAI images
[oom.git]
/
kubernetes
/
aai
/
components
/
aai-graphadmin
/
values.yaml
diff --git
a/kubernetes/aai/components/aai-graphadmin/values.yaml
b/kubernetes/aai/components/aai-graphadmin/values.yaml
index
199ce52
..
a0d43a7
100644
(file)
--- a/
kubernetes/aai/components/aai-graphadmin/values.yaml
+++ b/
kubernetes/aai/components/aai-graphadmin/values.yaml
@@
-25,9
+25,13
@@
# Declare variables to be passed into your templates.
global: # global defaults
nodePortPrefix: 302
# Declare variables to be passed into your templates.
global: # global defaults
nodePortPrefix: 302
+ kafkaBootstrap: strimzi-kafka-bootstrap
+ aaiGraphKafkaUser: aai-graph-kafka-user
cassandra:
#This will instantiate AAI cassandra cluster, default:shared cassandra.
localCluster: false
cassandra:
#This will instantiate AAI cassandra cluster, default:shared cassandra.
localCluster: false
+ # flag to enable the DB creation via k8ssandra-operator
+ useOperator: true
initContainers:
enabled: true
jobs:
initContainers:
enabled: true
jobs:
@@
-77,11
+81,11
@@
global: # global defaults
version:
# Current version of the REST API
api:
version:
# Current version of the REST API
api:
- default: v2
7
+ default: v2
9
# 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,v24,v25,v26,v27
+ list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27
,v28,v29
# Specifies from which version related link should appear
related:
link: v11
# Specifies from which version related link should appear
related:
link: v11
@@
-100,7
+104,7
@@
global: # global defaults
clients: SDNC,-1|MSO,-1|SO,-1|robot-ete,-1
# application image
clients: SDNC,-1|MSO,-1|SO,-1|robot-ete,-1
# application image
-image: onap/aai-graphadmin:1.1
1.2
+image: onap/aai-graphadmin:1.1
3.7
pullPolicy: Always
restartPolicy: Always
flavor: small
pullPolicy: Always
restartPolicy: Always
flavor: small
@@
-121,9
+125,11
@@
config:
# Specify the profiles for the graphadmin microservice
profiles:
# Specify the profiles for the graphadmin microservice
profiles:
-
- active: dmaap
-
+ active: kafka
+ kafkaBootstrap: strimzi-kafka-bootstrap
+ jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.aaiGraphKafkaUser }}'
+ someConfig: graphrandom
+ aaiTopic: AAI-EVENT
# Specifies the timeout limit for the REST API requests
timeout:
enabled: true
# Specifies the timeout limit for the REST API requests
timeout:
enabled: true
@@
-195,7
+201,7
@@
service:
internalPort: 8449
portName2: tcp-5005
internalPort2: 5005
internalPort: 8449
portName2: tcp-5005
internalPort2: 5005
- portName3: http-
aai-
graphadmin
+ portName3: http-graphadmin
internalPort3: 8448
terminationGracePeriodSeconds: 120
internalPort3: 8448
terminationGracePeriodSeconds: 120
@@
-231,38
+237,38
@@
persistence:
# To make logback capping values configurable
logback:
# To make logback capping values configurable
logback:
- logToFileEnabled:
tru
e
+ logToFileEnabled:
fals
e
maxHistory: 7
totalSizeCap: 6GB
queueSize: 1000
accessLogback:
maxHistory: 7
totalSizeCap: 6GB
queueSize: 1000
accessLogback:
- logToFileEnabled:
tru
e
+ logToFileEnabled:
fals
e
maxHistory: 7
totalSizeCap: 6GB
resources:
small:
limits:
maxHistory: 7
totalSizeCap: 6GB
resources:
small:
limits:
- cpu:
999
- memory:
4Gi
+ cpu:
"1"
+ memory:
"4Gi"
requests:
requests:
- cpu:
0.5
- memory:
1.6Gi
+ cpu:
"0.5"
+ memory:
"1.6Gi"
large:
limits:
large:
limits:
- cpu:
999
- memory:
8Gi
+ cpu:
"2"
+ memory:
"8Gi"
requests:
requests:
- cpu:
1
- memory:
3.2Gi
+ cpu:
"1"
+ memory:
"3.2Gi"
unlimited: {}
metrics:
serviceMonitor:
enabled: false
targetPort: 8448
unlimited: {}
metrics:
serviceMonitor:
enabled: false
targetPort: 8448
- path: /prometheus
+ path: /
actuator/
prometheus
basicAuth:
enabled: false
basicAuth:
enabled: false
@@
-289,4
+295,24
@@
serviceAccount:
#Log configuration
log:
path: /var/log/onap
#Log configuration
log:
path: /var/log/onap
+ level:
+ root: DEBUG
+ base: DEBUG
logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
+#################################################################
+# Secrets metaconfig
+#################################################################
+secrets:
+ - uid: aai-graph-kafka-user
+ externalSecret: '{{ tpl (default "" .Values.config.jaasConfExternalSecret) . }}'
+ type: genericKV
+ envs:
+ - name: sasl.jaas.config
+ value: '{{ .Values.config.someConfig }}'
+ policy: generate
+kafkaUser:
+ authenticationType: scram-sha-512
+ acls:
+ - name: AAI-EVENT
+ type: topic
+ operations: [Read, Write]