diff options
Diffstat (limited to 'kubernetes/aai')
11 files changed, 26 insertions, 20 deletions
diff --git a/kubernetes/aai/components/aai-babel/values.yaml b/kubernetes/aai/components/aai-babel/values.yaml index e6db1aa94b..31edf9b2da 100644 --- a/kubernetes/aai/components/aai-babel/values.yaml +++ b/kubernetes/aai/components/aai-babel/values.yaml @@ -81,14 +81,14 @@ serviceMesh: resources: small: limits: - cpu: 999 + cpu: 1 memory: 4Gi requests: cpu: 0.5 memory: 1Gi large: limits: - cpu: 999 + cpu: 4 memory: 8Gi requests: cpu: 2 diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml index 865dfe3eeb..2bee19ffcf 100644 --- a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml +++ b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml @@ -64,7 +64,11 @@ spec: - command: - /bin/bash - -c + {{- if .Values.global.cassandra.useOperator }} + - /app/ready.py --app-name aai-cassandra-reaper --timeout 1 || /app/ready.py --app-name cassandra-reaper + {{- else }} - /app/ready.py --app-name aai-cassandra --timeout 1 || /app/ready.py --app-name cassandra + {{- end }} env: - name: NAMESPACE valueFrom: diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml index 1a8124929f..c80d348e32 100644 --- a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml +++ b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml @@ -60,9 +60,9 @@ spec: args: - --app-name {{- if .Values.global.cassandra.localCluster }} - - aai-cassandra + - {{ ternary "aai-cassandra-reaper" "aai-cassandra" .Values.global.cassandra.useOperator }} {{- else }} - - cassandra + - {{ ternary "cassandra-reaper" "cassandra" .Values.global.cassandra.useOperator }} {{- end }} - --container-name - aai-schema-service diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml index bf3279fde7..b2bc0e735e 100644 --- a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml +++ b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml @@ -65,9 +65,9 @@ spec: args: - --app-name {{- if .Values.global.cassandra.localCluster }} - - aai-cassandra + - {{ ternary "aai-cassandra-reaper" "aai-cassandra" .Values.global.cassandra.useOperator }} {{- else }} - - cassandra + - {{ ternary "cassandra-reaper" "cassandra" .Values.global.cassandra.useOperator }} {{- end }} - --container-name - aai-schema-service diff --git a/kubernetes/aai/components/aai-graphadmin/values.yaml b/kubernetes/aai/components/aai-graphadmin/values.yaml index 51051746fb..09396cc104 100644 --- a/kubernetes/aai/components/aai-graphadmin/values.yaml +++ b/kubernetes/aai/components/aai-graphadmin/values.yaml @@ -28,6 +28,8 @@ global: # global defaults 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: @@ -244,14 +246,14 @@ accessLogback: resources: small: limits: - cpu: 999 + cpu: 1 memory: 4Gi requests: cpu: 0.5 memory: 1.6Gi large: limits: - cpu: 999 + cpu: 2 memory: 8Gi requests: cpu: 1 diff --git a/kubernetes/aai/components/aai-modelloader/values.yaml b/kubernetes/aai/components/aai-modelloader/values.yaml index 43f4b1ba69..57c562bfd2 100644 --- a/kubernetes/aai/components/aai-modelloader/values.yaml +++ b/kubernetes/aai/components/aai-modelloader/values.yaml @@ -65,14 +65,14 @@ readiness: resources: small: limits: - cpu: 999 + cpu: 1 memory: 4Gi requests: cpu: 0.5 memory: 1Gi large: limits: - cpu: 999 + cpu: 2 memory: 8Gi requests: cpu: 1 diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml index 6efb129da1..e5cc716f3f 100644 --- a/kubernetes/aai/components/aai-resources/values.yaml +++ b/kubernetes/aai/components/aai-resources/values.yaml @@ -231,14 +231,14 @@ serviceMesh: resources: small: limits: - cpu: 999 + cpu: 2 memory: 4Gi requests: cpu: 1 memory: 3Gi large: limits: - cpu: 999 + cpu: 4 memory: 8Gi requests: cpu: 2 diff --git a/kubernetes/aai/components/aai-schema-service/values.yaml b/kubernetes/aai/components/aai-schema-service/values.yaml index 24e4fa3bae..88f17861c7 100644 --- a/kubernetes/aai/components/aai-schema-service/values.yaml +++ b/kubernetes/aai/components/aai-schema-service/values.yaml @@ -125,14 +125,14 @@ serviceMesh: resources: small: limits: - cpu: 999 + cpu: 2 memory: 4Gi requests: cpu: 1 memory: 3Gi large: limits: - cpu: 999 + cpu: 4 memory: 8Gi requests: cpu: 2 diff --git a/kubernetes/aai/components/aai-sparky-be/values.yaml b/kubernetes/aai/components/aai-sparky-be/values.yaml index a2f13a257f..8cfd2c6622 100644 --- a/kubernetes/aai/components/aai-sparky-be/values.yaml +++ b/kubernetes/aai/components/aai-sparky-be/values.yaml @@ -109,14 +109,14 @@ podAnnotations: resources: small: limits: - cpu: 999 + cpu: 0.5 memory: 4Gi requests: cpu: 0.25 memory: 1Gi large: limits: - cpu: 999 + cpu: 1 memory: 8Gi requests: cpu: 0.5 diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml index a759f98552..349fe77496 100644 --- a/kubernetes/aai/components/aai-traversal/values.yaml +++ b/kubernetes/aai/components/aai-traversal/values.yaml @@ -251,14 +251,14 @@ accessLogback: resources: small: limits: - cpu: 999 + cpu: 2 memory: 4Gi requests: cpu: 1 memory: 3Gi large: limits: - cpu: 999 + cpu: 4 memory: 8Gi requests: cpu: 2 diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml index b9223b1a9a..04b5ac2530 100644 --- a/kubernetes/aai/values.yaml +++ b/kubernetes/aai/values.yaml @@ -443,14 +443,14 @@ serviceMesh: resources: small: limits: - cpu: 999 + cpu: 2 memory: 4Gi requests: cpu: 1 memory: 1.2Gi large: limits: - cpu: 999 + cpu: 4 memory: 8Gi requests: cpu: 2 |