fix: Resolve conflicts

Signed-off-by: Ce Gao <gaoce@caicloud.io>
kubeflow · May 29, 2019 · 7f5b0a4 · 7f5b0a4
1 parent de96df8
commit 7f5b0a4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/...tion/bayesianoptimization/deployment.yaml → ...tion/bayesianoptimization/deployment.yaml b/...tion/bayesianoptimization/deployment.yaml → ...tion/bayesianoptimization/deployment.yaml
diff --git a/...gestion/bayesianoptimization/service.yaml → ...gestion/bayesianoptimization/service.yaml b/...gestion/bayesianoptimization/service.yaml → ...gestion/bayesianoptimization/service.yaml
diff --git a/scripts/v1alpha2/deploy.sh b/scripts/v1alpha2/deploy.sh
@@ -24,11 +24,11 @@ SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/../..
 cd ${SCRIPT_ROOT}
 kubectl apply -f manifests/v1alpha2
 kubectl apply -f manifests/v1alpha2/katib-controller
-kubectl apply -f manifests/v1alpha2/katib/manager
-kubectl apply -f manifests/v1alpha2/katib/manager-rest
-kubectl apply -f manifests/v1alpha2/katib/pv
-kubectl apply -f manifests/v1alpha2/katib/db
-kubectl apply -f manifests/v1alpha2/katib/ui
-kubectl apply -f manifests/v1alpha2/katib/suggestion/random
-kubectl apply -f manifests/v1alpha2/katib/suggestion/bayesianoptimization
+kubectl apply -f manifests/v1alpha2/manager
+kubectl apply -f manifests/v1alpha2/manager-rest
+kubectl apply -f manifests/v1alpha2/pv
+kubectl apply -f manifests/v1alpha2/db
+kubectl apply -f manifests/v1alpha2/ui
+kubectl apply -f manifests/v1alpha2/suggestion/random
+kubectl apply -f manifests/v1alpha2/suggestion/bayesianoptimization
 cd - > /dev/null
diff --git a/scripts/v1alpha2/undeploy.sh b/scripts/v1alpha2/undeploy.sh
@@ -30,12 +30,12 @@ SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/../..
 
 cd ${SCRIPT_ROOT}
 kubectl delete -f manifests/v1alpha2/katib-controller
-kubectl delete -f manifests/v1alpha2/katib/manager
-kubectl delete -f manifests/v1alpha2/katib/manager-rest
-kubectl delete -f manifests/v1alpha2/katib/db
-kubectl delete -f manifests/v1alpha2/katib/ui
-kubectl delete -f manifests/v1alpha2/katib/pv
-kubectl delete -f manifests/v1alpha2/katib/suggestion/random
-kubectl delete -f manifests/v1alpha2/katib/suggestion/bayesianoptimization
+kubectl delete -f manifests/v1alpha2/manager
+kubectl delete -f manifests/v1alpha2/manager-rest
+kubectl delete -f manifests/v1alpha2/db
+kubectl delete -f manifests/v1alpha2/ui
+kubectl delete -f manifests/v1alpha2/pv
+kubectl delete -f manifests/v1alpha2/suggestion/random
+kubectl delete -f manifests/v1alpha2/suggestion/bayesianoptimization
 kubectl delete -f manifests/v1alpha2
 cd - > /dev/null
diff --git a/test/scripts/v1alpha2/run-tests.sh b/test/scripts/v1alpha2/run-tests.sh
@@ -66,11 +66,11 @@ echo "REPO_NAME ${REPO_NAME}"
 echo "VERSION ${VERSION}"
 
 sed -i -e "s@image: katib\/v1alpha2\/katib-controller@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/katib-controller:${VERSION}@" manifests/v1alpha2/katib-controller/katib-controller.yaml
-sed -i -e "s@image: katib\/v1alpha2\/katib-manager@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/katib-manager:${VERSION}@" manifests/v1alpha2/katib/manager/deployment.yaml
-sed -i -e "s@image: katib\/v1alpha2\/katib-manager-rest@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/katib-manager-rest:${VERSION}@" manifests/v1alpha2/katib/manager-rest/deployment.yaml
-sed -i -e "s@image: katib\/v1alpha2\/katib-ui@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/katib-ui:${VERSION}@" manifests/v1alpha2/katib/ui/deployment.yaml
-sed -i -e "s@image: katib\/v1alpha2\/suggestion-random@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/suggestion-random:${VERSION}@" manifests/v1alpha2/katib/suggestion/random/deployment.yaml
-sed -i -e "s@image: katib\/v1alpha2\/suggestion-bayesianoptimization@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/suggestion-bayesianoptimization:${VERSION}@" manifests/v1alpha2/katib/suggestion/bayesianoptimization/deployment.yaml
+sed -i -e "s@image: katib\/v1alpha2\/katib-manager@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/katib-manager:${VERSION}@" manifests/v1alpha2/manager/deployment.yaml
+sed -i -e "s@image: katib\/v1alpha2\/katib-manager-rest@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/katib-manager-rest:${VERSION}@" manifests/v1alpha2/manager-rest/deployment.yaml
+sed -i -e "s@image: katib\/v1alpha2\/katib-ui@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/katib-ui:${VERSION}@" manifests/v1alpha2/ui/deployment.yaml
+sed -i -e "s@image: katib\/v1alpha2\/suggestion-random@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/suggestion-random:${VERSION}@" manifests/v1alpha2/suggestion/random/deployment.yaml
+sed -i -e "s@image: katib\/v1alpha2\/suggestion-bayesianoptimization@image: ${REGISTRY}\/${REPO_NAME}\/v1alpha2\/suggestion-bayesianoptimization:${VERSION}@" manifests/v1alpha2/suggestion/bayesianoptimization/deployment.yaml
 
 ./scripts/v1alpha2/deploy.sh