diff --git a/examples/MinikubeDemo.md b/examples/MinikubeDemo.md index 94950be8cca..250e17dc4bc 100644 --- a/examples/MinikubeDemo.md +++ b/examples/MinikubeDemo.md @@ -15,19 +15,19 @@ Don't worry if the `vizier-core` get an error. It will be recovered after DB will be prepared. Wait until all components will be Running status. -Then, start port-forward for katib services `6789 -> manager` and `3000 -> UI`. +Then, start port-forward for katib services `6789 -> manager` and `8000 -> UI`. kubectl v1.10~ ``` -$ kubectl -n katib port-forward svc/vizier-core 6789:6789 & -$ kubectl -n katib port-forward svc/katib-ui 3000:3000 & +$ kubectl -n kubeflow port-forward svc/vizier-core 6789:6789 & +$ kubectl -n kubeflow port-forward svc/katib-ui 8000:80 & ``` kubectl ~v1.9 ``` -& kubectl -n katib port-forward $(kubectl -n katib get pod -o=name | grep vizier-core | sed -e "s@pods\/@@") 6789:6789 & -& kubectl -n katib port-forward $(kubectl -n katib get pod -o=name | grep katib-ui | sed -e "s@pods\/@@") 3000:3000 & +& kubectl -n kubeflow port-forward $(kubectl -n kubeflow get pod -o=name | grep vizier-core | sed -e "s@pods\/@@") 6789:6789 & +& kubectl -n kubeflow port-forward $(kubectl -n kubeflow get pod -o=name | grep katib-ui | sed -e "s@pods\/@@") 8000:80 & ``` ## Create Study @@ -49,7 +49,7 @@ In this demo, 3 hyper parameters are randomly generated. ``` -$ kubectl -n katib get studyjob +$ kubectl -n kubeflow get studyjob NAME AGE random-example 2m ``` @@ -57,9 +57,9 @@ random-example 2m Check the study status. ``` -$ kubectl -n katib describe studyjobs random-example +$ kubectl -n kubeflow describe studyjobs random-example Name: random-example -Namespace: katib +Namespace: kubeflow Labels: controller-tools.k8s.io=1.0 Annotations: kubectl.kubernetes.io/last-applied-configuration={"apiVersion":"kubeflow.org/v1alpha1","kind":"StudyJob","metadata":{"annotations":{},"labels":{"controller-tools.k8s.io":"1.0"},"name":"random-example"... API Version: kubeflow.org/v1alpha1 @@ -69,7 +69,7 @@ Metadata: Creation Timestamp: 2018-08-15T01:29:13Z Generation: 0 Resource Version: 173289 - Self Link: /apis/kubeflow.org/v1alpha1/namespaces/katib/studyjobs/random-example + Self Link: /apis/kubeflow.org/v1alpha1/namespaces/kubeflow/studyjobs/random-example UID: 9e136400-a02a-11e8-b88c-42010af0008b Spec: Study Spec: @@ -135,7 +135,7 @@ Events: ``` When the Spec.Status.State become `Completed`, the study is completed. -You can look the result on `http://127.0.0.1:3000/katib`. +You can look the result on `http://127.0.0.1:8000/katib`. ### Use ConfigMap for Worker Template In Random example, the template for workers is defined in StudyJob manifest. @@ -162,7 +162,7 @@ kubectl apply -f random-example.yaml ## UI You can check your study results with Web UI. -Acsess to `http://127.0.0.1:3000/katib` +Acsess to `http://127.0.0.1:8000/katib` The Results will be saved automatically. ### Using GPU demo @@ -178,16 +178,16 @@ Set "/worker-template/gpuWorkerTemplate.yaml at `workerTemplatePath` field and s You can apply it same as other examples. ``` $ kubectl apply -f gpu-example.yaml -$ kubectl -n katib get studyjob +$ kubectl -n kubeflow get studyjob NAME AGE gpu-example 1m random-example 17m -$ kubectl -n katib describe studyjob gpu-example +$ kubectl -n kubeflow describe studyjob gpu-example Name: gpu-example -Namespace: katib +Namespace: kubeflow Labels: controller-tools.k8s.io=1.0 Annotations: kubectl.kubernetes.io/last-applied-configuration={"apiVersion":"kubeflow.org/v1alpha1","kind":"StudyJob","metadata":{"annotations":{},"labels":{"controller-tools.k8s.io":"1.0"},"name":"gpu-example","n... API Version: kubeflow.org/v1alpha1 @@ -197,7 +197,7 @@ Metadata: Creation Timestamp: 2018-08-15T01:48:12Z Generation: 0 Resource Version: 175002 - Self Link: /apis/kubeflow.org/v1alpha1/namespaces/katib/studyjobs/gpu-example + Self Link: /apis/kubeflow.org/v1alpha1/namespaces/kubeflow/studyjobs/gpu-example UID: 44afac4c-a02d-11e8-b88c-42010af0008b Spec: Study Spec: @@ -244,9 +244,9 @@ Status: Check the GPU configuration works correctly. ``` -$ kubectl -n katib describe pod g07cba174ada521e-88wpn +$ kubectl -n kubeflow describe pod g07cba174ada521e-88wpn Name: g07cba174ada521e-88wpn -Namespace: katib +Namespace: kubeflow Node: Labels: controller-uid=44bfb99f-a02d-11e8-b88c-42010af0008b job-name=g07cba174ada521e diff --git a/examples/gpu-example.yaml b/examples/gpu-example.yaml index 824d7bf17a4..6a8ff967274 100644 --- a/examples/gpu-example.yaml +++ b/examples/gpu-example.yaml @@ -1,7 +1,7 @@ apiVersion: "kubeflow.org/v1alpha1" kind: StudyJob metadata: - namespace: katib + namespace: kubeflow labels: controller-tools.k8s.io: "1.0" name: gpu-example diff --git a/examples/grid-example.yaml b/examples/grid-example.yaml index 0915a06ed36..10cce0273e9 100644 --- a/examples/grid-example.yaml +++ b/examples/grid-example.yaml @@ -1,7 +1,7 @@ apiVersion: "kubeflow.org/v1alpha1" kind: StudyJob metadata: - namespace: katib + namespace: kubeflow labels: controller-tools.k8s.io: "1.0" name: grid-example diff --git a/examples/hypb-example.yaml b/examples/hypb-example.yaml index 514105ee892..a6fed35e836 100644 --- a/examples/hypb-example.yaml +++ b/examples/hypb-example.yaml @@ -1,7 +1,7 @@ apiVersion: "kubeflow.org/v1alpha1" kind: StudyJob metadata: - namespace: katib + namespace: kubeflow labels: controller-tools.k8s.io: "1.0" name: hypb-example diff --git a/examples/random-example.yaml b/examples/random-example.yaml index 9a29786bf46..dbcd1a9654f 100644 --- a/examples/random-example.yaml +++ b/examples/random-example.yaml @@ -1,7 +1,7 @@ apiVersion: "kubeflow.org/v1alpha1" kind: StudyJob metadata: - namespace: katib + namespace: kubeflow labels: controller-tools.k8s.io: "1.0" name: random-example @@ -39,7 +39,7 @@ spec: kind: Job metadata: name: {{.WorkerID}} - namespace: katib + namespace: kubeflow spec: template: spec: diff --git a/examples/tf-event_test.yaml b/examples/tf-event_test.yaml index 5b9013273c5..7f2c9ca5b14 100644 --- a/examples/tf-event_test.yaml +++ b/examples/tf-event_test.yaml @@ -1,7 +1,7 @@ apiVersion: "kubeflow.org/v1alpha1" kind: StudyJob metadata: - namespace: katib + namespace: kubeflow labels: controller-tools.k8s.io: "1.0" name: random-example-goal-test @@ -34,7 +34,7 @@ spec: kind: Job metadata: name: {{.WorkerID}} - namespace: katib + namespace: kubeflow spec: template: spec: @@ -65,7 +65,7 @@ spec: kind: CronJob metadata: name: {{.WorkerID}} - namespace: katib + namespace: kubeflow spec: schedule: "*/1 * * * *" successfulJobsHistoryLimit: 0 diff --git a/examples/tfevent-volume/tfevent-pvc.yaml b/examples/tfevent-volume/tfevent-pvc.yaml index 3e3cea35353..6bab17d8032 100644 --- a/examples/tfevent-volume/tfevent-pvc.yaml +++ b/examples/tfevent-volume/tfevent-pvc.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: tfevent-volume - namespace: katib + namespace: kubeflow labels: type: local app: tfjob diff --git a/examples/vizier-db-pv.yaml b/examples/vizier-db-pv.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/examples/workerConfigMap.yaml b/examples/workerConfigMap.yaml index 33f35423cc7..66e341e5a38 100644 --- a/examples/workerConfigMap.yaml +++ b/examples/workerConfigMap.yaml @@ -2,14 +2,14 @@ apiVersion: v1 kind: ConfigMap metadata: name: worker-template - namespace: katib + namespace: kubeflow data: cpuWorkerTemplate.yaml : |- apiVersion: batch/v1 kind: Job metadata: name: {{.WorkerID}} - namespace: katib + namespace: kubeflow spec: template: spec: @@ -31,7 +31,7 @@ data: kind: Job metadata: name: {{.WorkerID}} - namespace: katib + namespace: kubeflow spec: template: spec: diff --git a/manifests/0-namespace.yaml b/manifests/0-namespace.yaml index 9bac532fac9..7a940e4673d 100644 --- a/manifests/0-namespace.yaml +++ b/manifests/0-namespace.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: Namespace metadata: - name: katib + name: kubeflow diff --git a/manifests/modeldb/backend/deployment.yaml b/manifests/modeldb/backend/deployment.yaml deleted file mode 100644 index bc7fd1dc9f6..00000000000 --- a/manifests/modeldb/backend/deployment.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: modeldb-backend - namespace: katib - labels: - app: modeldb - component: backend -spec: - replicas: 1 - template: - metadata: - name: modeldb-backend - labels: - app: modeldb - component: backend - spec: - containers: - - name: modeldb-backend - image: mitdbg/modeldb-backend:latest - args: - - 'modeldb-db' - ports: - - name: api - containerPort: 6543 -# resources: -# requests: -# cpu: 500m -# memory: 500M -# limits: -# cpu: 500m -# memory: 500M diff --git a/manifests/modeldb/backend/service.yaml b/manifests/modeldb/backend/service.yaml deleted file mode 100644 index 71d9d5f7fe8..00000000000 --- a/manifests/modeldb/backend/service.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: modeldb-backend - namespace: katib - labels: - app: modeldb - component: backend -spec: - type: ClusterIP - ports: - - port: 6543 - protocol: TCP - name: api - selector: - app: modeldb - component: backend diff --git a/manifests/modeldb/db/deployment.yaml b/manifests/modeldb/db/deployment.yaml deleted file mode 100644 index eaa83fa2db6..00000000000 --- a/manifests/modeldb/db/deployment.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: modeldb-db - namespace: katib - labels: - app: modeldb - component: db -spec: - replicas: 1 - template: - metadata: - name: modeldb-db - labels: - app: modeldb - component: db - spec: - containers: - - name: modeldb-db - image: mongo:3.4 - ports: - - name: dbapi - containerPort: 27017 -# resources: -# requests: -# cpu: 500m -# memory: 500M -# limits: -# cpu: 500m -# memory: 500M diff --git a/manifests/modeldb/db/service.yaml b/manifests/modeldb/db/service.yaml deleted file mode 100644 index 966fb4155ea..00000000000 --- a/manifests/modeldb/db/service.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: modeldb-db - namespace: katib - labels: - app: modeldb - component: db -spec: - type: ClusterIP - ports: - - port: 27017 - protocol: TCP - name: dbapi - selector: - app: modeldb - component: db diff --git a/manifests/modeldb/frontend/deployment.yaml b/manifests/modeldb/frontend/deployment.yaml deleted file mode 100644 index 234f11b1623..00000000000 --- a/manifests/modeldb/frontend/deployment.yaml +++ /dev/null @@ -1,36 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: modeldb-frontend - namespace: katib - labels: - app: modeldb - component: frontend -spec: - replicas: 1 - template: - metadata: - name: modeldb-frontend - labels: - app: modeldb - component: frontend - spec: - containers: - - name: modeldb-frontend - image: katib/katib-frontend - imagePullPolicy: Always - args: - - 'modeldb-backend' - env: - - name: ROOT_PATH - value: "/katib" - ports: - - name: webapi - containerPort: 3000 -# resources: -# requests: -# cpu: 500m -# memory: 500M -# limits: -# cpu: 500m -# memory: 500M diff --git a/manifests/modeldb/frontend/ingress.yaml_ b/manifests/modeldb/frontend/ingress.yaml_ deleted file mode 100644 index 76b2da08d0c..00000000000 --- a/manifests/modeldb/frontend/ingress.yaml_ +++ /dev/null @@ -1,14 +0,0 @@ - apiVersion: extensions/v1beta1 - kind: Ingress - metadata: - name: katib-ui - namespace: katib - spec: - rules: - - host: k-cluster.example.net - http: - paths: - - path: /katib - backend: - serviceName: modeldb-frontend - servicePort: 3000 diff --git a/manifests/modeldb/frontend/service.yaml b/manifests/modeldb/frontend/service.yaml deleted file mode 100644 index e2325616149..00000000000 --- a/manifests/modeldb/frontend/service.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: modeldb-frontend - namespace: katib - labels: - app: modeldb - component: frontend -spec: - type: ClusterIP - ports: - - port: 3000 - protocol: TCP - name: api - selector: - app: modeldb - component: frontend diff --git a/manifests/pv/pvc.yaml b/manifests/pv/pvc.yaml index 88cdf0cbcbf..4a2b0d31a35 100644 --- a/manifests/pv/pvc.yaml +++ b/manifests/pv/pvc.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: katib-mysql - namespace: katib + namespace: kubeflow labels: app: katib spec: diff --git a/manifests/studyjobcontroller/mcrbac.yaml b/manifests/studyjobcontroller/mcrbac.yaml index 035c3b6ebb9..aa80c3ed42d 100644 --- a/manifests/studyjobcontroller/mcrbac.yaml +++ b/manifests/studyjobcontroller/mcrbac.yaml @@ -22,13 +22,13 @@ apiVersion: v1 kind: ServiceAccount metadata: name: metrics-collector - namespace: katib + namespace: kubeflow --- kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: metrics-collector - namespace: katib + namespace: kubeflow roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -36,4 +36,4 @@ roleRef: subjects: - kind: ServiceAccount name: metrics-collector - namespace: katib + namespace: kubeflow diff --git a/manifests/studyjobcontroller/metricsControllerConfigMap.yaml b/manifests/studyjobcontroller/metricsControllerConfigMap.yaml index 8a3c6f02a80..b01dedb259e 100644 --- a/manifests/studyjobcontroller/metricsControllerConfigMap.yaml +++ b/manifests/studyjobcontroller/metricsControllerConfigMap.yaml @@ -2,14 +2,14 @@ apiVersion: v1 kind: ConfigMap metadata: name: metricscollector-template - namespace: katib + namespace: kubeflow data: defaultMetricsCollectorTemplate.yaml : |- apiVersion: batch/v1beta1 kind: CronJob metadata: name: {{.WorkerID}} - namespace: katib + namespace: kubeflow spec: schedule: "*/1 * * * *" successfulJobsHistoryLimit: 1 diff --git a/manifests/studyjobcontroller/rbac.yaml b/manifests/studyjobcontroller/rbac.yaml index 46a8e8deb9d..a2b6c343c22 100644 --- a/manifests/studyjobcontroller/rbac.yaml +++ b/manifests/studyjobcontroller/rbac.yaml @@ -38,13 +38,13 @@ apiVersion: v1 kind: ServiceAccount metadata: name: studyjob-controller - namespace: katib + namespace: kubeflow --- kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: studyjob-controller - namespace: katib + namespace: kubeflow roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -52,4 +52,4 @@ roleRef: subjects: - kind: ServiceAccount name: studyjob-controller - namespace: katib + namespace: kubeflow diff --git a/manifests/studyjobcontroller/studyjobcontroller.yaml b/manifests/studyjobcontroller/studyjobcontroller.yaml index d817ee6b981..ea3497c344b 100644 --- a/manifests/studyjobcontroller/studyjobcontroller.yaml +++ b/manifests/studyjobcontroller/studyjobcontroller.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: studyjob-controller - namespace: katib + namespace: kubeflow labels: app: studyjob-controller spec: diff --git a/manifests/studyjobcontroller/workerConfigMap.yaml b/manifests/studyjobcontroller/workerConfigMap.yaml index 3a4511dc6e8..6acf0271a7a 100644 --- a/manifests/studyjobcontroller/workerConfigMap.yaml +++ b/manifests/studyjobcontroller/workerConfigMap.yaml @@ -2,14 +2,14 @@ apiVersion: v1 kind: ConfigMap metadata: name: worker-template - namespace: katib + namespace: kubeflow data: defaultWorkerTemplate.yaml : |- apiVersion: batch/v1 kind: Job metadata: name: {{.WorkerID}} - namespace: katib + namespace: kubeflow spec: template: spec: diff --git a/manifests/vizier/core-rest/deployment.yaml b/manifests/vizier/core-rest/deployment.yaml index 4a75c194b1c..93e60f1c00f 100644 --- a/manifests/vizier/core-rest/deployment.yaml +++ b/manifests/vizier/core-rest/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vizier-core-rest - namespace: katib + namespace: kubeflow labels: app: vizier component: core-rest diff --git a/manifests/vizier/core-rest/ingress.yaml_ b/manifests/vizier/core-rest/ingress.yaml_ index 2849a5627c2..b2c09fd594c 100644 --- a/manifests/vizier/core-rest/ingress.yaml_ +++ b/manifests/vizier/core-rest/ingress.yaml_ @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: vizier-core-rest - namespace: katib + namespace: kubeflow annotations: ingress.kubernetes.io/rewrite-target: / spec: diff --git a/manifests/vizier/core-rest/service.yaml b/manifests/vizier/core-rest/service.yaml index b5b8be40fc6..649e8b17239 100644 --- a/manifests/vizier/core-rest/service.yaml +++ b/manifests/vizier/core-rest/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: vizier-core-rest - namespace: katib + namespace: kubeflow labels: app: vizier component: core-rest diff --git a/manifests/vizier/core/deployment.yaml b/manifests/vizier/core/deployment.yaml index 273695fcc20..05fdef108c2 100644 --- a/manifests/vizier/core/deployment.yaml +++ b/manifests/vizier/core/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vizier-core - namespace: katib + namespace: kubeflow labels: app: vizier component: core diff --git a/manifests/vizier/core/ingress.yaml_fw b/manifests/vizier/core/ingress.yaml_fw index 22a435505c7..e25bfaa5d3f 100644 --- a/manifests/vizier/core/ingress.yaml_fw +++ b/manifests/vizier/core/ingress.yaml_fw @@ -3,7 +3,7 @@ # kind: Ingress # metadata: # name: vizier-core -# namespace: katib +# namespace: kubeflow # annotations: # ingress.kubernetes.io/ssl-passthrough: "true" # spec: diff --git a/manifests/vizier/core/rbac.yaml b/manifests/vizier/core/rbac.yaml index b5482ad8951..8d8be5b7dba 100644 --- a/manifests/vizier/core/rbac.yaml +++ b/manifests/vizier/core/rbac.yaml @@ -10,7 +10,7 @@ roleRef: subjects: - kind: ServiceAccount name: vizier-core - namespace: katib + namespace: kubeflow --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1beta1 @@ -34,4 +34,4 @@ apiVersion: v1 kind: ServiceAccount metadata: name: vizier-core - namespace: katib + namespace: kubeflow diff --git a/manifests/vizier/core/service.yaml b/manifests/vizier/core/service.yaml index f41228ba7b0..fd5b09cb2f9 100644 --- a/manifests/vizier/core/service.yaml +++ b/manifests/vizier/core/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: vizier-core - namespace: katib + namespace: kubeflow labels: app: vizier component: core diff --git a/manifests/vizier/db/deployment.yaml b/manifests/vizier/db/deployment.yaml index 7c46bb94215..be3af34a4dc 100644 --- a/manifests/vizier/db/deployment.yaml +++ b/manifests/vizier/db/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vizier-db - namespace: katib + namespace: kubeflow labels: app: vizier component: db diff --git a/manifests/vizier/db/service.yaml b/manifests/vizier/db/service.yaml index dde0b2c31a0..96425c56f43 100644 --- a/manifests/vizier/db/service.yaml +++ b/manifests/vizier/db/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: vizier-db - namespace: katib + namespace: kubeflow labels: app: vizier component: db diff --git a/manifests/vizier/earlystopping/medianstopping/deployment.yaml b/manifests/vizier/earlystopping/medianstopping/deployment.yaml index 7a4ef2c5425..1b914e64a66 100644 --- a/manifests/vizier/earlystopping/medianstopping/deployment.yaml +++ b/manifests/vizier/earlystopping/medianstopping/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vizier-earlystopping-medianstopping - namespace: katib + namespace: kubeflow labels: app: vizier component: earlystopping-medianstopping diff --git a/manifests/vizier/earlystopping/medianstopping/service.yaml b/manifests/vizier/earlystopping/medianstopping/service.yaml index dd6aa39c465..bc8ce3e9836 100644 --- a/manifests/vizier/earlystopping/medianstopping/service.yaml +++ b/manifests/vizier/earlystopping/medianstopping/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: vizier-earlystopping-medianstopping - namespace: katib + namespace: kubeflow labels: app: vizier component: earlystopping-medianstopping diff --git a/manifests/vizier/suggestion/bayesianoptimization/deployment.yaml b/manifests/vizier/suggestion/bayesianoptimization/deployment.yaml index 58d079bed38..7ed80613d28 100644 --- a/manifests/vizier/suggestion/bayesianoptimization/deployment.yaml +++ b/manifests/vizier/suggestion/bayesianoptimization/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vizier-suggestion-bayesianoptimization - namespace: katib + namespace: kubeflow labels: app: vizier component: suggestion-bayesianoptimization @@ -20,4 +20,4 @@ spec: image: katib/suggestion-bayesianoptimization ports: - name: api - containerPort: 6789 \ No newline at end of file + containerPort: 6789 diff --git a/manifests/vizier/suggestion/bayesianoptimization/service.yaml b/manifests/vizier/suggestion/bayesianoptimization/service.yaml index 9391ee69f1f..9e1db21bd5d 100644 --- a/manifests/vizier/suggestion/bayesianoptimization/service.yaml +++ b/manifests/vizier/suggestion/bayesianoptimization/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: vizier-suggestion-bayesianoptimization - namespace: katib + namespace: kubeflow labels: app: vizier component: suggestion-bayesianoptimization @@ -14,4 +14,4 @@ spec: name: api selector: app: vizier - component: suggestion-bayesianoptimization \ No newline at end of file + component: suggestion-bayesianoptimization diff --git a/manifests/vizier/suggestion/grid/deployment.yaml b/manifests/vizier/suggestion/grid/deployment.yaml index 707f170ddf9..cf3c11e572b 100644 --- a/manifests/vizier/suggestion/grid/deployment.yaml +++ b/manifests/vizier/suggestion/grid/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vizier-suggestion-grid - namespace: katib + namespace: kubeflow labels: app: vizier component: suggestion-grid diff --git a/manifests/vizier/suggestion/grid/service.yaml b/manifests/vizier/suggestion/grid/service.yaml index 4a1cf6b64a0..3a600afc955 100644 --- a/manifests/vizier/suggestion/grid/service.yaml +++ b/manifests/vizier/suggestion/grid/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: vizier-suggestion-grid - namespace: katib + namespace: kubeflow labels: app: vizier component: suggestion-grid diff --git a/manifests/vizier/suggestion/hyperband/deployment.yaml b/manifests/vizier/suggestion/hyperband/deployment.yaml index 9f8d742e586..cf25334e563 100644 --- a/manifests/vizier/suggestion/hyperband/deployment.yaml +++ b/manifests/vizier/suggestion/hyperband/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vizier-suggestion-hyperband - namespace: katib + namespace: kubeflow labels: app: vizier component: suggestion-hyperband diff --git a/manifests/vizier/suggestion/hyperband/service.yaml b/manifests/vizier/suggestion/hyperband/service.yaml index 0c6179c7cc2..ba917221921 100644 --- a/manifests/vizier/suggestion/hyperband/service.yaml +++ b/manifests/vizier/suggestion/hyperband/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: vizier-suggestion-hyperband - namespace: katib + namespace: kubeflow labels: app: vizier component: suggestion-hyperband diff --git a/manifests/vizier/suggestion/random/deployment.yaml b/manifests/vizier/suggestion/random/deployment.yaml index 187cac3998b..27465df8358 100644 --- a/manifests/vizier/suggestion/random/deployment.yaml +++ b/manifests/vizier/suggestion/random/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vizier-suggestion-random - namespace: katib + namespace: kubeflow labels: app: vizier component: suggestion-random diff --git a/manifests/vizier/suggestion/random/service.yaml b/manifests/vizier/suggestion/random/service.yaml index 463cdca1da0..099dca1c856 100644 --- a/manifests/vizier/suggestion/random/service.yaml +++ b/manifests/vizier/suggestion/random/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: vizier-suggestion-random - namespace: katib + namespace: kubeflow labels: app: vizier component: suggestion-random diff --git a/manifests/vizier/ui/deployment.yaml b/manifests/vizier/ui/deployment.yaml index 41a27811041..913a06698f7 100644 --- a/manifests/vizier/ui/deployment.yaml +++ b/manifests/vizier/ui/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: katib-ui - namespace: katib + namespace: kubeflow labels: app: vizier component: ui diff --git a/manifests/vizier/ui/service.yaml b/manifests/vizier/ui/service.yaml index b27326510db..ae14176015a 100644 --- a/manifests/vizier/ui/service.yaml +++ b/manifests/vizier/ui/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: katib-ui - namespace: katib + namespace: kubeflow labels: app: vizier component: ui diff --git a/test/scripts/run-tests.sh b/test/scripts/run-tests.sh index c712b3e9e06..613c557c12b 100755 --- a/test/scripts/run-tests.sh +++ b/test/scripts/run-tests.sh @@ -75,14 +75,14 @@ cat manifests/vizier/core/deployment.yaml ./scripts/deploy.sh TIMEOUT=120 -PODNUM=$(kubectl get deploy -n katib | grep -v NAME | wc -l) -until kubectl get pods -n katib | grep Running | [[ $(wc -l) -eq $PODNUM ]]; do - echo Pod Status $(kubectl get pods -n katib | grep Running | wc -l)/$PODNUM +PODNUM=$(kubectl get deploy -n kubeflow | grep -v NAME | wc -l) +until kubectl get pods -n kubeflow | grep Running | [[ $(wc -l) -eq $PODNUM ]]; do + echo Pod Status $(kubectl get pods -n kubeflow | grep Running | wc -l)/$PODNUM sleep 10 TIMEOUT=$(( TIMEOUT - 1 )) if [[ $TIMEOUT -eq 0 ]];then echo "NG" - kubectl get pods -n katib + kubectl get pods -n kubeflow exit 1 fi done @@ -90,13 +90,13 @@ done echo "All Katib components are running." kubectl version echo "Katib deployments" -kubectl -n katib get deploy +kubectl -n kubeflow get deploy echo "Katib services" -kubectl -n katib get svc +kubectl -n kubeflow get svc echo "Katib pods" -kubectl -n katib get pod +kubectl -n kubeflow get pod -kubectl -n katib port-forward $(kubectl -n katib get pod -o=name | grep vizier-core | grep -v vizier-core-rest | sed -e "s@pods\/@@") 6789:6789 & +kubectl -n kubeflow port-forward $(kubectl -n kubeflow get pod -o=name | grep vizier-core | grep -v vizier-core-rest | sed -e "s@pods\/@@") 6789:6789 & echo "kubectl port-forward start" TIMEOUT=120 until curl localhost:6789 || [ $TIMEOUT -eq 0 ]; do