Update tests to have single operator deployment for v1beta1 and v1beta2 API (#147)

* Update to single operator deployment for v1beta1 and v1beta2

* Added comment

* Removing unused files

Author: johnugeorge

pkg/controller.v1beta2/pytorch/pod.go

@@ -51,6 +51,7 @@ func (pc *PyTorchController) reconcilePods(
 	// Convert PyTorchReplicaType to lower string.
 	rt := strings.ToLower(string(rtype))
 	logger := pylogger.LoggerForReplica(job, rt)
+	// Workers are started only when master pod is in running state
 	if rtype == v1beta2.PyTorchReplicaTypeWorker {
 		if ContainMasterSpec(job) {
 			masterPod, err := pc.FilterPodsForReplicaType(pods, strings.ToLower(string(v1beta2.PyTorchReplicaTypeMaster)))

scripts/setup-kubeflow.sh

@@ -52,3 +52,13 @@ cd ${APP_NAME}
 
 echo "Install PyTorch ksonnet package"
 /usr/local/bin/ks pkg install kubeflow/pytorch-job@${KUBEFLOW_VERSION}
+
+echo "Install PyTorch operator"
+/usr/local/bin/ks generate pytorch-operator pytorch-operator --pytorchJobImage=${REGISTRY}/${REPO_NAME}:${VERSION}
+/usr/local/bin/ks apply ${KF_ENV} -c pytorch-operator
+
+TIMEOUT=30
+until kubectl get pods -n ${NAMESPACE} | grep pytorch-operator | grep 1/1 || [[ $TIMEOUT -eq 1 ]]; do
+  sleep 10
+  TIMEOUT=$(( TIMEOUT - 1 ))
+done

scripts/v1beta1/delete-v1beta1.sh

@@ -225,12 +225,6 @@
                     template: "setup-kubeflow",
                   },
                 ],
-                [
-                  {
-                    name: "setup-v1beta1",
-                    template: "setup-v1beta1",
-                  },
-                ],
                 [
                   {
                     name: "run-v1beta1-defaults",
@@ -241,18 +235,6 @@
                     template: "run-v1beta1-cleanpodpolicy-all",
                   },
                 ],
-                [
-                  {
-                    name: "delete-v1beta1",
-                    template: "delete-v1beta1",
-                  },
-                ],
-                [
-                  {
-                    name: "setup-v1beta2",
-                    template: "setup-v1beta2",
-                  },
-                ],
                 [
                   {
                     name: "run-v1beta2-defaults",
@@ -263,12 +245,6 @@
                     template: "run-v1beta2-cleanpodpolicy-all",
                   },
                 ],
-                [
-                  {
-                    name: "delete-v1beta2",
-                    template: "delete-v1beta2",
-                  },
-                ],
               ],
             },
             {
@@ -311,30 +287,18 @@
             $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("setup-kubeflow", testWorkerImage, [
               "scripts/setup-kubeflow.sh",
             ]),  // setup kubeflow
-            $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("setup-v1beta1", testWorkerImage, [
-              "scripts/v1beta1/setup-v1beta1.sh",
-            ]),  // setup operator v1beta1 version
             $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("run-v1beta1-defaults", testWorkerImage, [
               "scripts/v1beta1/run-defaults.sh",
             ]),  // run v1beta1 default tests
             $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("run-v1beta1-cleanpodpolicy-all", testWorkerImage, [
               "scripts/v1beta1/run-cleanpodpolicy-all.sh",
             ]),  // run v1beta1 cleanpodpolicy tests
-            $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("delete-v1beta1", testWorkerImage, [
-              "scripts/v1beta1/delete-v1beta1.sh",
-            ]),  // delete operator v1beta1 version
-            $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("setup-v1beta2", testWorkerImage, [
-              "scripts/v1beta2/setup-v1beta2.sh",
-            ]),  // setup operator v1beta2 version
             $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("run-v1beta2-defaults", testWorkerImage, [
               "scripts/v1beta2/run-defaults.sh",
             ]),  // run v1beta2 default tests
             $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("run-v1beta2-cleanpodpolicy-all", testWorkerImage, [
               "scripts/v1beta2/run-cleanpodpolicy-all.sh",
             ]),  // run v1beta2 cleanpodpolicy tests
-            $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("delete-v1beta2", testWorkerImage, [
-              "scripts/v1beta2/delete-v1beta2.sh",
-            ]),  // delete operator v1beta2 version
 
             $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("create-pr-symlink", testWorkerImage, [
               "python",