Removal of init_myservice initContainer

Fiona-Waters · openshift-merge-bot[bot] · commit 5bbaddec88a1 · 2023-12-06T11:19:43.000Z
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml
@@ -166,14 +166,6 @@ spec:
                       memory: 8G
                       nvidia.com/gpu: 1
                 imagePullSecrets: []
-                initContainers:
-                - command:
-                  - sh
-                  - -c
-                  - until nslookup $RAY_IP.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local;
-                    do echo waiting for myservice; sleep 2; done
-                  image: quay.io/project-codeflare/busybox:latest
-                  name: init-myservice
       replicas: 1
     - generictemplate:
         apiVersion: route.openshift.io/v1
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/instascaletest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/instascaletest.yaml
@@ -166,14 +166,6 @@ spec:
                       memory: 8G
                       nvidia.com/gpu: 1
                 imagePullSecrets: []
-                initContainers:
-                - command:
-                  - sh
-                  - -c
-                  - until nslookup $RAY_IP.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local;
-                    do echo waiting for myservice; sleep 2; done
-                  image: quay.io/project-codeflare/busybox:latest
-                  name: init-myservice
       replicas: 1
     - generictemplate:
         apiVersion: route.openshift.io/v1
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml
@@ -166,14 +166,6 @@ spec:
                       memory: 8G
                       nvidia.com/gpu: 1
                 imagePullSecrets: []
-                initContainers:
-                - command:
-                  - sh
-                  - -c
-                  - until nslookup $RAY_IP.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local;
-                    do echo waiting for myservice; sleep 2; done
-                  image: quay.io/project-codeflare/busybox:latest
-                  name: init-myservice
       replicas: 1
     - generictemplate:
         apiVersion: route.openshift.io/v1
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/jobtest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/jobtest.yaml
@@ -146,14 +146,6 @@ spec:
                       memory: 4G
                       nvidia.com/gpu: 0
                 imagePullSecrets: []
-                initContainers:
-                - command:
-                  - sh
-                  - -c
-                  - until nslookup $RAY_IP.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local;
-                    do echo waiting for myservice; sleep 2; done
-                  image: quay.io/project-codeflare/busybox:latest
-                  name: init-myservice
       replicas: 1
     - generictemplate:
         apiVersion: route.openshift.io/v1
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/raytest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/raytest.yaml
@@ -146,14 +146,6 @@ spec:
                       memory: 4G
                       nvidia.com/gpu: 0
                 imagePullSecrets: []
-                initContainers:
-                - command:
-                  - sh
-                  - -c
-                  - until nslookup $RAY_IP.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local;
-                    do echo waiting for myservice; sleep 2; done
-                  image: quay.io/project-codeflare/busybox:latest
-                  name: init-myservice
       replicas: 1
     - generictemplate:
         apiVersion: route.openshift.io/v1
diff --git a/src/codeflare_sdk/templates/base-template.yaml b/src/codeflare_sdk/templates/base-template.yaml
@@ -223,9 +223,6 @@ spec:
                           - "aw-kuberay"
                 initContainers:
                 # the env var $RAY_IP is set by the operator if missing, with the value of the head service name
-                - name: init-myservice
-                  image: quay.io/project-codeflare/busybox:latest
-                  command: ['sh', '-c', "until nslookup $RAY_IP.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local; do echo waiting for myservice; sleep 2; done"]
                 - name: create-cert
                   image: rayproject/ray:2.7.0
                   command:
diff --git a/src/codeflare_sdk/utils/generate_yaml.py b/src/codeflare_sdk/utils/generate_yaml.py
@@ -493,7 +493,7 @@ def disable_raycluster_tls(resources):
         ):
             del generic_template_spec["workerGroupSpecs"][0]["template"]["spec"][
                 "initContainers"
-            ][i]
+            ]
 
     updated_items = []
     for i in resources["GenericItems"][:]:
diff --git a/tests/test-case-bad.yaml b/tests/test-case-bad.yaml
@@ -148,14 +148,6 @@ spec:
                       cpu: 3
                       memory: 5G
                       nvidia.com/gpu: 7
-                initContainers:
-                - command:
-                  - sh
-                  - -c
-                  - until nslookup $RAY_IP.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local;
-                    do echo waiting for myservice; sleep 2; done
-                  image: quay.io/project-codeflare/busybox:latest
-                  name: init-myservice
       replicas: 1
     - generictemplate:
         apiVersion: route.openshift.io/v1
diff --git a/tests/test-case-no-mcad.yamls b/tests/test-case-no-mcad.yamls
@@ -138,14 +138,6 @@ spec:
               nvidia.com/gpu: 7
         imagePullSecrets:
         - name: unit-test-pull-secret
-        initContainers:
-        - command:
-          - sh
-          - -c
-          - until nslookup $RAY_IP.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local;
-            do echo waiting for myservice; sleep 2; done
-          image: quay.io/project-codeflare/busybox:latest
-          name: init-myservice
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
diff --git a/tests/test-case-prio.yaml b/tests/test-case-prio.yaml
@@ -169,14 +169,6 @@ spec:
                       nvidia.com/gpu: 7
                 imagePullSecrets:
                 - name: unit-test-pull-secret
-                initContainers:
-                - command:
-                  - sh
-                  - -c
-                  - until nslookup $RAY_IP.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local;
-                    do echo waiting for myservice; sleep 2; done
-                  image: quay.io/project-codeflare/busybox:latest
-                  name: init-myservice
                 priorityClassName: default
       replicas: 1
     - generictemplate:
diff --git a/tests/test-case.yaml b/tests/test-case.yaml
@@ -167,14 +167,6 @@ spec:
                       nvidia.com/gpu: 7
                 imagePullSecrets:
                 - name: unit-test-pull-secret
-                initContainers:
-                - command:
-                  - sh
-                  - -c
-                  - until nslookup $RAY_IP.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local;
-                    do echo waiting for myservice; sleep 2; done
-                  image: quay.io/project-codeflare/busybox:latest
-                  name: init-myservice
       replicas: 1
     - generictemplate:
         apiVersion: networking.k8s.io/v1
diff --git a/tests/unit_test.py b/tests/unit_test.py
