test: update unit tests after resource creation refactor

project-codeflare · Aug 27, 2024 · 2f81c45 · 2f81c45
1 parent f8238b2
commit 2f81c45
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 223 deletions.
diff --git a/tests/test-case-custom-image.yaml b/tests/test-case-custom-image.yaml
@@ -29,7 +29,6 @@ spec:
       block: 'true'
       dashboard-host: 0.0.0.0
       num-gpus: '0'
-      resources: '"{}"'
     serviceType: ClusterIP
     template:
       spec:
@@ -71,8 +70,6 @@ spec:
           - mountPath: /etc/ssl/certs/odh-ca-bundle.crt
             name: odh-ca-cert
             subPath: odh-ca-bundle.crt
-        imagePullSecrets:
-        - name: unit-test-pull-secret
         volumes:
         - configMap:
             items:
@@ -92,21 +89,15 @@ spec:
   workerGroupSpecs:
   - groupName: small-group-unit-test-cluster-custom-image
     maxReplicas: 2
-    minReplicas: 2
     rayStartParams:
       block: 'true'
       num-gpus: '7'
-      resources: '"{}"'
     replicas: 2
     template:
-      metadata:
-        annotations:
-          key: value
-        labels:
-          key: value
       spec:
         containers:
         - image: quay.io/project-codeflare/ray:2.20.0-py39-cu118
+          imagePullPolicy: Always
           lifecycle:
             preStop:
               exec:
@@ -137,8 +128,6 @@ spec:
           - mountPath: /etc/ssl/certs/odh-ca-bundle.crt
             name: odh-ca-cert
             subPath: odh-ca-bundle.crt
-        imagePullSecrets:
-        - name: unit-test-pull-secret
         volumes:
         - configMap:
             items:

diff --git a/tests/test-case-no-kueue-no-aw.yaml b/tests/test-case-no-kueue-no-aw.yaml
@@ -26,7 +26,6 @@ spec:
       block: 'true'
       dashboard-host: 0.0.0.0
       num-gpus: '0'
-      resources: '"{}"'
     serviceType: ClusterIP
     template:
       spec:
@@ -68,8 +67,6 @@ spec:
           - mountPath: /etc/ssl/certs/odh-ca-bundle.crt
             name: odh-ca-cert
             subPath: odh-ca-bundle.crt
-        imagePullSecrets:
-        - name: unit-test-pull-secret
         volumes:
         - configMap:
             items:
@@ -89,21 +86,15 @@ spec:
   workerGroupSpecs:
   - groupName: small-group-unit-test-no-kueue
     maxReplicas: 2
-    minReplicas: 2
     rayStartParams:
       block: 'true'
       num-gpus: '7'
-      resources: '"{}"'
     replicas: 2
     template:
-      metadata:
-        annotations:
-          key: value
-        labels:
-          key: value
       spec:
         containers:
         - image: quay.io/rhoai/ray:2.23.0-py39-cu121
+          imagePullPolicy: Always
           lifecycle:
             preStop:
               exec:
@@ -134,8 +125,6 @@ spec:
           - mountPath: /etc/ssl/certs/odh-ca-bundle.crt
             name: odh-ca-cert
             subPath: odh-ca-bundle.crt
-        imagePullSecrets:
-        - name: unit-test-pull-secret
         volumes:
         - configMap:
             items:

diff --git a/tests/test-case-no-mcad.yamls b/tests/test-case-no-mcad.yamls
@@ -29,7 +29,6 @@ spec:
       block: 'true'
       dashboard-host: 0.0.0.0
       num-gpus: '0'
-      resources: '"{}"'
     serviceType: ClusterIP
     template:
       spec:
@@ -71,8 +70,6 @@ spec:
           - mountPath: /etc/ssl/certs/odh-ca-bundle.crt
             name: odh-ca-cert
             subPath: odh-ca-bundle.crt
-        imagePullSecrets:
-        - name: unit-test-pull-secret
         volumes:
         - configMap:
             items:
@@ -92,21 +89,15 @@ spec:
   workerGroupSpecs:
   - groupName: small-group-unit-test-cluster-ray
     maxReplicas: 2
-    minReplicas: 2
     rayStartParams:
       block: 'true'
       num-gpus: '7'
-      resources: '"{}"'
     replicas: 2
     template:
-      metadata:
-        annotations:
-          key: value
-        labels:
-          key: value
       spec:
         containers:
         - image: quay.io/rhoai/ray:2.23.0-py39-cu121
+          imagePullPolicy: Always
           lifecycle:
             preStop:
               exec:
@@ -137,8 +128,6 @@ spec:
           - mountPath: /etc/ssl/certs/odh-ca-bundle.crt
             name: odh-ca-cert
             subPath: odh-ca-bundle.crt
-        imagePullSecrets:
-        - name: unit-test-pull-secret
         volumes:
         - configMap:
             items:

diff --git a/tests/test-case.yaml b/tests/test-case.yaml
@@ -34,7 +34,6 @@ spec:
             block: 'true'
             dashboard-host: 0.0.0.0
             num-gpus: '0'
-            resources: '"{}"'
           serviceType: ClusterIP
           template:
             spec:
@@ -76,8 +75,6 @@ spec:
                 - mountPath: /etc/ssl/certs/odh-ca-bundle.crt
                   name: odh-ca-cert
                   subPath: odh-ca-bundle.crt
-              imagePullSecrets:
-              - name: unit-test-pull-secret
               volumes:
               - configMap:
                   items:
@@ -97,21 +94,15 @@ spec:
         workerGroupSpecs:
         - groupName: small-group-unit-test-cluster
           maxReplicas: 2
-          minReplicas: 2
           rayStartParams:
             block: 'true'
             num-gpus: '7'
-            resources: '"{}"'
           replicas: 2
           template:
-            metadata:
-              annotations:
-                key: value
-              labels:
-                key: value
             spec:
               containers:
               - image: quay.io/rhoai/ray:2.23.0-py39-cu121
+                imagePullPolicy: Always
                 lifecycle:
                   preStop:
                     exec:
@@ -142,8 +133,6 @@ spec:
                 - mountPath: /etc/ssl/certs/odh-ca-bundle.crt
                   name: odh-ca-cert
                   subPath: odh-ca-bundle.crt
-              imagePullSecrets:
-              - name: unit-test-pull-secret
               volumes:
               - configMap:
                   items:

diff --git a/tests/test-default-appwrapper.yaml b/tests/test-default-appwrapper.yaml
@@ -34,11 +34,9 @@ spec:
             block: 'true'
             dashboard-host: 0.0.0.0
             num-gpus: '0'
-            resources: '"{}"'
           serviceType: ClusterIP
           template:
             spec:
-              imagePullSecrets: []
               containers:
               - image: quay.io/rhoai/ray:2.23.0-py39-cu121
                 imagePullPolicy: Always
@@ -96,22 +94,15 @@ spec:
         workerGroupSpecs:
         - groupName: small-group-unit-test-default-cluster
           maxReplicas: 1
-          minReplicas: 1
           rayStartParams:
             block: 'true'
             num-gpus: '0'
-            resources: '"{}"'
           replicas: 1
           template:
-            metadata:
-              annotations:
-                key: value
-              labels:
-                key: value
             spec:
-              imagePullSecrets: []
               containers:
               - image: quay.io/rhoai/ray:2.23.0-py39-cu121
+                imagePullPolicy: Always
                 lifecycle:
                   preStop:
                     exec: