diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2022-05-13 17:16:41 +0200 |
|---|---|---|
| committer | Andreas Geissler <andreas-geissler@telekom.de> | 2022-06-03 13:11:55 +0200 |
| commit | 8624d2224da24c9a181af7b089b548a6e59c2582 (patch) | |
| tree | 78757e81d11b24a68629dadb0499026f9f5c6909 /kubernetes/aai/components/aai-graphadmin/templates | |
| parent | c1aa68b0c1183d90e6ada524d7e16dabf51bf890 (diff) | |
[AAI] Service mesh compatibility improvement
Add waiting times for the jobs for the Sidecar to start up
Cleanup old ClusterIP, which is not used anymore and corrected
failing configuration for the modelloader. Added annotation for
Sparky-be probe settings.
Issue-ID: OOM-2820
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I996c9bad4fcfea5aaba7f8eeb4b12b1282be0375
Diffstat (limited to 'kubernetes/aai/components/aai-graphadmin/templates')
3 files changed, 10 insertions, 2 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 b8adba8117..a93c6107e7 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 @@ -126,7 +126,9 @@ spec: args: - -c - | - bash docker-entrypoint.sh dataSnapshot.sh + {{- if include "common.onServiceMesh" . }} + echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }} + bash docker-entrypoint.sh dataSnapshot.sh; {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }} env: - name: LOCAL_USER_ID 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 76a11fad54..a9349028f4 100644 --- a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml +++ b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml @@ -126,7 +126,9 @@ spec: args: - -c - | - bash docker-entrypoint.sh createDBSchema.sh + {{- if include "common.onServiceMesh" . }} + echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }} + bash docker-entrypoint.sh createDBSchema.sh; {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }} env: - name: LOCAL_USER_ID diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml index d2d0809afb..10b8255c50 100644 --- a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml +++ b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml @@ -171,6 +171,8 @@ spec: args: - -c - | + {{- if include "common.onServiceMesh" . }} + echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }} bash docker-entrypoint.sh run_Migrations.sh -e UpdateAaiUriIndexMigration --commit --skipPreMigrationSnapShot --runDisabled RebuildAllEdges ; {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }} env: @@ -325,6 +327,8 @@ spec: args: - -c - | + {{- if include "common.onServiceMesh" . }} + echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }} bash docker-entrypoint.sh dataSnapshot.sh {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }} env: |