Change image registry to docker.io/kubeflowkatib (#1372)

* Change kubeflow-images-public to kubeflowkatib * Remove kubeflow-images-public from setup-katib script * Add test for early stopping * Fix early stopping settings * Add tags to all examples * Fix Katib config * Fix empty var in UI * Fix comment * Trigger Travis
kubeflow · Nov 4, 2020 · 1729997 · 1729997
1 parent e294a90
commit 1729997
Show file tree

Hide file tree

Showing 35 changed files with 102 additions and 73 deletions.
diff --git a/docs/new-algorithm-service.md b/docs/new-algorithm-service.md
@@ -95,10 +95,10 @@ Update the [katib-config](../manifests/v1beta1/katib-controller/katib-config.yam
   suggestion: |-
     {
       "tpe": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1beta1/suggestion-hyperopt"
+        "image": "docker.io/kubeflowkatib/suggestion-hyperopt"
       },
       "random": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1beta1/suggestion-hyperopt"
+        "image": "docker.io/kubeflowkatib/suggestion-hyperopt"
       },
       "<new-algorithm-name>": {
         "image": "image built in the previous stage"
@@ -152,7 +152,7 @@ To add a e2e test for the new algorithm, in [test/scripts/v1beta1](../test/scrip
 3. Update [`check-katib-ready.sh`](../test/scripts/v1beta1/check-katib-ready.sh) script to modify `katib-config.yaml` with the new test suggestion image name. We use `gcr.io/automl-ci` registry to run presubmit tests. For example (Replace `<name>` with the new suggestion name):
 
 ```
-sed -i -e "s@gcr.io\/kubeflow-images-public\/katib\/v1beta1\/suggestion-<name>@${REGISTRY}\/${REPO_NAME}\/v1beta1\/suggestion-<name>@" manifests/v1beta1/katib-controller/katib-config.yaml
+sed -i -e "s@docker.io\/kubeflowkatib\/suggestion-<name>@${REGISTRY}\/${REPO_NAME}\/v1beta1\/suggestion-<name>@" manifests/v1beta1/katib-controller/katib-config.yaml
 ```
 
 4. Create a new script `run-suggestion-xxx.sh` to run new suggestion. Below is an example (Replace `<name>` with the new algorithm name):

diff --git a/examples/v1beta1/bayesianoptimization-example.yaml b/examples/v1beta1/bayesianoptimization-example.yaml
@@ -56,7 +56,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/mxnet-mnist
+                image: docker.io/kubeflowkatib/mxnet-mnist:v1beta1-e294a90
                 command:
                   - "python3"
                   - "/opt/mxnet-mnist/mnist.py"

diff --git a/examples/v1beta1/cmaes-example.yaml b/examples/v1beta1/cmaes-example.yaml
@@ -53,7 +53,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/mxnet-mnist
+                image: docker.io/kubeflowkatib/mxnet-mnist:v1beta1-e294a90
                 command:
                   - "python3"
                   - "/opt/mxnet-mnist/mnist.py"

diff --git a/examples/v1beta1/custom-metricscollector-example.yaml b/examples/v1beta1/custom-metricscollector-example.yaml
@@ -66,7 +66,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/pytorch-mnist
+                image: docker.io/kubeflowkatib/pytorch-mnist:v1beta1-e294a90
                 imagePullPolicy: Always
                 command:
                   - "python"

diff --git a/examples/v1beta1/early-stopping/median-stop.yaml b/examples/v1beta1/early-stopping/median-stop.yaml
@@ -60,7 +60,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/mxnet-mnist
+                image: docker.io/kubeflowkatib/mxnet-mnist:v1beta1-e294a90
                 command:
                   - "python3"
                   - "/opt/mxnet-mnist/mnist.py"

diff --git a/examples/v1beta1/file-metricscollector-example.yaml b/examples/v1beta1/file-metricscollector-example.yaml
@@ -53,7 +53,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/pytorch-mnist:latest
+                image: docker.io/kubeflowkatib/pytorch-mnist:v1beta1-e294a90
                 imagePullPolicy: Always
                 command:
                   - "python"

diff --git a/examples/v1beta1/grid-example.yaml b/examples/v1beta1/grid-example.yaml
@@ -54,7 +54,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/mxnet-mnist
+                image: docker.io/kubeflowkatib/mxnet-mnist:v1beta1-e294a90
                 command:
                   - "python3"
                   - "/opt/mxnet-mnist/mnist.py"

diff --git a/examples/v1beta1/hyperband-example.yaml b/examples/v1beta1/hyperband-example.yaml
@@ -68,7 +68,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/mxnet-mnist
+                image: docker.io/kubeflowkatib/mxnet-mnist:v1beta1-e294a90
                 command:
                   - "python3"
                   - "/opt/mxnet-mnist/mnist.py"

diff --git a/examples/v1beta1/metric-strategy-example.yaml b/examples/v1beta1/metric-strategy-example.yaml
@@ -58,7 +58,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/mxnet-mnist
+                image: docker.io/kubeflowkatib/mxnet-mnist:v1beta1-e294a90
                 command:
                   - "python3"
                   - "/opt/mxnet-mnist/mnist.py"

diff --git a/examples/v1beta1/nas/darts-example-cpu.yaml b/examples/v1beta1/nas/darts-example-cpu.yaml
@@ -59,7 +59,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/darts-cnn-cifar10
+                image: docker.io/kubeflowkatib/darts-cnn-cifar10:v1beta1-e294a90
                 imagePullPolicy: Always
                 command:
                   - python3

diff --git a/examples/v1beta1/nas/darts-example-gpu.yaml b/examples/v1beta1/nas/darts-example-gpu.yaml
@@ -76,7 +76,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/darts-cnn-cifar10
+                image: docker.io/kubeflowkatib/darts-cnn-cifar10:v1beta1-e294a90
                 imagePullPolicy: Always
                 command:
                   - python3

diff --git a/examples/v1beta1/nas/enas-example-cpu.yaml b/examples/v1beta1/nas/enas-example-cpu.yaml
@@ -139,7 +139,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu
+                image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v1beta1-e294a90
                 command:
                   - python3
                   - -u

diff --git a/examples/v1beta1/nas/enas-example-gpu.yaml b/examples/v1beta1/nas/enas-example-gpu.yaml
@@ -136,7 +136,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/enas-cnn-cifar10-gpu
+                image: docker.io/kubeflowkatib/enas-cnn-cifar10-gpu:v1beta1-e294a90
                 command:
                   - python3
                   - -u

diff --git a/examples/v1beta1/random-example.yaml b/examples/v1beta1/random-example.yaml
@@ -53,7 +53,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/mxnet-mnist
+                image: docker.io/kubeflowkatib/mxnet-mnist:v1beta1-e294a90
                 command:
                   - "python3"
                   - "/opt/mxnet-mnist/mnist.py"

diff --git a/examples/v1beta1/resume-experiment/from-volume-resume.yaml b/examples/v1beta1/resume-experiment/from-volume-resume.yaml
@@ -54,7 +54,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/mxnet-mnist
+                image: docker.io/kubeflowkatib/mxnet-mnist:v1beta1-e294a90
                 command:
                   - "python3"
                   - "/opt/mxnet-mnist/mnist.py"

diff --git a/examples/v1beta1/resume-experiment/never-resume.yaml b/examples/v1beta1/resume-experiment/never-resume.yaml
@@ -56,7 +56,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/mxnet-mnist
+                image: docker.io/kubeflowkatib/mxnet-mnist:v1beta1-e294a90
                 command:
                   - "python3"
                   - "/opt/mxnet-mnist/mnist.py"

diff --git a/examples/v1beta1/tekton/README.md b/examples/v1beta1/tekton/README.md
@@ -12,13 +12,13 @@ To avoid this problem, set `nop` image to metrics collector sidecar image.
 
 For example, if you are using
 [StdOut](https://www.kubeflow.org/docs/components/hyperparameter-tuning/experiment/#metrics-collector) metrics collector,
-`nop` image must be equal to `gcr.io/kubeflow-images-public/katib/v1beta1/file-metrics-collector`.
+`nop` image must be equal to `docker.io/kubeflowkatib/file-metrics-collector`.
 
 After deploying Tekton on your cluster, run bellow command to modify `nop` image:
 
 ```bash
 kubectl patch deploy tekton-pipelines-controller -n tekton-pipelines --type='json' \
-  -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/args/9", "value": "gcr.io/kubeflow-images-public/katib/v1beta1/file-metrics-collector"}]'
+  -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/args/9", "value": "docker.io/kubeflowkatib/file-metrics-collector"}]'
 ```
 
 Check that Tekton controller's pod was restarted:
@@ -36,5 +36,5 @@ Check that `nop` image was modified:
 ```bash
 $ kubectl get pod <tekton-controller-pod-name> -n tekton-pipelines -o yaml | grep katib/v1beta1/file-metrics-collector
 
-   - gcr.io/kubeflow-images-public/katib/v1beta1/file-metrics-collector
+   - docker.io/kubeflowkatib/file-metrics-collector
 ```
diff --git a/examples/v1beta1/tekton/pipeline-run.yaml b/examples/v1beta1/tekton/pipeline-run.yaml
@@ -88,7 +88,7 @@ spec:
                     description: Number of training examples
                 steps:
                   - name: model-training
-                    image: docker.io/kubeflowkatib/mxnet-mnist
+                    image: docker.io/kubeflowkatib/mxnet-mnist:v1beta1-e294a90
                     command:
                       - "python3"
                       - "/opt/mxnet-mnist/mnist.py"

diff --git a/examples/v1beta1/tpe-example.yaml b/examples/v1beta1/tpe-example.yaml
@@ -53,7 +53,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/mxnet-mnist
+                image: docker.io/kubeflowkatib/mxnet-mnist:v1beta1-e294a90
                 command:
                   - "python3"
                   - "/opt/mxnet-mnist/mnist.py"

diff --git a/examples/v1beta1/trial-metadata-substitution.yaml b/examples/v1beta1/trial-metadata-substitution.yaml
@@ -59,7 +59,7 @@ spec:
           spec:
             containers:
               - name: training-container
-                image: docker.io/kubeflowkatib/mxnet-mnist
+                image: docker.io/kubeflowkatib/mxnet-mnist:v1beta1-e294a90
                 command:
                   - "python3"
                   - "/opt/mxnet-mnist/mnist.py"

diff --git a/manifests/v1beta1/db-manager/deployment.yaml b/manifests/v1beta1/db-manager/deployment.yaml
@@ -21,7 +21,7 @@ spec:
     spec:
       containers:
         - name: katib-db-manager
-          image: gcr.io/kubeflow-images-public/katib/v1beta1/katib-db-manager
+          image: docker.io/kubeflowkatib/katib-db-manager
           imagePullPolicy: IfNotPresent
           env:
             - name: DB_NAME

diff --git a/manifests/v1beta1/katib-controller/katib-config.yaml b/manifests/v1beta1/katib-controller/katib-config.yaml
@@ -7,13 +7,13 @@ data:
   metrics-collector-sidecar: |-
     {
       "StdOut": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1beta1/file-metrics-collector"
+        "image": "docker.io/kubeflowkatib/file-metrics-collector"
       },
       "File": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1beta1/file-metrics-collector"
+        "image": "docker.io/kubeflowkatib/file-metrics-collector"
       },
       "TensorFlowEvent": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1beta1/tfevent-metrics-collector",
+        "image": "docker.io/kubeflowkatib/tfevent-metrics-collector",
         "resources": {
           "limits": {
             "memory": "1Gi"
@@ -24,22 +24,22 @@ data:
   suggestion: |-
     {
       "random": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1beta1/suggestion-hyperopt"
+        "image": "docker.io/kubeflowkatib/suggestion-hyperopt"
       },
       "grid": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1beta1/suggestion-chocolate"
+        "image": "docker.io/kubeflowkatib/suggestion-chocolate"
       },
       "hyperband": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1beta1/suggestion-hyperband"
+        "image": "docker.io/kubeflowkatib/suggestion-hyperband"
       },
       "bayesianoptimization": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1beta1/suggestion-skopt"
+        "image": "docker.io/kubeflowkatib/suggestion-skopt"
       },
       "tpe": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1beta1/suggestion-hyperopt"
+        "image": "docker.io/kubeflowkatib/suggestion-hyperopt"
       },
       "enas": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1beta1/suggestion-enas",
+        "image": "docker.io/kubeflowkatib/suggestion-enas",
         "imagePullPolicy": "Always",
         "resources": {
           "limits": {
@@ -48,16 +48,16 @@ data:
         }
       },
       "cmaes": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1beta1/suggestion-goptuna"
+        "image": "docker.io/kubeflowkatib/suggestion-goptuna"
       },
       "darts": {
-        "image": "gcr.io/kubeflow-images-public/katib/v1beta1/suggestion-darts"
+        "image": "docker.io/kubeflowkatib/suggestion-darts"
       }
     }
   early-stopping: |-
     {
       "medianstop": {
-        "image": "docker.io/andreyvelichkevich/earlystopping-median",
+        "image": "docker.io/kubeflowkatib/earlystopping-medianstop",
         "imagePullPolicy": "Always"
       }
     }
