Skip to content
This repository was archived by the owner on Sep 19, 2022. It is now read-only.

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

Merged
merged 3 commits into from
Mar 12, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c3875f
Update to single operator deployment for v1beta1 and v1beta2
johnugeorge Mar 12, 2019
b104147
Added comment
johnugeorge Mar 12, 2019
8933663
Removing unused files
johnugeorge Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/controller.v1beta2/pytorch/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
10 changes: 10 additions & 0 deletions scripts/setup-kubeflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
43 changes: 0 additions & 43 deletions scripts/v1beta1/delete-v1beta1.sh
View file
Open in desktop

This file was deleted.

51 changes: 0 additions & 51 deletions scripts/v1beta1/setup-v1beta1.sh
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions scripts/v1beta2/delete-v1beta2.sh
View file
Open in desktop

This file was deleted.

51 changes: 0 additions & 51 deletions scripts/v1beta2/setup-v1beta2.sh
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions test/workflows/components/workflows.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,6 @@
template: "setup-kubeflow",
},
],
[
{
name: "setup-v1beta1",
template: "setup-v1beta1",
},
],
[
{
name: "run-v1beta1-defaults",
Expand All @@ -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",
Expand All @@ -263,12 +245,6 @@
template: "run-v1beta2-cleanpodpolicy-all",
},
],
[
{
name: "delete-v1beta2",
template: "delete-v1beta2",
},
],
],
},
{
Expand Down Expand Up @@ -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",
Expand Down