diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2023-10-12 13:10:53 +0200 |
|---|---|---|
| committer | Andreas Geissler <andreas-geissler@telekom.de> | 2023-10-18 14:56:44 +0200 |
| commit | 891eeb77f57dcb28db018fab84ece4b46758a162 (patch) | |
| tree | 7d44ecec00ff21264fa0fad88196b9d3ccf33b35 /kubernetes/aai/components/aai-graphadmin | |
| parent | 11a7c5036e8d5b7e4c9bf3c2d0c06dc0ebef9ba8 (diff) | |
[CASSANDRA] Add Reaper and Stargate label checked by SDC/AAI
Schema creations of Reaper and AAI/SDC can conflict with each
other. Therefor the reaper init script should finish before
AAI and SDC schema init scripts are started
Update jvm options for cassandra instance
Issue-ID: OOM-3246
Change-Id: I16cea161fc8b75e15c76c4cbe4851739782dfb06
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Diffstat (limited to 'kubernetes/aai/components/aai-graphadmin')
4 files changed, 10 insertions, 4 deletions
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..e75d4dfd50 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: |