diff --git a/manifests/v1beta1/katib-controller/katib-controller.yaml b/manifests/v1beta1/katib-controller/katib-controller.yaml
@@ -20,7 +20,7 @@ spec:
       serviceAccountName: katib-controller
       containers:
         - name: katib-controller
-          image: gcr.io/kubeflow-images-public/katib/v1beta1/katib-controller
+          image: docker.io/kubeflowkatib/katib-controller
           imagePullPolicy: IfNotPresent
           command: ["./katib-controller"]
           args:

diff --git a/manifests/v1beta1/katib-controller/trial-template-configmap.yaml b/manifests/v1beta1/katib-controller/trial-template-configmap.yaml
@@ -14,7 +14,7 @@ data:
         spec:
           containers:
             - name: training-container
-              image: docker.io/kubeflowkatib/mxnet-mnist
+              image: docker.io/kubeflowkatib/mxnet-mnist:v1beta1-e294a90
               command:
                 - "python3"
                 - "/opt/mxnet-mnist/mnist.py"
@@ -32,7 +32,7 @@ data:
         spec:
           containers:
             - name: training-container
-              image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu
+              image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v1beta1-e294a90
               command:
                 - python3
                 - -u

diff --git a/manifests/v1beta1/ui/deployment.yaml b/manifests/v1beta1/ui/deployment.yaml
@@ -21,7 +21,7 @@ spec:
     spec:
       containers:
         - name: katib-ui
