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 "[STRIMZI] Solve Security Policy violations"
[oom.git]
/
kubernetes
/
aai
/
values.yaml
diff --git
a/kubernetes/aai/values.yaml
b/kubernetes/aai/values.yaml
index
c40dbe0
..
8607e58
100644
(file)
--- a/
kubernetes/aai/values.yaml
+++ b/
kubernetes/aai/values.yaml
@@
-25,7
+25,7
@@
global: # global defaults
dockerhubRepository: docker.io
busyboxImage: busybox
dockerhubRepository: docker.io
busyboxImage: busybox
- readinessImage: onap/oom/readiness:
3.0.1
+ readinessImage: onap/oom/readiness:
6.0.3
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
@@
-39,24
+39,40
@@
global: # global defaults
#This will instantiate AAI cassandra cluster, default:shared cassandra.
localCluster: false
#This will instantiate AAI cassandra cluster, default:shared cassandra.
localCluster: false
+ # in case of a local cassandra cluster
+ # flag to enable the DB creation via k8ssandra-operator
+ useOperator: true
+ # if useOperator set to "true", set "enableServiceAccount to "false"
+ # as the SA is created by the Operator
+ enableServiceAccount: false
+
#Service Name of the cassandra cluster to connect to.
#Override it to aai-cassandra if localCluster is enabled.
#in case of using k8ssandra-operator in the common cassandra installation
#the service name is:
#Service Name of the cassandra cluster to connect to.
#Override it to aai-cassandra if localCluster is enabled.
#in case of using k8ssandra-operator in the common cassandra installation
#the service name is:
-
#
serviceName: cassandra-dc1-service
+ serviceName: cassandra-dc1-service
#in case of local k8ssandra-operator instance it is
#serviceName: aai-cassandra-dc1-service
#in case the older cassandra installation is used:
#in case of local k8ssandra-operator instance it is
#serviceName: aai-cassandra-dc1-service
#in case the older cassandra installation is used:
- serviceName: cassandra
+
#
serviceName: cassandra
#This should be same as shared cassandra instance or if localCluster is enabled
#then it should be same as aai-cassandra replicaCount
replicas: 3
#This should be same as shared cassandra instance or if localCluster is enabled
#then it should be same as aai-cassandra replicaCount
replicas: 3
- #Cassan
a
ra login details
+ #Cassan
d
ra login details
username: cassandra
password: cassandra
username: cassandra
password: cassandra
+ #Cassandra datacenter name
+ localDataCenter: dc1
+
+ # The name of Cassandra cluster's partitioner.
+ # It will be retrieved by client if not provided.
+ # See storage.cql.partitioner-name in https://docs.janusgraph.org/v0.6/configs/configuration-reference/#storagecql
+ partitionerName: org.apache.cassandra.dht.Murmur3Partitioner
+
+
aai:
serviceName: aai
babel:
aai:
serviceName: aai
babel:
@@
-205,7
+221,7
@@
global: # global defaults
# Active spring profiles for the resources microservice
# aaf-auth profile will be automatically set if aaf enabled is set to true
profiles:
# Active spring profiles for the resources microservice
# aaf-auth profile will be automatically set if aaf enabled is set to true
profiles:
- active: production,
dmaap
#,aaf-auth
+ active: production,
kafka
#,aaf-auth
# Notification event specific properties
notification:
# Notification event specific properties
notification:
@@
-231,11
+247,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
@@
-324,8
+340,8
@@
affinity: {}
haproxy:
initContainers:
resources:
haproxy:
initContainers:
resources:
- memory: 100Mi
- cpu: 50m
+ cpu: "50m"
+ memory: "500Mi"
requestBlocking:
enabled: false
customConfigs: []
requestBlocking:
enabled: false
customConfigs: []
@@
-357,7
+373,6
@@
cassandra:
mountSubPath: aai/cassandra
enabled: true
k8ssandraOperator:
mountSubPath: aai/cassandra
enabled: true
k8ssandraOperator:
- enabled: false
config:
clusterName: aai-cassandra
config:
clusterName: aai-cassandra
@@
-375,7
+390,7
@@
service:
metricsService:
type: ClusterIP
metricsService:
type: ClusterIP
- portName: http-pro
metheus
+ portName: http-pro
externalPort: 8448
internalPort: 8448
externalPort: 8448
internalPort: 8448
@@
-437,18
+452,18
@@
serviceMesh:
resources:
small:
limits:
resources:
small:
limits:
- cpu:
2
- memory:
4Gi
+ cpu:
"2"
+ memory:
"4Gi"
requests:
requests:
- cpu:
1
- memory:
1Gi
+ cpu:
"1"
+ memory:
"1.2Gi"
large:
limits:
large:
limits:
- cpu:
4
- memory:
8Gi
+ cpu:
"4"
+ memory:
"8Gi"
requests:
requests:
- cpu:
2
- memory:
2Gi
+ cpu:
"2"
+ memory:
"2.4Gi"
unlimited: {}
#Pods Service Account
unlimited: {}
#Pods Service Account