diff --git a/Makefile b/Makefile index 69044fcbf65..5f5530ab9a6 100644 --- a/Makefile +++ b/Makefile @@ -4,11 +4,11 @@ test: # Build Katib images build: - sh scripts/build.sh + sh scripts/v1alpha1/build.sh # Deploy katib manifests into a k8s cluster deploy: - sh scripts/deploy.sh + sh scripts/v1alpha1/deploy.sh # Run go fmt against code fmt: diff --git a/examples/MinikubeDemo/deploy.sh b/examples/v1alpha1/MinikubeDemo/deploy.sh similarity index 65% rename from examples/MinikubeDemo/deploy.sh rename to examples/v1alpha1/MinikubeDemo/deploy.sh index aec1af4305e..38fbbd92eb2 100755 --- a/examples/MinikubeDemo/deploy.sh +++ b/examples/v1alpha1/MinikubeDemo/deploy.sh @@ -2,4 +2,4 @@ set -x set -e minikube start --disk-size 50g --memory 4096 --cpus 4 -bash ../../scripts/deploy.sh +bash ../../../scripts/v1alpha1/deploy.sh diff --git a/examples/MinikubeDemo/destroy.sh b/examples/v1alpha1/MinikubeDemo/destroy.sh similarity index 100% rename from examples/MinikubeDemo/destroy.sh rename to examples/v1alpha1/MinikubeDemo/destroy.sh diff --git a/examples/MinikubeDemo/mnist-models.yaml b/examples/v1alpha1/MinikubeDemo/mnist-models.yaml similarity index 100% rename from examples/MinikubeDemo/mnist-models.yaml rename to examples/v1alpha1/MinikubeDemo/mnist-models.yaml diff --git a/examples/NAS-training-containers/cifar10/Dockerfile b/examples/v1alpha1/NAS-training-containers/cifar10/Dockerfile similarity index 100% rename from examples/NAS-training-containers/cifar10/Dockerfile rename to examples/v1alpha1/NAS-training-containers/cifar10/Dockerfile diff --git a/examples/NAS-training-containers/cifar10/ModelConstructor.py b/examples/v1alpha1/NAS-training-containers/cifar10/ModelConstructor.py similarity index 100% rename from examples/NAS-training-containers/cifar10/ModelConstructor.py rename to examples/v1alpha1/NAS-training-containers/cifar10/ModelConstructor.py diff --git a/examples/NAS-training-containers/cifar10/RunTrial.py b/examples/v1alpha1/NAS-training-containers/cifar10/RunTrial.py similarity index 100% rename from examples/NAS-training-containers/cifar10/RunTrial.py rename to examples/v1alpha1/NAS-training-containers/cifar10/RunTrial.py diff --git a/examples/NAS-training-containers/cifar10/op_library.py b/examples/v1alpha1/NAS-training-containers/cifar10/op_library.py similarity index 100% rename from examples/NAS-training-containers/cifar10/op_library.py rename to examples/v1alpha1/NAS-training-containers/cifar10/op_library.py diff --git a/examples/NAS-training-containers/cifar10/requirements.txt b/examples/v1alpha1/NAS-training-containers/cifar10/requirements.txt similarity index 100% rename from examples/NAS-training-containers/cifar10/requirements.txt rename to examples/v1alpha1/NAS-training-containers/cifar10/requirements.txt diff --git a/examples/README.md b/examples/v1alpha1/README.md similarity index 100% rename from examples/README.md rename to examples/v1alpha1/README.md diff --git a/examples/bayseopt-example.yaml b/examples/v1alpha1/bayseopt-example.yaml similarity index 100% rename from examples/bayseopt-example.yaml rename to examples/v1alpha1/bayseopt-example.yaml diff --git a/examples/gpu-example.yaml b/examples/v1alpha1/gpu-example.yaml similarity index 100% rename from examples/gpu-example.yaml rename to examples/v1alpha1/gpu-example.yaml diff --git a/examples/grid-example.yaml b/examples/v1alpha1/grid-example.yaml similarity index 100% rename from examples/grid-example.yaml rename to examples/v1alpha1/grid-example.yaml diff --git a/examples/hypb-example.yaml b/examples/v1alpha1/hypb-example.yaml similarity index 100% rename from examples/hypb-example.yaml rename to examples/v1alpha1/hypb-example.yaml diff --git a/examples/nasjob-example-RL.yaml b/examples/v1alpha1/nasjob-example-RL.yaml similarity index 100% rename from examples/nasjob-example-RL.yaml rename to examples/v1alpha1/nasjob-example-RL.yaml diff --git a/examples/pytorchjob-example.yaml b/examples/v1alpha1/pytorchjob-example.yaml similarity index 100% rename from examples/pytorchjob-example.yaml rename to examples/v1alpha1/pytorchjob-example.yaml diff --git a/examples/random-example.yaml b/examples/v1alpha1/random-example.yaml similarity index 100% rename from examples/random-example.yaml rename to examples/v1alpha1/random-example.yaml diff --git a/examples/tf-event_test.yaml b/examples/v1alpha1/tf-event_test.yaml similarity index 100% rename from examples/tf-event_test.yaml rename to examples/v1alpha1/tf-event_test.yaml diff --git a/examples/tfevent-volume/tfevent-pv.yaml b/examples/v1alpha1/tfevent-volume/tfevent-pv.yaml similarity index 100% rename from examples/tfevent-volume/tfevent-pv.yaml rename to examples/v1alpha1/tfevent-volume/tfevent-pv.yaml diff --git a/examples/tfevent-volume/tfevent-pvc.yaml b/examples/v1alpha1/tfevent-volume/tfevent-pvc.yaml similarity index 100% rename from examples/tfevent-volume/tfevent-pvc.yaml rename to examples/v1alpha1/tfevent-volume/tfevent-pvc.yaml diff --git a/examples/tfjob-example.yaml b/examples/v1alpha1/tfjob-example.yaml similarity index 100% rename from examples/tfjob-example.yaml rename to examples/v1alpha1/tfjob-example.yaml diff --git a/examples/workerConfigMap.yaml b/examples/v1alpha1/workerConfigMap.yaml similarity index 100% rename from examples/workerConfigMap.yaml rename to examples/v1alpha1/workerConfigMap.yaml diff --git a/examples/xgboost-bayesian-example.yaml b/examples/v1alpha1/xgboost-bayesian-example.yaml similarity index 100% rename from examples/xgboost-bayesian-example.yaml rename to examples/v1alpha1/xgboost-bayesian-example.yaml diff --git a/manifests/0-namespace.yaml b/manifests/v1alpha1/0-namespace.yaml similarity index 100% rename from manifests/0-namespace.yaml rename to manifests/v1alpha1/0-namespace.yaml diff --git a/manifests/pv/pv.yaml b/manifests/v1alpha1/pv/pv.yaml similarity index 100% rename from manifests/pv/pv.yaml rename to manifests/v1alpha1/pv/pv.yaml diff --git a/manifests/pv/pvc.yaml b/manifests/v1alpha1/pv/pvc.yaml similarity index 100% rename from manifests/pv/pvc.yaml rename to manifests/v1alpha1/pv/pvc.yaml diff --git a/manifests/studyjobcontroller/crd.yaml b/manifests/v1alpha1/studyjobcontroller/crd.yaml similarity index 100% rename from manifests/studyjobcontroller/crd.yaml rename to manifests/v1alpha1/studyjobcontroller/crd.yaml diff --git a/manifests/studyjobcontroller/mcrbac.yaml b/manifests/v1alpha1/studyjobcontroller/mcrbac.yaml similarity index 100% rename from manifests/studyjobcontroller/mcrbac.yaml rename to manifests/v1alpha1/studyjobcontroller/mcrbac.yaml diff --git a/manifests/studyjobcontroller/metricsControllerConfigMap.yaml b/manifests/v1alpha1/studyjobcontroller/metricsControllerConfigMap.yaml similarity index 100% rename from manifests/studyjobcontroller/metricsControllerConfigMap.yaml rename to manifests/v1alpha1/studyjobcontroller/metricsControllerConfigMap.yaml diff --git a/manifests/studyjobcontroller/pytorchjobsCrd.yaml b/manifests/v1alpha1/studyjobcontroller/pytorchjobsCrd.yaml similarity index 100% rename from manifests/studyjobcontroller/pytorchjobsCrd.yaml rename to manifests/v1alpha1/studyjobcontroller/pytorchjobsCrd.yaml diff --git a/manifests/studyjobcontroller/rbac.yaml b/manifests/v1alpha1/studyjobcontroller/rbac.yaml similarity index 100% rename from manifests/studyjobcontroller/rbac.yaml rename to manifests/v1alpha1/studyjobcontroller/rbac.yaml diff --git a/manifests/studyjobcontroller/service.yaml b/manifests/v1alpha1/studyjobcontroller/service.yaml similarity index 100% rename from manifests/studyjobcontroller/service.yaml rename to manifests/v1alpha1/studyjobcontroller/service.yaml diff --git a/manifests/studyjobcontroller/studyjobcontroller.yaml b/manifests/v1alpha1/studyjobcontroller/studyjobcontroller.yaml similarity index 100% rename from manifests/studyjobcontroller/studyjobcontroller.yaml rename to manifests/v1alpha1/studyjobcontroller/studyjobcontroller.yaml diff --git a/manifests/studyjobcontroller/tfjobsCrd.yaml b/manifests/v1alpha1/studyjobcontroller/tfjobsCrd.yaml similarity index 100% rename from manifests/studyjobcontroller/tfjobsCrd.yaml rename to manifests/v1alpha1/studyjobcontroller/tfjobsCrd.yaml diff --git a/manifests/studyjobcontroller/workerConfigMap.yaml b/manifests/v1alpha1/studyjobcontroller/workerConfigMap.yaml similarity index 100% rename from manifests/studyjobcontroller/workerConfigMap.yaml rename to manifests/v1alpha1/studyjobcontroller/workerConfigMap.yaml diff --git a/manifests/vizier/core-rest/deployment.yaml b/manifests/v1alpha1/vizier/core-rest/deployment.yaml similarity index 100% rename from manifests/vizier/core-rest/deployment.yaml rename to manifests/v1alpha1/vizier/core-rest/deployment.yaml diff --git a/manifests/vizier/core-rest/ingress.yaml_ b/manifests/v1alpha1/vizier/core-rest/ingress.yaml_ similarity index 100% rename from manifests/vizier/core-rest/ingress.yaml_ rename to manifests/v1alpha1/vizier/core-rest/ingress.yaml_ diff --git a/manifests/vizier/core-rest/service.yaml b/manifests/v1alpha1/vizier/core-rest/service.yaml similarity index 100% rename from manifests/vizier/core-rest/service.yaml rename to manifests/v1alpha1/vizier/core-rest/service.yaml diff --git a/manifests/vizier/core/deployment.yaml b/manifests/v1alpha1/vizier/core/deployment.yaml similarity index 100% rename from manifests/vizier/core/deployment.yaml rename to manifests/v1alpha1/vizier/core/deployment.yaml diff --git a/manifests/vizier/core/ingress.yaml_fw b/manifests/v1alpha1/vizier/core/ingress.yaml_fw similarity index 100% rename from manifests/vizier/core/ingress.yaml_fw rename to manifests/v1alpha1/vizier/core/ingress.yaml_fw diff --git a/manifests/vizier/core/rbac.yaml b/manifests/v1alpha1/vizier/core/rbac.yaml similarity index 100% rename from manifests/vizier/core/rbac.yaml rename to manifests/v1alpha1/vizier/core/rbac.yaml diff --git a/manifests/vizier/core/service.yaml b/manifests/v1alpha1/vizier/core/service.yaml similarity index 100% rename from manifests/vizier/core/service.yaml rename to manifests/v1alpha1/vizier/core/service.yaml diff --git a/manifests/vizier/db/deployment.yaml b/manifests/v1alpha1/vizier/db/deployment.yaml similarity index 100% rename from manifests/vizier/db/deployment.yaml rename to manifests/v1alpha1/vizier/db/deployment.yaml diff --git a/manifests/vizier/db/secret.yaml b/manifests/v1alpha1/vizier/db/secret.yaml similarity index 100% rename from manifests/vizier/db/secret.yaml rename to manifests/v1alpha1/vizier/db/secret.yaml diff --git a/manifests/vizier/db/service.yaml b/manifests/v1alpha1/vizier/db/service.yaml similarity index 100% rename from manifests/vizier/db/service.yaml rename to manifests/v1alpha1/vizier/db/service.yaml diff --git a/manifests/vizier/earlystopping/medianstopping/deployment.yaml b/manifests/v1alpha1/vizier/earlystopping/medianstopping/deployment.yaml similarity index 100% rename from manifests/vizier/earlystopping/medianstopping/deployment.yaml rename to manifests/v1alpha1/vizier/earlystopping/medianstopping/deployment.yaml diff --git a/manifests/vizier/earlystopping/medianstopping/service.yaml b/manifests/v1alpha1/vizier/earlystopping/medianstopping/service.yaml similarity index 100% rename from manifests/vizier/earlystopping/medianstopping/service.yaml rename to manifests/v1alpha1/vizier/earlystopping/medianstopping/service.yaml diff --git a/manifests/vizier/suggestion/bayesianoptimization/deployment.yaml b/manifests/v1alpha1/vizier/suggestion/bayesianoptimization/deployment.yaml similarity index 100% rename from manifests/vizier/suggestion/bayesianoptimization/deployment.yaml rename to manifests/v1alpha1/vizier/suggestion/bayesianoptimization/deployment.yaml diff --git a/manifests/vizier/suggestion/bayesianoptimization/service.yaml b/manifests/v1alpha1/vizier/suggestion/bayesianoptimization/service.yaml similarity index 100% rename from manifests/vizier/suggestion/bayesianoptimization/service.yaml rename to manifests/v1alpha1/vizier/suggestion/bayesianoptimization/service.yaml diff --git a/manifests/vizier/suggestion/grid/deployment.yaml b/manifests/v1alpha1/vizier/suggestion/grid/deployment.yaml similarity index 100% rename from manifests/vizier/suggestion/grid/deployment.yaml rename to manifests/v1alpha1/vizier/suggestion/grid/deployment.yaml diff --git a/manifests/vizier/suggestion/grid/service.yaml b/manifests/v1alpha1/vizier/suggestion/grid/service.yaml similarity index 100% rename from manifests/vizier/suggestion/grid/service.yaml rename to manifests/v1alpha1/vizier/suggestion/grid/service.yaml diff --git a/manifests/vizier/suggestion/hyperband/deployment.yaml b/manifests/v1alpha1/vizier/suggestion/hyperband/deployment.yaml similarity index 100% rename from manifests/vizier/suggestion/hyperband/deployment.yaml rename to manifests/v1alpha1/vizier/suggestion/hyperband/deployment.yaml diff --git a/manifests/vizier/suggestion/hyperband/service.yaml b/manifests/v1alpha1/vizier/suggestion/hyperband/service.yaml similarity index 100% rename from manifests/vizier/suggestion/hyperband/service.yaml rename to manifests/v1alpha1/vizier/suggestion/hyperband/service.yaml diff --git a/manifests/vizier/suggestion/nasrl/deployment.yaml b/manifests/v1alpha1/vizier/suggestion/nasrl/deployment.yaml similarity index 100% rename from manifests/vizier/suggestion/nasrl/deployment.yaml rename to manifests/v1alpha1/vizier/suggestion/nasrl/deployment.yaml diff --git a/manifests/vizier/suggestion/nasrl/service.yaml b/manifests/v1alpha1/vizier/suggestion/nasrl/service.yaml similarity index 100% rename from manifests/vizier/suggestion/nasrl/service.yaml rename to manifests/v1alpha1/vizier/suggestion/nasrl/service.yaml diff --git a/manifests/vizier/suggestion/random/deployment.yaml b/manifests/v1alpha1/vizier/suggestion/random/deployment.yaml similarity index 100% rename from manifests/vizier/suggestion/random/deployment.yaml rename to manifests/v1alpha1/vizier/suggestion/random/deployment.yaml diff --git a/manifests/vizier/suggestion/random/service.yaml b/manifests/v1alpha1/vizier/suggestion/random/service.yaml similarity index 100% rename from manifests/vizier/suggestion/random/service.yaml rename to manifests/v1alpha1/vizier/suggestion/random/service.yaml diff --git a/manifests/vizier/ui/deployment.yaml b/manifests/v1alpha1/vizier/ui/deployment.yaml similarity index 100% rename from manifests/vizier/ui/deployment.yaml rename to manifests/v1alpha1/vizier/ui/deployment.yaml diff --git a/manifests/vizier/ui/rbac.yaml b/manifests/v1alpha1/vizier/ui/rbac.yaml similarity index 100% rename from manifests/vizier/ui/rbac.yaml rename to manifests/v1alpha1/vizier/ui/rbac.yaml diff --git a/manifests/vizier/ui/service.yaml b/manifests/v1alpha1/vizier/ui/service.yaml similarity index 100% rename from manifests/vizier/ui/service.yaml rename to manifests/v1alpha1/vizier/ui/service.yaml diff --git a/scripts/deploy.sh b/scripts/deploy.sh deleted file mode 100755 index 0bff11e748b..00000000000 --- a/scripts/deploy.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -# Copyright 2018 The Kubeflow Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -o errexit -set -o nounset -set -o pipefail -set -o xtrace - -SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/.. - -cd ${SCRIPT_ROOT} -kubectl apply -f manifests/0-namespace.yaml -kubectl apply -f manifests/pv -kubectl apply -f manifests/vizier/db -kubectl apply -f manifests/vizier/core -kubectl apply -f manifests/vizier/core-rest -kubectl apply -f manifests/vizier/ui -kubectl apply -f manifests/vizier/suggestion/random -kubectl apply -f manifests/vizier/suggestion/grid -kubectl apply -f manifests/vizier/suggestion/hyperband -kubectl apply -f manifests/vizier/suggestion/bayesianoptimization -kubectl apply -f manifests/vizier/suggestion/nasrl -kubectl apply -f manifests/vizier/earlystopping/medianstopping -kubectl apply -f manifests/studyjobcontroller/crd.yaml -kubectl apply -f manifests/studyjobcontroller/tfjobsCrd.yaml -kubectl apply -f manifests/studyjobcontroller/pytorchjobsCrd.yaml -kubectl apply -f manifests/studyjobcontroller/rbac.yaml -kubectl apply -f manifests/studyjobcontroller/mcrbac.yaml -kubectl apply -f manifests/studyjobcontroller/workerConfigMap.yaml -kubectl apply -f manifests/studyjobcontroller/metricsControllerConfigMap.yaml -kubectl apply -f manifests/studyjobcontroller/studyjobcontroller.yaml -cd - > /dev/null diff --git a/scripts/build.sh b/scripts/v1alpha1/build.sh similarity index 97% rename from scripts/build.sh rename to scripts/v1alpha1/build.sh index ba2dc28654e..aa0f0da618d 100755 --- a/scripts/build.sh +++ b/scripts/v1alpha1/build.sh @@ -21,7 +21,7 @@ set -o pipefail PREFIX="katib" CMD_PREFIX="cmd" -SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/.. +SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/../.. cd ${SCRIPT_ROOT} diff --git a/scripts/v1alpha1/deploy.sh b/scripts/v1alpha1/deploy.sh new file mode 100755 index 00000000000..4a079e16931 --- /dev/null +++ b/scripts/v1alpha1/deploy.sh @@ -0,0 +1,45 @@ +#!/bin/bash + +# Copyright 2018 The Kubeflow Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -o errexit +set -o nounset +set -o pipefail +set -o xtrace + +SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/../.. + +cd ${SCRIPT_ROOT} +kubectl apply -f manifests/v1alpha1/0-namespace.yaml +kubectl apply -f manifests/v1alpha1/pv +kubectl apply -f manifests/v1alpha1/vizier/db +kubectl apply -f manifests/v1alpha1/vizier/core +kubectl apply -f manifests/v1alpha1/vizier/core-rest +kubectl apply -f manifests/v1alpha1/vizier/ui +kubectl apply -f manifests/v1alpha1/vizier/suggestion/random +kubectl apply -f manifests/v1alpha1/vizier/suggestion/grid +kubectl apply -f manifests/v1alpha1/vizier/suggestion/hyperband +kubectl apply -f manifests/v1alpha1/vizier/suggestion/bayesianoptimization +kubectl apply -f manifests/v1alpha1/vizier/suggestion/nasrl +kubectl apply -f manifests/v1alpha1/vizier/earlystopping/medianstopping +kubectl apply -f manifests/v1alpha1/studyjobcontroller/crd.yaml +kubectl apply -f manifests/v1alpha1/studyjobcontroller/tfjobsCrd.yaml +kubectl apply -f manifests/v1alpha1/studyjobcontroller/pytorchjobsCrd.yaml +kubectl apply -f manifests/v1alpha1/studyjobcontroller/rbac.yaml +kubectl apply -f manifests/v1alpha1/studyjobcontroller/mcrbac.yaml +kubectl apply -f manifests/v1alpha1/studyjobcontroller/workerConfigMap.yaml +kubectl apply -f manifests/v1alpha1/studyjobcontroller/metricsControllerConfigMap.yaml +kubectl apply -f manifests/v1alpha1/studyjobcontroller/studyjobcontroller.yaml +cd - > /dev/null diff --git a/test/scripts/build-earlystopping-median.sh b/test/scripts/v1alpha1/build-earlystopping-median.sh similarity index 100% rename from test/scripts/build-earlystopping-median.sh rename to test/scripts/v1alpha1/build-earlystopping-median.sh diff --git a/test/scripts/build-manager-rest.sh b/test/scripts/v1alpha1/build-manager-rest.sh similarity index 100% rename from test/scripts/build-manager-rest.sh rename to test/scripts/v1alpha1/build-manager-rest.sh diff --git a/test/scripts/build-manager.sh b/test/scripts/v1alpha1/build-manager.sh similarity index 100% rename from test/scripts/build-manager.sh rename to test/scripts/v1alpha1/build-manager.sh diff --git a/test/scripts/build-studyjobctr.sh b/test/scripts/v1alpha1/build-studyjobctr.sh similarity index 100% rename from test/scripts/build-studyjobctr.sh rename to test/scripts/v1alpha1/build-studyjobctr.sh diff --git a/test/scripts/build-suggestion-bo.sh b/test/scripts/v1alpha1/build-suggestion-bo.sh similarity index 100% rename from test/scripts/build-suggestion-bo.sh rename to test/scripts/v1alpha1/build-suggestion-bo.sh diff --git a/test/scripts/build-suggestion-grid.sh b/test/scripts/v1alpha1/build-suggestion-grid.sh similarity index 100% rename from test/scripts/build-suggestion-grid.sh rename to test/scripts/v1alpha1/build-suggestion-grid.sh diff --git a/test/scripts/build-suggestion-hyperband.sh b/test/scripts/v1alpha1/build-suggestion-hyperband.sh similarity index 100% rename from test/scripts/build-suggestion-hyperband.sh rename to test/scripts/v1alpha1/build-suggestion-hyperband.sh diff --git a/test/scripts/build-suggestion-nasrl.sh b/test/scripts/v1alpha1/build-suggestion-nasrl.sh similarity index 100% rename from test/scripts/build-suggestion-nasrl.sh rename to test/scripts/v1alpha1/build-suggestion-nasrl.sh diff --git a/test/scripts/build-suggestion-random.sh b/test/scripts/v1alpha1/build-suggestion-random.sh similarity index 100% rename from test/scripts/build-suggestion-random.sh rename to test/scripts/v1alpha1/build-suggestion-random.sh diff --git a/test/scripts/build-ui.sh b/test/scripts/v1alpha1/build-ui.sh similarity index 100% rename from test/scripts/build-ui.sh rename to test/scripts/v1alpha1/build-ui.sh diff --git a/test/scripts/create-cluster.sh b/test/scripts/v1alpha1/create-cluster.sh similarity index 100% rename from test/scripts/create-cluster.sh rename to test/scripts/v1alpha1/create-cluster.sh diff --git a/test/scripts/delete-cluster.sh b/test/scripts/v1alpha1/delete-cluster.sh similarity index 100% rename from test/scripts/delete-cluster.sh rename to test/scripts/v1alpha1/delete-cluster.sh diff --git a/test/scripts/get-vendor-packages.sh b/test/scripts/v1alpha1/get-vendor-packages.sh similarity index 100% rename from test/scripts/get-vendor-packages.sh rename to test/scripts/v1alpha1/get-vendor-packages.sh diff --git a/test/scripts/python-tests.sh b/test/scripts/v1alpha1/python-tests.sh similarity index 100% rename from test/scripts/python-tests.sh rename to test/scripts/v1alpha1/python-tests.sh diff --git a/test/scripts/run-tests.sh b/test/scripts/v1alpha1/run-tests.sh similarity index 77% rename from test/scripts/run-tests.sh rename to test/scripts/v1alpha1/run-tests.sh index 65a8af4dfbd..26e591f19b6 100755 --- a/test/scripts/run-tests.sh +++ b/test/scripts/v1alpha1/run-tests.sh @@ -66,21 +66,21 @@ echo "REGISTRY ${REGISTRY}" echo "REPO_NAME ${REPO_NAME}" echo "VERSION ${VERSION}" -sed -i -e "s@image: katib\/vizier-core@image: ${REGISTRY}\/${REPO_NAME}\/vizier-core:${VERSION}@" manifests/vizier/core/deployment.yaml -sed -i -e "s@image: katib\/vizier-core-rest@image: ${REGISTRY}\/${REPO_NAME}\/vizier-core-rest:${VERSION}@" manifests/vizier/core-rest/deployment.yaml -sed -i -e "s@image: katib\/katib-ui@image: ${REGISTRY}\/${REPO_NAME}\/katib-ui:${VERSION}@" manifests/vizier/ui/deployment.yaml -sed -i -e "s@type: NodePort@type: ClusterIP@" -e "/nodePort: 30678/d" manifests/vizier/core/service.yaml -sed -i -e "s@image: katib\/studyjob-controller@image: ${REGISTRY}\/${REPO_NAME}\/studyjob-controller:${VERSION}@" manifests/studyjobcontroller/studyjobcontroller.yaml -sed -i -e "s@image: katib\/suggestion-random@image: ${REGISTRY}\/${REPO_NAME}\/suggestion-random:${VERSION}@" manifests/vizier/suggestion/random/deployment.yaml -sed -i -e "s@image: katib\/suggestion-grid@image: ${REGISTRY}\/${REPO_NAME}\/suggestion-grid:${VERSION}@" manifests/vizier/suggestion/grid/deployment.yaml -sed -i -e "s@image: katib\/suggestion-hyperband@image: ${REGISTRY}\/${REPO_NAME}\/suggestion-hyperband:${VERSION}@" manifests/vizier/suggestion/hyperband/deployment.yaml -sed -i -e "s@image: katib\/suggestion-bayesianoptimization@image: ${REGISTRY}\/${REPO_NAME}\/suggestion-bayesianoptimization:${VERSION}@" manifests/vizier/suggestion/bayesianoptimization/deployment.yaml -sed -i -e "s@image: katib\/suggestion-nasrl@image: ${REGISTRY}\/${REPO_NAME}\/suggestion-nasrl:${VERSION}@" manifests/vizier/suggestion/nasrl/deployment.yaml -sed -i -e "s@image: katib\/earlystopping-medianstopping@image: ${REGISTRY}\/${REPO_NAME}\/earlystopping-medianstopping:${VERSION}@" manifests/vizier/earlystopping/medianstopping/deployment.yaml -sed -i -e '/volumeMounts:/,$d' manifests/vizier/db/deployment.yaml - -cat manifests/vizier/core/deployment.yaml -./scripts/deploy.sh +sed -i -e "s@image: katib\/vizier-core@image: ${REGISTRY}\/${REPO_NAME}\/vizier-core:${VERSION}@" manifests/v1alpha1/vizier/core/deployment.yaml +sed -i -e "s@image: katib\/vizier-core-rest@image: ${REGISTRY}\/${REPO_NAME}\/vizier-core-rest:${VERSION}@" manifests/v1alpha1/vizier/core-rest/deployment.yaml +sed -i -e "s@image: katib\/katib-ui@image: ${REGISTRY}\/${REPO_NAME}\/katib-ui:${VERSION}@" manifests/v1alpha1/vizier/ui/deployment.yaml +sed -i -e "s@type: NodePort@type: ClusterIP@" -e "/nodePort: 30678/d" manifests/v1alpha1/vizier/core/service.yaml +sed -i -e "s@image: katib\/studyjob-controller@image: ${REGISTRY}\/${REPO_NAME}\/studyjob-controller:${VERSION}@" manifests/v1alpha1/studyjobcontroller/studyjobcontroller.yaml +sed -i -e "s@image: katib\/suggestion-random@image: ${REGISTRY}\/${REPO_NAME}\/suggestion-random:${VERSION}@" manifests/v1alpha1/vizier/suggestion/random/deployment.yaml +sed -i -e "s@image: katib\/suggestion-grid@image: ${REGISTRY}\/${REPO_NAME}\/suggestion-grid:${VERSION}@" manifests/v1alpha1/vizier/suggestion/grid/deployment.yaml +sed -i -e "s@image: katib\/suggestion-hyperband@image: ${REGISTRY}\/${REPO_NAME}\/suggestion-hyperband:${VERSION}@" manifests/v1alpha1/vizier/suggestion/hyperband/deployment.yaml +sed -i -e "s@image: katib\/suggestion-bayesianoptimization@image: ${REGISTRY}\/${REPO_NAME}\/suggestion-bayesianoptimization:${VERSION}@" manifests/v1alpha1/vizier/suggestion/bayesianoptimization/deployment.yaml +sed -i -e "s@image: katib\/suggestion-nasrl@image: ${REGISTRY}\/${REPO_NAME}\/suggestion-nasrl:${VERSION}@" manifests/v1alpha1/vizier/suggestion/nasrl/deployment.yaml +sed -i -e "s@image: katib\/earlystopping-medianstopping@image: ${REGISTRY}\/${REPO_NAME}\/earlystopping-medianstopping:${VERSION}@" manifests/v1alpha1/vizier/earlystopping/medianstopping/deployment.yaml +sed -i -e '/volumeMounts:/,$d' manifests/v1alpha1/vizier/db/deployment.yaml + +cat manifests/v1alpha1/vizier/core/deployment.yaml +./scripts/v1alpha1/deploy.sh TIMEOUT=120 PODNUM=$(kubectl get deploy -n kubeflow | grep -v NAME | wc -l) diff --git a/test/scripts/unit-test.sh b/test/scripts/v1alpha1/unit-test.sh similarity index 100% rename from test/scripts/unit-test.sh rename to test/scripts/v1alpha1/unit-test.sh diff --git a/test/workflows/components/workflows.libsonnet b/test/workflows/components/workflows.libsonnet index 99fd0b53963..35f17a6cc50 100644 --- a/test/workflows/components/workflows.libsonnet +++ b/test/workflows/components/workflows.libsonnet @@ -317,13 +317,13 @@ }, }, // checkout $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("setup-cluster",testWorkerImage, [ - "test/scripts/create-cluster.sh", + "test/scripts/v1alpha1/create-cluster.sh", ]), // setup cluster $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("python-tests", pythonImage, [ - "test/scripts/python-tests.sh", + "test/scripts/v1alpha1/python-tests.sh", ]), // run python tests $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("run-tests", helmImage, [ - "test/scripts/run-tests.sh", + "test/scripts/v1alpha1/run-tests.sh", ]), // run tests $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("create-pr-symlink", testWorkerImage, [ "python", @@ -334,7 +334,7 @@ "--bucket=" + bucket, ]), // create-pr-symlink $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("teardown-cluster",testWorkerImage, [ - "test/scripts/delete-cluster.sh", + "test/scripts/v1alpha1/delete-cluster.sh", ]), // teardown cluster $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("copy-artifacts", testWorkerImage, [ "python", @@ -345,40 +345,40 @@ "--bucket=" + bucket, ]), // copy-artifacts $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("dep-ensure", testWorkerImage, [ - "test/scripts/get-vendor-packages.sh", + "test/scripts/v1alpha1/get-vendor-packages.sh", ]), // dep ensure $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("build-manager", testWorkerImage, [ - "test/scripts/build-manager.sh", + "test/scripts/v1alpha1/build-manager.sh", ]), // build-manager $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("build-manager-rest", testWorkerImage, [ - "test/scripts/build-manager-rest.sh", + "test/scripts/v1alpha1/build-manager-rest.sh", ]), // build-manager-rest $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("build-studyjobctr", testWorkerImage, [ - "test/scripts/build-studyjobctr.sh", + "test/scripts/v1alpha1/build-studyjobctr.sh", ]), // build-studyjobctr $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("build-suggestion-random", testWorkerImage, [ - "test/scripts/build-suggestion-random.sh", + "test/scripts/v1alpha1/build-suggestion-random.sh", ]), // build-suggestion-random $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("build-suggestion-grid", testWorkerImage, [ - "test/scripts/build-suggestion-grid.sh", + "test/scripts/v1alpha1/build-suggestion-grid.sh", ]), // build-suggestion-grid $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("build-suggestion-hyperband", testWorkerImage, [ - "test/scripts/build-suggestion-hyperband.sh", + "test/scripts/v1alpha1/build-suggestion-hyperband.sh", ]), // build-suggestion-hyperband $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("build-suggestion-bo", testWorkerImage, [ - "test/scripts/build-suggestion-bo.sh", + "test/scripts/v1alpha1/build-suggestion-bo.sh", ]), // build-suggestion-bo $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("build-suggestion-nasrl", testWorkerImage, [ - "test/scripts/build-suggestion-nasrl.sh", + "test/scripts/v1alpha1/build-suggestion-nasrl.sh", ]), // build-suggestion-nasrl $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("build-earlystopping-median", testWorkerImage, [ - "test/scripts/build-earlystopping-median.sh", + "test/scripts/v1alpha1/build-earlystopping-median.sh", ]), // build-earlystopping-median $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("build-ui", testWorkerImage, [ - "test/scripts/build-ui.sh", + "test/scripts/v1alpha1/build-ui.sh", ]), // build-ui $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("unit-test", testWorkerImage, [ - "test/scripts/unit-test.sh", + "test/scripts/v1alpha1/unit-test.sh", ]), // unit test ], // templates },