From: Fiete Ostkamp <fiete.ostkamp@telekom.de>
Date: Tue, 21 Oct 2025 06:14:40 +0000 (+0200)
Subject: Remove common.waitForJobContainer and sidecar killer
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6627a86d7bfa3e4572777f85369f81a4c5505372;p=oom.git

Remove common.waitForJobContainer and sidecar killer

- in the past, istio sidecars for jobs would not be stopped
- this required functions to manually manage that life cycle
- with istio native sidecars, [these problems have been fixed](https://istio.io/latest/blog/2023/native-sidecars/#sidecar-woes)

Issue-ID: OOM-3353
Change-Id: Ife36f2a04ed0f18aeacd4080ca062cda71dccab2
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>
---

diff --git a/archive/vnfsdk/templates/job.yaml b/archive/vnfsdk/templates/job.yaml
index a6966a7708..5101dea099 100644
--- a/archive/vnfsdk/templates/job.yaml
+++ b/archive/vnfsdk/templates/job.yaml
@@ -74,7 +74,6 @@ spec:
         - name: init-data
           mountPath: /aaa/init/marketplace_tables_postgres.sql
           subPath: marketplace_tables_postgres.sql
-      {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       {{- include "common.imagePullSecrets" . | nindent 6 }}
       volumes:
       - name: init-data
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
index 4f3b44f517..411edb4c0f 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
@@ -59,10 +59,7 @@ spec:
           args:
           - -c
           - |
-            {{- if include "common.onServiceMesh" . }}
-            echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
-            sh docker-entrypoint.sh createDBSchema.sh;
-            {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+            sh docker-entrypoint.sh createDBSchema.sh
           env:
           {{- if .Values.config.debug.enabled }}
           - name: JVM_OPTS
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 6366e0626b..b3ee117ab2 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
@@ -67,10 +67,7 @@ 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 }}
+           bash docker-entrypoint.sh dataSnapshot.sh
         volumeMounts:
         - mountPath: /opt/app/aai-graphadmin/logs/data/dataSnapshots
           name: snapshots
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 fc35966f79..4844ef5874 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
@@ -64,10 +64,7 @@ spec:
         args:
         - -c
         - |
-           {{- if include "common.onServiceMesh" . }}
-           echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
-           sh docker-entrypoint.sh createDBSchema.sh;
-           {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+           sh docker-entrypoint.sh createDBSchema.sh
         env:
         {{- if .Values.config.debug.enabled }}
         - name: JVM_OPTS
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
index fcfb479965..255fe26860 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
@@ -93,10 +93,7 @@ spec:
         args:
         - -c
         - |
-           {{- if include "common.onServiceMesh" . }}
-           echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
-           sh docker-entrypoint.sh run_Migrations.sh -e UpdateAaiUriIndexMigration --commit --skipPreMigrationSnapShot --runDisabled RebuildAllEdges ;
-           {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+           sh docker-entrypoint.sh run_Migrations.sh -e UpdateAaiUriIndexMigration --commit --skipPreMigrationSnapShot --runDisabled RebuildAllEdges
         {{ include "common.containerSecurityContext" . | indent 8 | trim }}
         volumeMounts:
         - mountPath: /opt/app/aai-graphadmin/resources/etc/appprops/janusgraph-realtime.properties
@@ -189,10 +186,7 @@ spec:
         args:
         - -c
         - |
-           {{- if include "common.onServiceMesh" . }}
-           echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
            sh docker-entrypoint.sh dataSnapshot.sh
-           {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
         volumeMounts:
         - mountPath: /opt/app/aai-graphadmin/logs/data/dataSnapshots
           name: snapshots
diff --git a/kubernetes/aai/components/aai-traversal/templates/job.yaml b/kubernetes/aai/components/aai-traversal/templates/job.yaml
index 2e51fd0a81..f6c0fa965d 100644
--- a/kubernetes/aai/components/aai-traversal/templates/job.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/job.yaml
@@ -83,8 +83,6 @@ spec:
            fi
 
            sh -x /opt/app/aai-traversal/bin/install/updateQueryData.sh ;
-
-           {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
         {{ include "common.containerSecurityContext" . | indent 8 | trim }}
         resources: {{ include "common.resources" . | nindent 10 }}
         volumeMounts:
diff --git a/kubernetes/common/common/templates/_serviceMesh.tpl b/kubernetes/common/common/templates/_serviceMesh.tpl
index 638db8cab1..d4b187bf2a 100644
--- a/kubernetes/common/common/templates/_serviceMesh.tpl
+++ b/kubernetes/common/common/templates/_serviceMesh.tpl
@@ -26,78 +26,6 @@ true
 {{-   end -}}
 {{- end -}}
 
-{{/*
-  Calculate if we require a sidecar killer.
-*/}}
-{{- define "common.requireSidecarKiller" -}}
-{{-   if (include "common.onServiceMesh" .) }}
-{{-     if eq .Values.global.serviceMesh.engine "istio" }}
-{{-       if not (default false .Values.global.serviceMesh.nativeSidecars) -}}
-true
-{{-       end -}}
-{{-     end -}}
-{{-   end -}}
-{{- end -}}
-
-{{/*
-  Kills the sidecar proxy associated with a pod.
-*/}}
-{{- define "common.serviceMesh.killSidecar" -}}
-{{-   if (include "common.requireSidecarKiller" .) }}
-RCODE="$?";
-echo "*** script finished with exit code $RCODE" ;
-echo "*** killing service mesh sidecar" ;
-wget --quiet --post-data '' --output-document=- http://127.0.0.1:15020/quitquitquit || exit $? ;
-echo "" ;
-echo "*** exiting with script exit code" ;
-exit "$RCODE"
-{{-   end }}
-{{- end -}}
-
-{{/*
-  Wait for job container.
-*/}}
-{{- define "common.waitForJobContainer" -}}
-{{-   $dot := default . .dot -}}
-{{-   $wait_for_job_container := default $dot.Values.wait_for_job_container .wait_for_job_container -}}
-{{- if (include "common.requireSidecarKiller" .) }}
-- name: {{ include "common.name" $dot }}{{ ternary "" (printf "-%s" $wait_for_job_container.name) (empty $wait_for_job_container.name) }}-service-mesh-wait-for-job-container
-  image: {{ include "repositoryGenerator.image.quitQuit" $dot }}
-  imagePullPolicy: {{ $dot.Values.global.pullPolicy | default $dot.Values.pullPolicy }}
-  command:
-  - /bin/sh
-  - "-c"
-  args:
-  - echo "waiting 10s for istio side cars to be up"; sleep 10s;
-    {{- range $container := $wait_for_job_container.containers }}
-    /app/ready.py --service-mesh-check {{ tpl $container $dot }} -t 45;
-    {{- end }}
-  env:
-  - name: NAMESPACE
-    valueFrom:
-      fieldRef:
-        apiVersion: v1
-        fieldPath: metadata.namespace
-  securityContext:
-    capabilities:
-      drop:
-        - ALL
-        - CAP_NET_RAW
-    privileged: false
-    readOnlyRootFilesystem: true
-    allowPrivilegeEscalation: false
-    runAsUser: 100
-    runAsGroup: 65533
-  resources:
-    limits:
-      cpu: 100m
-      memory: 500Mi
-    requests:
-      cpu: 10m
-      memory: 10Mi
-{{- end }}
-{{- end }}
-
 {{/*
   Use Authorization Policies or not.
 */}}
diff --git a/kubernetes/common/etcd-init/templates/job.yaml b/kubernetes/common/etcd-init/templates/job.yaml
index 30e37ea43e..1e72c1de45 100644
--- a/kubernetes/common/etcd-init/templates/job.yaml
+++ b/kubernetes/common/etcd-init/templates/job.yaml
@@ -71,8 +71,6 @@ spec:
           - /bin/sh
           - -ec
           - |
-            {{- if include "common.onServiceMesh" . }}
-            echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
             # Create users
             export ETCDCTL_ENDPOINTS=http://${ETCD_HOST}:${ETCD_PORT}
             export ETCDCTL_API=3
@@ -103,7 +101,6 @@ spec:
         - name: KEY_PREFIX
           value: "{{ .Values.config.keyPrefix }}"
         resources: {{ include "common.resources" . | nindent 10 }}
-      {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       {{- if .Values.nodeSelector }}
       nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
       {{- end -}}
diff --git a/kubernetes/common/etcd-init/values.yaml b/kubernetes/common/etcd-init/values.yaml
index 2af39ed573..b8b6703ee1 100644
--- a/kubernetes/common/etcd-init/values.yaml
+++ b/kubernetes/common/etcd-init/values.yaml
@@ -93,7 +93,3 @@ serviceAccount:
   nameOverride: etcd-init
   roles:
     - read
-
-wait_for_job_container:
-  containers:
-    - '{{ include "common.name" . }}'
diff --git a/kubernetes/common/mariadb-init/templates/job.yaml b/kubernetes/common/mariadb-init/templates/job.yaml
index bde0c77663..60a2279846 100644
--- a/kubernetes/common/mariadb-init/templates/job.yaml
+++ b/kubernetes/common/mariadb-init/templates/job.yaml
@@ -48,8 +48,6 @@ spec:
           - /bin/sh
           - -c
           - |
-            {{- if include "common.onServiceMesh" . }}
-            echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
             /db_init/db_init.sh {{ if or .Values.dbScriptConfigMap .Values.dbScript }} &&
             /db_config/db_cmd.sh{{ end }}
         env:
@@ -78,7 +76,6 @@ spec:
           mountPath: /db_config/
 {{- end }}
         resources: {{ include "common.resources" . | nindent 10 }}
-      {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/common/mariadb-init/values.yaml b/kubernetes/common/mariadb-init/values.yaml
index f698321f67..b3b917bdec 100644
--- a/kubernetes/common/mariadb-init/values.yaml
+++ b/kubernetes/common/mariadb-init/values.yaml
@@ -164,10 +164,6 @@ serviceAccount:
   roles:
     - read
 
-wait_for_job_container:
-  containers:
-    - '{{ include "common.name" . }}'
-
 readinessCheck:
   wait_for:
     services:
diff --git a/kubernetes/common/mongodb-init/templates/job.yaml b/kubernetes/common/mongodb-init/templates/job.yaml
index 2721d1ff45..22fdba81c2 100644
--- a/kubernetes/common/mongodb-init/templates/job.yaml
+++ b/kubernetes/common/mongodb-init/templates/job.yaml
@@ -48,9 +48,6 @@ spec:
           export MONGODB_ROOT_PASSWORD=`prepare_password $MONGODB_ROOT_PASSWORD_INPUT`;
           export MONGODB_USER=`prepare_password $MONGODB_USER_INPUT`;
           export MONGODB_ROOT_USER=`prepare_password $MONGODB_ROOT_USER_INPUT`;
-          {{- if include "common.onServiceMesh" . }}
-          echo "waiting 15s for istio side cars to be up"; sleep 15s;
-          {{- end }}
           cd /config-input && for PFILE in `ls -1 .`; do envsubst <${PFILE} >/config/${PFILE}; done;
         env:
         - name: MONGODB_HOST
@@ -103,7 +100,6 @@ spec:
         - mountPath: /config
           name: mgconf
         resources: {{ include "common.resources" . | nindent 10 }}
-      {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/common/mongodb-init/values.yaml b/kubernetes/common/mongodb-init/values.yaml
index 1ab74c635c..9d1d9c1c95 100644
--- a/kubernetes/common/mongodb-init/values.yaml
+++ b/kubernetes/common/mongodb-init/values.yaml
@@ -106,10 +106,6 @@ readinessCheck:
     services:
       - '{{ .Values.global.mongodb.service.name }}'
 
-wait_for_job_container:
-  containers:
-    - '{{ include "common.name" . }}-setup-db'
-
 # Annotations to control the execution and deletion of the job
 # Can be used to delete a job before an Upgrade
 #
diff --git a/kubernetes/common/postgres-init/templates/job.yaml b/kubernetes/common/postgres-init/templates/job.yaml
index c7b1cb2052..eb947bb2cc 100644
--- a/kubernetes/common/postgres-init/templates/job.yaml
+++ b/kubernetes/common/postgres-init/templates/job.yaml
@@ -46,8 +46,6 @@ spec:
           }
           export PG_PASSWORD=`prepare_password $PG_PASSWORD_INPUT`;
           export PG_ROOT_PASSWORD=`prepare_password $PG_ROOT_PASSWORD_INPUT`;
-          {{- if include "common.onServiceMesh" . }}
-          echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
           cd /config-input && for PFILE in `ls -1 .`; do envsubst <${PFILE} >/config/${PFILE}; done;
           psql "postgresql://postgres:$PG_ROOT_PASSWORD@$PG_HOST" < /config/setup.sql
         env:
@@ -78,7 +76,6 @@ spec:
           name: pgconf
         resources: {{ include "common.resources" . | nindent 10 }}
         {{ include "common.containerSecurityContext" . | indent 8 | trim }}
-      {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/common/postgres-init/values.yaml b/kubernetes/common/postgres-init/values.yaml
index 103ef047da..23cf6c982d 100644
--- a/kubernetes/common/postgres-init/values.yaml
+++ b/kubernetes/common/postgres-init/values.yaml
@@ -106,10 +106,6 @@ readinessCheck:
     services:
     - '{{ .Values.global.postgres.service.name2 }}'
 
-wait_for_job_container:
-  containers:
-    - '{{ include "common.name" . }}-update-config'
-
 # Annotations to control the execution and deletion of the job
 # Can be used to delete a job before an Upgrade
 #
diff --git a/kubernetes/sdc/components/sdc-be/templates/job.yaml b/kubernetes/sdc/components/sdc-be/templates/job.yaml
index c14de0b6e1..9ec17d3980 100644
--- a/kubernetes/sdc/components/sdc-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-be/templates/job.yaml
@@ -96,7 +96,6 @@ spec:
           value: {{ .Values.basicAuth.userPass }}
         resources:
           {{- toYaml .Values.resources_initContainer | nindent 12 }}
-      {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
         - name: {{ include "common.fullname" . }}-environments
diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index ed2cd2bd14..8e14cc212e 100644
--- a/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@ -180,10 +180,6 @@ readinessCheck:
     services:
       - sdc-be
 
-wait_for_job_container:
-  containers:
-    - '{{ include "common.name" . }}-job'
-
 #Log configuration
 log:
   path: /var/log/onap
diff --git a/kubernetes/sdc/components/sdc-cs/templates/job.yaml b/kubernetes/sdc/components/sdc-cs/templates/job.yaml
index ed4fbe63a2..995ec01ab6 100644
--- a/kubernetes/sdc/components/sdc-cs/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-cs/templates/job.yaml
@@ -99,7 +99,6 @@ spec:
           failureThreshold: {{ .Values.readiness.failureThreshold }}
         {{ include "common.containerSecurityContext" . | indent 10 | trim }}
         resources: {{ include "common.resources" . | nindent 12 }}
-      {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
       - name: {{ include "common.fullname" . }}-cassandra-db-scripts
diff --git a/kubernetes/sdc/components/sdc-cs/values.yaml b/kubernetes/sdc/components/sdc-cs/values.yaml
index a249cba17f..2cac8df265 100644
--- a/kubernetes/sdc/components/sdc-cs/values.yaml
+++ b/kubernetes/sdc/components/sdc-cs/values.yaml
@@ -200,10 +200,6 @@ serviceAccount:
   roles:
     - read
 
-wait_for_job_container:
-  containers:
-    - '{{ include "common.name" . }}-job'
-
 # Resource Limit flavor -By Default using small
 flavor: small
 # Segregation for Different environment (Small and Large)
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml b/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
index 7ff54e87dc..f44172c83c 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
@@ -46,7 +46,7 @@ spec:
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         {{- if include "common.onServiceMesh" . }}
         args:
-        - echo "waiting 10s for istio side cars to be up"; sleep 10s; /home/sdc/startup.sh
+        - /home/sdc/startup.sh
         command:
         - /bin/sh
         - -c
@@ -102,7 +102,6 @@ spec:
           successThreshold: {{ .Values.readiness.successThreshold }}
           failureThreshold: {{ .Values.readiness.failureThreshold }}
         {{ include "common.containerSecurityContext" . | indent 10 | trim }}
-      {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
       - name: {{ include "common.fullname" . }}-environments
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
index 132af2acce..32342c507a 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
@@ -152,10 +152,6 @@ serviceAccount:
   roles:
     - read
 
-wait_for_job_container:
-  containers:
-    - '{{ include "common.name" . }}-job'
-
 readinessCheck:
   wait_for:
     timeout: 25
diff --git a/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml b/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
index 057cb53533..79e88243fc 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
@@ -66,7 +66,6 @@ spec:
           - name: CS_PASSWORD
             valueFrom: {secretKeyRef: {name: {{ include "common.release" . }}-sdc-cs-secrets, key: sdc_password}}
         resources: {{ include "common.resources" . | nindent 10 }}
-      {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
         - name: {{ include "common.fullname" . }}-cqlshrc
diff --git a/kubernetes/sdc/components/sdc-wfd-be/values.yaml b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
index b03de4fd85..fb00e16925 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
@@ -173,10 +173,6 @@ serviceAccount:
   roles:
     - read
 
-wait_for_job_container:
-  containers:
-    - '{{ include "common.name" . }}-job'
-
 readinessCheck:
   waitForSdcCs:
     jobs:
diff --git a/kubernetes/sdnc/templates/job.yaml b/kubernetes/sdnc/templates/job.yaml
index 4a7ca8a2ab..ca6670b675 100755
--- a/kubernetes/sdnc/templates/job.yaml
+++ b/kubernetes/sdnc/templates/job.yaml
@@ -123,24 +123,6 @@ spec:
           - |
             sleep 60; {{.Values.config.binDir }}/installSdncDb.sh
         resources: {{ include "common.resources" . | nindent 10 }}
-      {{- if include "common.onServiceMesh" . }}
-      - name: sdnc-service-mesh-wait-for-job-container
-        image: {{ include "repositoryGenerator.image.quitQuit" . }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        command:
-          - /bin/sh
-          - "-c"
-        args:
-          - |
-            echo "waiting 20s for istio side cars to be up"; sleep 20s;
-            /app/ready.py --service-mesh-check sdnc -t 45;
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-      {{- end }}
       {{- if .Values.nodeSelector }}
       nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
       {{- end }}
diff --git a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
index 0b630e0aa8..d8559bd13c 100755
--- a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
+++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
@@ -115,24 +115,6 @@ spec:
             subPath: createSdnrDb.sh
         {{- end }}
         resources: {{ include "common.resources" . | nindent 10 }}
-      {{- if include "common.onServiceMesh" . }}
-      - name: sdnrdb-service-mesh-wait-for-job-container
-        image: {{ include "repositoryGenerator.image.quitQuit" . }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        command:
-          - /bin/sh
-          - "-c"
-        args:
-          - |
-            echo "waiting 30s for istio side cars to be up"; sleep 30s;
-            /app/ready.py --service-mesh-check sdnc-sdnrdb-init-job -t 45;
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-      {{- end }}
       {{- if .Values.nodeSelector }}
       nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
       {{- end -}}
diff --git a/kubernetes/so/components/so-mariadb/templates/job.yaml b/kubernetes/so/components/so-mariadb/templates/job.yaml
index d87faf9671..fa36eb0657 100644
--- a/kubernetes/so/components/so-mariadb/templates/job.yaml
+++ b/kubernetes/so/components/so-mariadb/templates/job.yaml
@@ -54,13 +54,10 @@ spec:
         - /bin/bash
         - -c
         - |
-          {{- if include "common.onServiceMesh" . }}
-          echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
           mysqldump -vv --user=${DB_USER} --password=${DB_PASS} --host=${DB_HOST} --port=${DB_PORT} --databases --single-transaction --quick --lock-tables=false catalogdb requestdb nfvo cnfm > /var/data/mariadb/backup-`date +%s`.sql
         volumeMounts:
         - name: backup-storage
           mountPath: /var/data/mariadb
-      {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
       - name: backup-storage
@@ -155,7 +152,6 @@ spec:
           mountPath: /var/data/mariadb
         {{- end }}
         resources: {{ include "common.resources" . | nindent 10 }}
-      {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/so/components/so-mariadb/values.yaml b/kubernetes/so/components/so-mariadb/values.yaml
index a2cf93c71d..cef2d9fb9b 100755
--- a/kubernetes/so/components/so-mariadb/values.yaml
+++ b/kubernetes/so/components/so-mariadb/values.yaml
@@ -200,10 +200,6 @@ serviceAccount:
   roles:
     - read
 
-wait_for_job_container:
-  containers:
-    - '{{ include "common.name" . }}-config'
-
 readinessCheck:
   wait_for:
     services:
diff --git a/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml b/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml
index cb5fc347c1..0a1e862924 100644
--- a/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml
+++ b/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml
@@ -56,7 +56,6 @@ spec:
         - name: init-data
           mountPath: /aaa/init/intent-analysis-init.sql
           subPath: intent-analysis-init.sql
-      {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       {{- include "common.imagePullSecrets" . | nindent 6 }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
diff --git a/kubernetes/uui/components/uui-intent-analysis/values.yaml b/kubernetes/uui/components/uui-intent-analysis/values.yaml
index c556618084..157a019bfd 100644
--- a/kubernetes/uui/components/uui-intent-analysis/values.yaml
+++ b/kubernetes/uui/components/uui-intent-analysis/values.yaml
@@ -101,10 +101,6 @@ readinessCheck:
     services:
       - '{{ .Values.postgres.service.name2 }}'
 
-wait_for_job_container:
-  containers:
-    - '{{ include "common.name" . }}-job'
-
 # We usually recommend not to specify default resources and to leave this as a conscious
 # choice for the user. This also increases chances charts run on environments with little
 # resources, such as Minikube. If you do want to specify resources, uncomment the following
diff --git a/kubernetes/uui/components/uui-llm-adaptation/templates/job.yaml b/kubernetes/uui/components/uui-llm-adaptation/templates/job.yaml
index 455d086c31..f3e5b11409 100644
--- a/kubernetes/uui/components/uui-llm-adaptation/templates/job.yaml
+++ b/kubernetes/uui/components/uui-llm-adaptation/templates/job.yaml
@@ -56,7 +56,6 @@ spec:
         - name: init-data
           mountPath: /aaa/init/llm-adaptation-init.sql
           subPath: llm-adaptation-init.sql
-      {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       {{- include "common.imagePullSecrets" . | nindent 6 }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
diff --git a/kubernetes/uui/components/uui-llm-adaptation/values.yaml b/kubernetes/uui/components/uui-llm-adaptation/values.yaml
index c803377b1c..66691af171 100644
--- a/kubernetes/uui/components/uui-llm-adaptation/values.yaml
+++ b/kubernetes/uui/components/uui-llm-adaptation/values.yaml
@@ -94,10 +94,6 @@ readinessCheck:
     services:
       - '{{ .Values.postgres.service.name2 }}'
 
-wait_for_job_container:
-  containers:
-    - '{{ include "common.name" . }}-job'
-
 # We usually recommend not to specify default resources and to leave this as a conscious
 # choice for the user. This also increases chances charts run on environments with little
 # resources, such as Minikube. If you do want to specify resources, uncomment the following
diff --git a/kubernetes/uui/components/uui-server/templates/job.yaml b/kubernetes/uui/components/uui-server/templates/job.yaml
index 3fd34c424a..13901ddee7 100644
--- a/kubernetes/uui/components/uui-server/templates/job.yaml
+++ b/kubernetes/uui/components/uui-server/templates/job.yaml
@@ -53,7 +53,6 @@ spec:
         - name: init-data
           mountPath: /aaa/init/postgres.sql
           subPath: postgres.sql
-      {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       {{- include "common.imagePullSecrets" . | nindent 6 }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml
index 40d0b494ee..6da81e7c13 100644
--- a/kubernetes/uui/components/uui-server/values.yaml
+++ b/kubernetes/uui/components/uui-server/values.yaml
@@ -178,10 +178,6 @@ readinessCheck:
     services:
       - '{{ .Values.postgres.service.name2 }}'
 
-wait_for_job_container:
-  containers:
-    - '{{ include "common.name" . }}-job'
-
 # Annotations to control the execution and deletion of the job
 # Can be used to delete a job before an Upgrade
 #