-          image: gcr.io/kubeflow-images-public/katib/v1beta1/katib-ui
+          image: docker.io/kubeflowkatib/katib-ui
           imagePullPolicy: IfNotPresent
           command:
             - "./katib-ui"

diff --git a/pkg/earlystopping/v1beta1/medianstop/service.py b/pkg/earlystopping/v1beta1/medianstop/service.py
@@ -57,7 +57,7 @@ def GetEarlyStoppingRules(self, request, context):
         if self.is_first_run:
             self.is_first_run = False
             # Get early stopping settings.
-            self.getEarlyStoppingSettings(request.experiment.spec.algorithm.algorithm_settings)
+            self.getEarlyStoppingSettings(request.experiment.spec.early_stopping.algorithm_settings)
             logger.info("Median stopping settings are: min_trials_required: {}, start_step: {}".format(
                 self.min_trials_required, self.start_step))
 
@@ -93,9 +93,9 @@ def GetEarlyStoppingRules(self, request, context):
     def getEarlyStoppingSettings(self, early_stopping_settings):
         for setting in early_stopping_settings:
             if setting.name == "min_trials_required":
-                self.min_trials_required = setting.value
+                self.min_trials_required = int(setting.value)
             elif setting.name == "start_step":
-                self.start_step = setting.value
+                self.start_step = int(setting.value)
 
     def getMedianValue(self, trials):
         for trial in trials:

diff --git a/pkg/ui/v1beta1/frontend/src/components/HP/Create/HPParameters.jsx b/pkg/ui/v1beta1/frontend/src/components/HP/Create/HPParameters.jsx
@@ -51,7 +51,11 @@ const SectionInTypography = name => {
 // probably get render into a function
 const deCapitalizeFirstLetterAndAppend = (source, destination) => {
   source.map((parameter, i) => {
-    let value = Number(parameter.value);
+    let value = NaN;
+    // Try to get Number from parameter value if it is not empty
+    if (parameter.value !== '') {
+      value = Number(parameter.value);
+    }
     let name = parameter.name.charAt(0).toLowerCase() + parameter.name.slice(1);
     return (destination[name] = isNaN(value) ? parameter.value : value);
   });

diff --git a/pkg/ui/v1beta1/frontend/src/components/NAS/Create/NASParameters.jsx b/pkg/ui/v1beta1/frontend/src/components/NAS/Create/NASParameters.jsx
@@ -48,7 +48,11 @@ const SectionInTypography = name => {
 // probably get render into a function
 const deCapitalizeFirstLetterAndAppend = (source, destination) => {
   source.map((parameter, i) => {
-    let value = Number(parameter.value);
+    let value = NaN;
+    // Try to get Number from parameter value if it is not empty
+    if (parameter.value !== '') {
+      value = Number(parameter.value);
+    }
     let name = parameter.name.charAt(0).toLowerCase() + parameter.name.slice(1);
     return (destination[name] = isNaN(value) ? parameter.value : value);
   });

diff --git a/scripts/v1beta1/release.sh b/scripts/v1beta1/release.sh
@@ -19,7 +19,7 @@
 
 set -e
 
-COMMIT=$(git rev-parse --short HEAD)
+COMMIT=$(git rev-parse --short=7 HEAD)
 REGISTRY="docker.io/kubeflowkatib"
 VERSION="v1beta1"
 TAG=${VERSION}-${COMMIT}