From 1ef5048b33adab342c84695429e1263db2534c5f Mon Sep 17 00:00:00 2001 From: Mahdi Khashan <58775404+mahdikhashan@users.noreply.github.com> Date: Mon, 24 Mar 2025 18:11:50 +0100 Subject: [PATCH 1/2] [feature] move manifest image references to ghcr (#2529) * move to ghcr Signed-off-by: mahdikhashan * move images to ghcr Signed-off-by: mahdikhashan * manifests Signed-off-by: mahdikhashan * change registry in all path Signed-off-by: mahdikhashan * update script Signed-off-by: mahdikhashan * fix Signed-off-by: mahdikhashan * fix Signed-off-by: mahdikhashan * slight fix Signed-off-by: mahdikhashan --------- Signed-off-by: mahdikhashan Signed-off-by: Mahdi Khashan <58775404+mahdikhashan@users.noreply.github.com> --- Makefile | 2 +- docs/images-location.md | 42 +++++++++---------- examples/v1beta1/argo/argo-workflow.yaml | 2 +- .../median-stop-with-json-format.yaml | 2 +- .../v1beta1/early-stopping/median-stop.yaml | 2 +- .../hp-tuning/bayesian-optimization.yaml | 2 +- examples/v1beta1/hp-tuning/cma-es.yaml | 2 +- examples/v1beta1/hp-tuning/grid.yaml | 2 +- examples/v1beta1/hp-tuning/hyperband.yaml | 2 +- .../hp-tuning/hyperopt-distribution.yaml | 2 +- .../v1beta1/hp-tuning/multivariate-tpe.yaml | 2 +- .../hp-tuning/optuna-distribution.yaml | 2 +- examples/v1beta1/hp-tuning/random.yaml | 2 +- examples/v1beta1/hp-tuning/simple-pbt.yaml | 2 +- examples/v1beta1/hp-tuning/sobol.yaml | 2 +- examples/v1beta1/hp-tuning/tpe.yaml | 2 +- .../kubeflow-pipelines/early-stopping.ipynb | 2 +- .../pytorchjob-mnist.yaml | 4 +- .../tfjob-mnist-with-summaries.yaml | 2 +- .../xgboostjob-lightgbm.yaml | 4 +- .../custom-metrics-collector.yaml | 4 +- ...le-metrics-collector-with-json-format.yaml | 2 +- .../file-metrics-collector.yaml | 2 +- .../metrics-collection-strategy.yaml | 2 +- examples/v1beta1/nas/darts-cpu.yaml | 2 +- examples/v1beta1/nas/darts-gpu.yaml | 2 +- examples/v1beta1/nas/enas-cpu.yaml | 2 +- examples/v1beta1/nas/enas-gpu.yaml | 2 +- .../resume-experiment/from-volume-resume.yaml | 2 +- .../long-running-resume.yaml | 2 +- .../sdk/cmaes-and-resume-policies.ipynb | 4 +- examples/v1beta1/sdk/nas-with-darts.ipynb | 10 ++--- examples/v1beta1/tekton/README.md | 6 +-- examples/v1beta1/tekton/pipeline-run.yaml | 2 +- .../trial-metadata-substitution.yaml | 2 +- .../components/controller/controller.yaml | 2 +- .../controller/trial-templates.yaml | 8 ++-- .../components/db-manager/db-manager.yaml | 2 +- manifests/v1beta1/components/ui/ui.yaml | 2 +- .../katib-cert-manager/katib-config.yaml | 30 ++++++------- .../katib-cert-manager/kustomization.yaml | 18 ++++---- .../katib-external-db/katib-config.yaml | 30 ++++++------- .../katib-external-db/kustomization.yaml | 18 ++++---- .../katib-leader-election/katib-config.yaml | 30 ++++++------- .../katib-openshift/katib-config.yaml | 30 ++++++------- .../katib-openshift/kustomization.yaml | 18 ++++---- .../katib-config.yaml | 30 ++++++------- .../kustomization.yaml | 18 ++++---- .../katib-standalone/katib-config.yaml | 31 +++++++------- .../katib-standalone/kustomization.yaml | 18 ++++---- .../katib-with-kubeflow/kustomization.yaml | 18 ++++---- .../experiment/experiment_controller_test.go | 4 +- .../experiment/manifest/generator_test.go | 10 ++--- .../trial/trial_controller_test.go | 2 +- .../cypress/fixtures/trial-template.json | 6 +-- pkg/util/v1beta1/katibconfig/config_test.go | 2 +- .../experiment/validator/validator_test.go | 2 +- scripts/v1beta1/release.sh | 2 +- scripts/v1beta1/update-images.sh | 8 ++-- .../kubeflow/katib/api/katib_client_test.py | 2 +- test/e2e/v1beta1/scripts/aws/setup-katib.sh | 2 +- .../v1beta1/scripts/gh-actions/build-load.sh | 2 +- .../v1beta1/scripts/gh-actions/setup-katib.sh | 2 +- .../v1beta1/testdata/invalid-experiment.yaml | 2 +- .../v1beta1/testdata/valid-experiment.yaml | 2 +- 65 files changed, 240 insertions(+), 241 deletions(-) diff --git a/Makefile b/Makefile index bd6ce2c4e64..a60fe8b655a 100755 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ HAS_SETUP_ENVTEST := $(shell command -v setup-envtest;) HAS_MOCKGEN := $(shell command -v mockgen;) COMMIT := v1beta1-$(shell git rev-parse --short=7 HEAD) -KATIB_REGISTRY := docker.io/kubeflowkatib +KATIB_REGISTRY := ghcr.io/kubeflow/katib CPU_ARCH ?= linux/amd64,linux/arm64 ENVTEST_K8S_VERSION ?= 1.31 MOCKGEN_VERSION ?= $(shell grep 'go.uber.org/mock' go.mod | cut -d ' ' -f 2) diff --git a/docs/images-location.md b/docs/images-location.md index ed330ac7bfe..3bf053f13ca 100644 --- a/docs/images-location.md +++ b/docs/images-location.md @@ -22,7 +22,7 @@ The following table shows images for the - docker.io/kubeflowkatib/katib-controller + ghcr.io/kubeflow/katib/katib-controller Katib Controller @@ -33,7 +33,7 @@ The following table shows images for the - docker.io/kubeflowkatib/katib-ui + ghcr.io/kubeflow/katib/katib-ui Katib User Interface @@ -44,7 +44,7 @@ The following table shows images for the - docker.io/kubeflowkatib/katib-db-manager + ghcr.io/kubeflow/katib/katib-db-manager Katib DB Manager @@ -87,7 +87,7 @@ The following table shows images for the - docker.io/kubeflowkatib/file-metrics-collector + ghcr.io/kubeflow/katib/file-metrics-collector File Metrics Collector @@ -98,7 +98,7 @@ The following table shows images for the - docker.io/kubeflowkatib/tfevent-metrics-collector + ghcr.io/kubeflow/katib/tfevent-metrics-collector Tensorflow Event Metrics Collector @@ -131,7 +131,7 @@ and the [Katib Early Stopping algorithms](https://www.kubeflow.org/docs/componen - docker.io/kubeflowkatib/suggestion-hyperopt + ghcr.io/kubeflow/katib/suggestion-hyperopt Hyperopt Suggestion @@ -142,7 +142,7 @@ and the [Katib Early Stopping algorithms](https://www.kubeflow.org/docs/componen - docker.io/kubeflowkatib/suggestion-skopt + ghcr.io/kubeflow/katib/suggestion-skopt Skopt Suggestion @@ -153,7 +153,7 @@ and the [Katib Early Stopping algorithms](https://www.kubeflow.org/docs/componen - docker.io/kubeflowkatib/suggestion-optuna + ghcr.io/kubeflow/katib/suggestion-optuna Optuna Suggestion @@ -164,7 +164,7 @@ and the [Katib Early Stopping algorithms](https://www.kubeflow.org/docs/componen - docker.io/kubeflowkatib/suggestion-goptuna + ghcr.io/kubeflow/katib/suggestion-goptuna Goptuna Suggestion @@ -175,7 +175,7 @@ and the [Katib Early Stopping algorithms](https://www.kubeflow.org/docs/componen - docker.io/kubeflowkatib/suggestion-hyperband + ghcr.io/kubeflow/katib/suggestion-hyperband Hyperband Suggestion @@ -186,7 +186,7 @@ and the [Katib Early Stopping algorithms](https://www.kubeflow.org/docs/componen - docker.io/kubeflowkatib/suggestion-enas + ghcr.io/kubeflow/katib/suggestion-enas ENAS Suggestion @@ -197,7 +197,7 @@ and the [Katib Early Stopping algorithms](https://www.kubeflow.org/docs/componen - docker.io/kubeflowkatib/suggestion-darts + ghcr.io/kubeflow/katib/suggestion-darts DARTS Suggestion @@ -208,7 +208,7 @@ and the [Katib Early Stopping algorithms](https://www.kubeflow.org/docs/componen - docker.io/kubeflowkatib/earlystopping-medianstop + ghcr.io/kubeflow/katib/earlystopping-medianstop Median Stopping Rule @@ -240,7 +240,7 @@ The following table shows images for training containers which are used in the - docker.io/kubeflowkatib/pytorch-mnist-cpu + ghcr.io/kubeflow/katib/pytorch-mnist-cpu PyTorch MNIST example with printing metrics to the file or StdOut with CPU support @@ -251,7 +251,7 @@ The following table shows images for training containers which are used in the - docker.io/kubeflowkatib/pytorch-mnist-gpu + ghcr.io/kubeflow/katib/pytorch-mnist-gpu PyTorch MNIST example with printing metrics to the file or StdOut with GPU support @@ -262,7 +262,7 @@ The following table shows images for training containers which are used in the - docker.io/kubeflowkatib/tf-mnist-with-summaries + ghcr.io/kubeflow/katib/tf-mnist-with-summaries Tensorflow MNIST example with saving metrics in the summaries @@ -273,7 +273,7 @@ The following table shows images for training containers which are used in the - docker.io/kubeflowkatib/xgboost-lightgbm + ghcr.io/kubeflow/katib/xgboost-lightgbm Distributed LightGBM example for XGBoostJob @@ -306,7 +306,7 @@ The following table shows images for training containers which are used in the - docker.io/kubeflowkatib/enas-cnn-cifar10-gpu + ghcr.io/kubeflow/katib/enas-cnn-cifar10-gpu Keras CIFAR-10 CNN example for ENAS with GPU support @@ -317,7 +317,7 @@ The following table shows images for training containers which are used in the - docker.io/kubeflowkatib/enas-cnn-cifar10-cpu + ghcr.io/kubeflow/katib/enas-cnn-cifar10-cpu Keras CIFAR-10 CNN example for ENAS with CPU support @@ -328,7 +328,7 @@ The following table shows images for training containers which are used in the - docker.io/kubeflowkatib/darts-cnn-cifar10-gpu + ghcr.io/kubeflow/katib/darts-cnn-cifar10-gpu PyTorch CIFAR-10 CNN example for DARTS with GPU support @@ -339,7 +339,7 @@ The following table shows images for training containers which are used in the - docker.io/kubeflowkatib/darts-cnn-cifar10-cpu + ghcr.io/kubeflow/katib/darts-cnn-cifar10-cpu PyTorch CIFAR-10 CNN example for DARTS with CPU support diff --git a/examples/v1beta1/argo/argo-workflow.yaml b/examples/v1beta1/argo/argo-workflow.yaml index 6def863e0d2..e2bbbb17018 100644 --- a/examples/v1beta1/argo/argo-workflow.yaml +++ b/examples/v1beta1/argo/argo-workflow.yaml @@ -74,7 +74,7 @@ spec: - name: epochs container: name: model-training - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/early-stopping/median-stop-with-json-format.yaml b/examples/v1beta1/early-stopping/median-stop-with-json-format.yaml index 7de3c9cd493..ff4d3b11a2a 100644 --- a/examples/v1beta1/early-stopping/median-stop-with-json-format.yaml +++ b/examples/v1beta1/early-stopping/median-stop-with-json-format.yaml @@ -62,7 +62,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/early-stopping/median-stop.yaml b/examples/v1beta1/early-stopping/median-stop.yaml index bf6704716c5..038af4e1cea 100644 --- a/examples/v1beta1/early-stopping/median-stop.yaml +++ b/examples/v1beta1/early-stopping/median-stop.yaml @@ -52,7 +52,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/hp-tuning/bayesian-optimization.yaml b/examples/v1beta1/hp-tuning/bayesian-optimization.yaml index 552865eb476..806de7b1461 100644 --- a/examples/v1beta1/hp-tuning/bayesian-optimization.yaml +++ b/examples/v1beta1/hp-tuning/bayesian-optimization.yaml @@ -45,7 +45,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/hp-tuning/cma-es.yaml b/examples/v1beta1/hp-tuning/cma-es.yaml index a12c21a5bc7..fe9fd3db7b9 100644 --- a/examples/v1beta1/hp-tuning/cma-es.yaml +++ b/examples/v1beta1/hp-tuning/cma-es.yaml @@ -45,7 +45,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/hp-tuning/grid.yaml b/examples/v1beta1/hp-tuning/grid.yaml index f4a25a0d54b..8b43e289c85 100644 --- a/examples/v1beta1/hp-tuning/grid.yaml +++ b/examples/v1beta1/hp-tuning/grid.yaml @@ -44,7 +44,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/hp-tuning/hyperband.yaml b/examples/v1beta1/hp-tuning/hyperband.yaml index 7788dc8469a..1d5f1d6392a 100644 --- a/examples/v1beta1/hp-tuning/hyperband.yaml +++ b/examples/v1beta1/hp-tuning/hyperband.yaml @@ -57,7 +57,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/hp-tuning/hyperopt-distribution.yaml b/examples/v1beta1/hp-tuning/hyperopt-distribution.yaml index 3504ccf03f1..804a4410ad9 100644 --- a/examples/v1beta1/hp-tuning/hyperopt-distribution.yaml +++ b/examples/v1beta1/hp-tuning/hyperopt-distribution.yaml @@ -63,7 +63,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/hp-tuning/multivariate-tpe.yaml b/examples/v1beta1/hp-tuning/multivariate-tpe.yaml index b3a0a2c7a44..f674fb0883c 100644 --- a/examples/v1beta1/hp-tuning/multivariate-tpe.yaml +++ b/examples/v1beta1/hp-tuning/multivariate-tpe.yaml @@ -42,7 +42,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/hp-tuning/optuna-distribution.yaml b/examples/v1beta1/hp-tuning/optuna-distribution.yaml index 470993f75a0..15b081a88f2 100644 --- a/examples/v1beta1/hp-tuning/optuna-distribution.yaml +++ b/examples/v1beta1/hp-tuning/optuna-distribution.yaml @@ -63,7 +63,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/hp-tuning/random.yaml b/examples/v1beta1/hp-tuning/random.yaml index fa86c3d01dd..673c78f6625 100644 --- a/examples/v1beta1/hp-tuning/random.yaml +++ b/examples/v1beta1/hp-tuning/random.yaml @@ -42,7 +42,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/hp-tuning/simple-pbt.yaml b/examples/v1beta1/hp-tuning/simple-pbt.yaml index e43293be374..2883e080edc 100644 --- a/examples/v1beta1/hp-tuning/simple-pbt.yaml +++ b/examples/v1beta1/hp-tuning/simple-pbt.yaml @@ -43,7 +43,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/simple-pbt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/simple-pbt:latest command: - "python3" - "/opt/pbt/pbt_test.py" diff --git a/examples/v1beta1/hp-tuning/sobol.yaml b/examples/v1beta1/hp-tuning/sobol.yaml index 50e96ced8d0..d5b27556793 100644 --- a/examples/v1beta1/hp-tuning/sobol.yaml +++ b/examples/v1beta1/hp-tuning/sobol.yaml @@ -42,7 +42,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/hp-tuning/tpe.yaml b/examples/v1beta1/hp-tuning/tpe.yaml index 0d898e9ff1f..fe940f5d04e 100644 --- a/examples/v1beta1/hp-tuning/tpe.yaml +++ b/examples/v1beta1/hp-tuning/tpe.yaml @@ -42,7 +42,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/kubeflow-pipelines/early-stopping.ipynb b/examples/v1beta1/kubeflow-pipelines/early-stopping.ipynb index 8866f621ad5..c7d0c52f2da 100644 --- a/examples/v1beta1/kubeflow-pipelines/early-stopping.ipynb +++ b/examples/v1beta1/kubeflow-pipelines/early-stopping.ipynb @@ -230,7 +230,7 @@ " \"containers\": [\n", " {\n", " \"name\": \"training-container\",\n", - " \"image\": \"docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.14.0\",\n", + " \"image\": \"ghcr.io/kubeflow/katib/pytorch-mnist-cpu:v0.14.0\",\n", " \"command\": [\n", " \"python3\",\n", " \"/opt/pytorch-mnist/mnist.py\",\n", diff --git a/examples/v1beta1/kubeflow-training-operator/pytorchjob-mnist.yaml b/examples/v1beta1/kubeflow-training-operator/pytorchjob-mnist.yaml index 362453c3810..8ff676ac657 100644 --- a/examples/v1beta1/kubeflow-training-operator/pytorchjob-mnist.yaml +++ b/examples/v1beta1/kubeflow-training-operator/pytorchjob-mnist.yaml @@ -46,7 +46,7 @@ spec: spec: containers: - name: pytorch - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" @@ -61,7 +61,7 @@ spec: spec: containers: - name: pytorch - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/kubeflow-training-operator/tfjob-mnist-with-summaries.yaml b/examples/v1beta1/kubeflow-training-operator/tfjob-mnist-with-summaries.yaml index a578c88a9c0..40819660aa3 100644 --- a/examples/v1beta1/kubeflow-training-operator/tfjob-mnist-with-summaries.yaml +++ b/examples/v1beta1/kubeflow-training-operator/tfjob-mnist-with-summaries.yaml @@ -56,7 +56,7 @@ spec: spec: containers: - name: tensorflow - image: docker.io/kubeflowkatib/tf-mnist-with-summaries:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/tf-mnist-with-summaries:latest command: - "python" - "/opt/tf-mnist-with-summaries/mnist.py" diff --git a/examples/v1beta1/kubeflow-training-operator/xgboostjob-lightgbm.yaml b/examples/v1beta1/kubeflow-training-operator/xgboostjob-lightgbm.yaml index b2039722dab..57021c2b2db 100644 --- a/examples/v1beta1/kubeflow-training-operator/xgboostjob-lightgbm.yaml +++ b/examples/v1beta1/kubeflow-training-operator/xgboostjob-lightgbm.yaml @@ -56,7 +56,7 @@ spec: spec: containers: - name: xgboost - image: docker.io/kubeflowkatib/xgboost-lightgbm:1.0 + image: ghcr.io/kubeflow/katib/xgboost-lightgbm:1.0 ports: - containerPort: 9991 name: xgboostjob-port @@ -90,7 +90,7 @@ spec: spec: containers: - name: xgboost - image: docker.io/kubeflowkatib/xgboost-lightgbm:1.0 + image: ghcr.io/kubeflow/katib/xgboost-lightgbm:1.0 ports: - containerPort: 9991 name: xgboostjob-port diff --git a/examples/v1beta1/metrics-collector/custom-metrics-collector.yaml b/examples/v1beta1/metrics-collector/custom-metrics-collector.yaml index b79fb357902..d85954c89e1 100644 --- a/examples/v1beta1/metrics-collector/custom-metrics-collector.yaml +++ b/examples/v1beta1/metrics-collector/custom-metrics-collector.yaml @@ -26,7 +26,7 @@ spec: - katib-db-manager.kubeflow:6789 - -path - /katib/mnist.log - image: kubeflowkatib/custom-metrics-collector:latest + image: ghcr.io/kubeflow/katib/custom-metrics-collector:latest imagePullPolicy: Always name: custom-metrics-logger-and-collector env: @@ -67,7 +67,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/metrics-collector/file-metrics-collector-with-json-format.yaml b/examples/v1beta1/metrics-collector/file-metrics-collector-with-json-format.yaml index 3dfd8cea016..c12d7a4a41f 100644 --- a/examples/v1beta1/metrics-collector/file-metrics-collector-with-json-format.yaml +++ b/examples/v1beta1/metrics-collector/file-metrics-collector-with-json-format.yaml @@ -52,7 +52,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/metrics-collector/file-metrics-collector.yaml b/examples/v1beta1/metrics-collector/file-metrics-collector.yaml index a3454a5b770..7b4e281ad68 100644 --- a/examples/v1beta1/metrics-collector/file-metrics-collector.yaml +++ b/examples/v1beta1/metrics-collector/file-metrics-collector.yaml @@ -54,7 +54,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/metrics-collector/metrics-collection-strategy.yaml b/examples/v1beta1/metrics-collector/metrics-collection-strategy.yaml index 3028d637bde..935e739f320 100644 --- a/examples/v1beta1/metrics-collector/metrics-collection-strategy.yaml +++ b/examples/v1beta1/metrics-collector/metrics-collection-strategy.yaml @@ -49,7 +49,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/nas/darts-cpu.yaml b/examples/v1beta1/nas/darts-cpu.yaml index 065a96cb86a..b3ea51530dc 100644 --- a/examples/v1beta1/nas/darts-cpu.yaml +++ b/examples/v1beta1/nas/darts-cpu.yaml @@ -60,7 +60,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/darts-cnn-cifar10-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/darts-cnn-cifar10-cpu:latest command: - python3 - run_trial.py diff --git a/examples/v1beta1/nas/darts-gpu.yaml b/examples/v1beta1/nas/darts-gpu.yaml index d642ffd75d8..7cccb5a16c3 100644 --- a/examples/v1beta1/nas/darts-gpu.yaml +++ b/examples/v1beta1/nas/darts-gpu.yaml @@ -77,7 +77,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/darts-cnn-cifar10-gpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/darts-cnn-cifar10-gpu:latest command: - python3 - run_trial.py diff --git a/examples/v1beta1/nas/enas-cpu.yaml b/examples/v1beta1/nas/enas-cpu.yaml index fc44accf337..5e8b4709e80 100644 --- a/examples/v1beta1/nas/enas-cpu.yaml +++ b/examples/v1beta1/nas/enas-cpu.yaml @@ -139,7 +139,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/enas-cnn-cifar10-cpu:latest command: - python3 - -u diff --git a/examples/v1beta1/nas/enas-gpu.yaml b/examples/v1beta1/nas/enas-gpu.yaml index c15a57b570e..1d2c647009f 100644 --- a/examples/v1beta1/nas/enas-gpu.yaml +++ b/examples/v1beta1/nas/enas-gpu.yaml @@ -136,7 +136,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/enas-cnn-cifar10-gpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/enas-cnn-cifar10-gpu:latest command: - python3 - -u diff --git a/examples/v1beta1/resume-experiment/from-volume-resume.yaml b/examples/v1beta1/resume-experiment/from-volume-resume.yaml index 31b4c62c338..9157150c225 100644 --- a/examples/v1beta1/resume-experiment/from-volume-resume.yaml +++ b/examples/v1beta1/resume-experiment/from-volume-resume.yaml @@ -43,7 +43,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/resume-experiment/long-running-resume.yaml b/examples/v1beta1/resume-experiment/long-running-resume.yaml index 6badcb41cc6..3e7e36e4d7c 100644 --- a/examples/v1beta1/resume-experiment/long-running-resume.yaml +++ b/examples/v1beta1/resume-experiment/long-running-resume.yaml @@ -43,7 +43,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/sdk/cmaes-and-resume-policies.ipynb b/examples/v1beta1/sdk/cmaes-and-resume-policies.ipynb index d6876f2b864..fac4173766e 100644 --- a/examples/v1beta1/sdk/cmaes-and-resume-policies.ipynb +++ b/examples/v1beta1/sdk/cmaes-and-resume-policies.ipynb @@ -133,7 +133,7 @@ " \"containers\": [\n", " {\n", " \"name\": \"training-container\",\n", - " \"image\": \"docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.14.0\",\n", + " \"image\": \"ghcr.io/kubeflow/katib/pytorch-mnist-cpu:v0.14.0\",\n", " \"command\": [\n", " \"python3\",\n", " \"/opt/pytorch-mnist/mnist.py\",\n", @@ -524,7 +524,7 @@ " '--lr=${trialParameters.learningRate}',\n", " '--num-layers=${trialParameters.numberLayers}',\n", " '--optimizer=${trialParameters.optimizer}'],\n", - " 'image': 'docker.io/kubeflowkatib/mxnet-mnist:v0.14.0',\n", + " 'image': 'ghcr.io/kubeflow/katib/mxnet-mnist:v0.14.0',\n", " 'name': 'training-container'}],\n", " 'restartPolicy': 'Never'}}}}}},\n", " 'status': {'completion_time': None,\n", diff --git a/examples/v1beta1/sdk/nas-with-darts.ipynb b/examples/v1beta1/sdk/nas-with-darts.ipynb index 59f97991096..91b97db9ac3 100644 --- a/examples/v1beta1/sdk/nas-with-darts.ipynb +++ b/examples/v1beta1/sdk/nas-with-darts.ipynb @@ -232,7 +232,7 @@ " \"containers\": [\n", " {\n", " \"name\": \"training-container\",\n", - " \"image\": \"docker.io/kubeflowkatib/darts-cnn-cifar10:v0.13.0\",\n", + " \"image\": \"ghcr.io/kubeflow/katib/darts-cnn-cifar10:v0.13.0\",\n", " \"command\": [\n", " 'python3',\n", " 'run_trial.py',\n", @@ -314,7 +314,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "{'name': 'training-container', 'image': 'docker.io/kubeflowkatib/darts-cnn-cifar10:v0.13.0', 'command': ['python3', 'run_trial.py', '--algorithm-settings=\"${trialParameters.algorithmSettings}\"', '--search-space=\"${trialParameters.searchSpace}\"', '--num-layers=\"${trialParameters.numberLayers}\"'], 'resources': {'limits': {'nvidia.com/gpu': 1}}}\n" + "{'name': 'training-container', 'image': 'ghcr.io/kubeflow/katib/darts-cnn-cifar10:v0.13.0', 'command': ['python3', 'run_trial.py', '--algorithm-settings=\"${trialParameters.algorithmSettings}\"', '--search-space=\"${trialParameters.searchSpace}\"', '--num-layers=\"${trialParameters.numberLayers}\"'], 'resources': {'limits': {'nvidia.com/gpu': 1}}}\n" ] } ], @@ -447,7 +447,7 @@ " '--algorithm-settings=\"${trialParameters.algorithmSettings}\"',\n", " '--search-space=\"${trialParameters.searchSpace}\"',\n", " '--num-layers=\"${trialParameters.numberLayers}\"'],\n", - " 'image': 'docker.io/kubeflowkatib/darts-cnn-cifar10:v0.13.0',\n", + " 'image': 'ghcr.io/kubeflow/katib/darts-cnn-cifar10:v0.13.0',\n", " 'name': 'training-container',\n", " 'resources': {'limits': {'nvidia.com/gpu': 1}}}],\n", " 'restartPolicy': 'Never'}}}}}}}" @@ -484,7 +484,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "{'apiVersion': 'kubeflow.org/v1beta1', 'kind': 'Experiment', 'metadata': {'creationTimestamp': '2021-10-05T23:49:49Z', 'finalizers': ['update-prometheus-metrics'], 'generation': 1, 'managedFields': [{'apiVersion': 'kubeflow.org/v1beta1', 'fieldsType': 'FieldsV1', 'fieldsV1': {'f:spec': {'.': {}, 'f:algorithm': {'.': {}, 'f:algorithmName': {}, 'f:algorithmSettings': {}}, 'f:maxFailedTrialCount': {}, 'f:maxTrialCount': {}, 'f:metricsCollectorSpec': {'.': {}, 'f:collector': {'.': {}, 'f:kind': {}}, 'f:source': {'.': {}, 'f:filter': {'.': {}, 'f:metricsFormat': {}}}}, 'f:nasConfig': {'.': {}, 'f:graphConfig': {'.': {}, 'f:numLayers': {}}, 'f:operations': {}}, 'f:objective': {'.': {}, 'f:objectiveMetricName': {}, 'f:type': {}}, 'f:parallelTrialCount': {}, 'f:trialTemplate': {'.': {}, 'f:primaryContainerName': {}, 'f:retain': {}, 'f:trialParameters': {}, 'f:trialSpec': {'.': {}, 'f:apiVersion': {}, 'f:kind': {}, 'f:spec': {'.': {}, 'f:template': {'.': {}, 'f:metadata': {'.': {}, 'f:annotations': {'.': {}, 'f:sidecar.istio.io/inject': {}}}, 'f:spec': {'.': {}, 'f:containers': {}, 'f:restartPolicy': {}}}}}}}}, 'manager': 'OpenAPI-Generator', 'operation': 'Update', 'time': '2021-10-05T23:49:49Z'}, {'apiVersion': 'kubeflow.org/v1beta1', 'fieldsType': 'FieldsV1', 'fieldsV1': {'f:metadata': {'f:finalizers': {'.': {}, 'v:\"update-prometheus-metrics\"': {}}}, 'f:status': {'.': {}, 'f:conditions': {}, 'f:currentOptimalTrial': {'.': {}, 'f:bestTrialName': {}, 'f:observation': {'.': {}, 'f:metrics': {}}, 'f:parameterAssignments': {}}, 'f:runningTrialList': {}, 'f:startTime': {}, 'f:trials': {}, 'f:trialsRunning': {}}}, 'manager': 'katib-controller', 'operation': 'Update', 'time': '2021-10-05T23:50:31Z'}], 'name': 'darts-example', 'namespace': 'kubeflow-user-example-com', 'resourceVersion': '393948698', 'uid': '3fbda962-64c0-4474-b1de-03b390f96369'}, 'spec': {'algorithm': {'algorithmName': 'darts', 'algorithmSettings': [{'name': 'num_epochs', 'value': '2'}, {'name': 'stem_multiplier', 'value': '1'}, {'name': 'init_channels', 'value': '4'}, {'name': 'num_nodes', 'value': '3'}]}, 'maxFailedTrialCount': 1, 'maxTrialCount': 1, 'metricsCollectorSpec': {'collector': {'kind': 'StdOut'}, 'source': {'filter': {'metricsFormat': ['([\\\\w-]+)=(Genotype.*)']}}}, 'nasConfig': {'graphConfig': {'numLayers': 2}, 'operations': [{'operationType': 'separable_convolution', 'parameters': [{'feasibleSpace': {'list': ['3']}, 'name': 'filter_size', 'parameterType': 'categorical'}]}, {'operationType': 'dilated_convolution', 'parameters': [{'feasibleSpace': {'list': ['3', '5']}, 'name': 'filter_size', 'parameterType': 'categorical'}]}, {'operationType': 'avg_pooling', 'parameters': [{'feasibleSpace': {'list': ['3']}, 'name': 'filter_size', 'parameterType': 'categorical'}]}, {'operationType': 'max_pooling', 'parameters': [{'feasibleSpace': {'list': ['3']}, 'name': 'filter_size', 'parameterType': 'categorical'}]}, {'operationType': 'skip_connection'}]}, 'objective': {'metricStrategies': [{'name': 'Best-Genotype', 'value': 'max'}], 'objectiveMetricName': 'Best-Genotype', 'type': 'maximize'}, 'parallelTrialCount': 1, 'resumePolicy': 'Never', 'trialTemplate': {'failureCondition': 'status.conditions.#(type==\"Failed\")#|#(status==\"True\")#', 'primaryContainerName': 'training-container', 'retain': True, 'successCondition': 'status.conditions.#(type==\"Complete\")#|#(status==\"True\")#', 'trialParameters': [{'description': ' Algorithm settings of DARTS Experiment', 'name': 'algorithmSettings', 'reference': 'algorithm-settings'}, {'description': 'Search Space of DARTS Experiment', 'name': 'searchSpace', 'reference': 'search-space'}, {'description': 'Number of Neural Network layers', 'name': 'numberLayers', 'reference': 'num-layers'}], 'trialSpec': {'apiVersion': 'batch/v1', 'kind': 'Job', 'spec': {'template': {'metadata': {'annotations': {'sidecar.istio.io/inject': 'false'}}, 'spec': {'containers': [{'command': ['python3', 'run_trial.py', '--algorithm-settings=\"${trialParameters.algorithmSettings}\"', '--search-space=\"${trialParameters.searchSpace}\"', '--num-layers=\"${trialParameters.numberLayers}\"'], 'image': 'docker.io/kubeflowkatib/darts-cnn-cifar10:v0.13.0', 'name': 'training-container', 'resources': {'limits': {'nvidia.com/gpu': 1}}}], 'restartPolicy': 'Never'}}}}}}, 'status': {'conditions': [{'lastTransitionTime': '2021-10-05T23:49:49Z', 'lastUpdateTime': '2021-10-05T23:49:49Z', 'message': 'Experiment is created', 'reason': 'ExperimentCreated', 'status': 'True', 'type': 'Created'}, {'lastTransitionTime': '2021-10-05T23:50:30Z', 'lastUpdateTime': '2021-10-05T23:50:30Z', 'message': 'Experiment is running', 'reason': 'ExperimentRunning', 'status': 'True', 'type': 'Running'}], 'currentOptimalTrial': {'bestTrialName': '', 'observation': {'metrics': None}, 'parameterAssignments': None}, 'runningTrialList': ['darts-example-n4fpnxlm'], 'startTime': '2021-10-05T23:49:49Z', 'trials': 1, 'trialsRunning': 1}}\n", + "{'apiVersion': 'kubeflow.org/v1beta1', 'kind': 'Experiment', 'metadata': {'creationTimestamp': '2021-10-05T23:49:49Z', 'finalizers': ['update-prometheus-metrics'], 'generation': 1, 'managedFields': [{'apiVersion': 'kubeflow.org/v1beta1', 'fieldsType': 'FieldsV1', 'fieldsV1': {'f:spec': {'.': {}, 'f:algorithm': {'.': {}, 'f:algorithmName': {}, 'f:algorithmSettings': {}}, 'f:maxFailedTrialCount': {}, 'f:maxTrialCount': {}, 'f:metricsCollectorSpec': {'.': {}, 'f:collector': {'.': {}, 'f:kind': {}}, 'f:source': {'.': {}, 'f:filter': {'.': {}, 'f:metricsFormat': {}}}}, 'f:nasConfig': {'.': {}, 'f:graphConfig': {'.': {}, 'f:numLayers': {}}, 'f:operations': {}}, 'f:objective': {'.': {}, 'f:objectiveMetricName': {}, 'f:type': {}}, 'f:parallelTrialCount': {}, 'f:trialTemplate': {'.': {}, 'f:primaryContainerName': {}, 'f:retain': {}, 'f:trialParameters': {}, 'f:trialSpec': {'.': {}, 'f:apiVersion': {}, 'f:kind': {}, 'f:spec': {'.': {}, 'f:template': {'.': {}, 'f:metadata': {'.': {}, 'f:annotations': {'.': {}, 'f:sidecar.istio.io/inject': {}}}, 'f:spec': {'.': {}, 'f:containers': {}, 'f:restartPolicy': {}}}}}}}}, 'manager': 'OpenAPI-Generator', 'operation': 'Update', 'time': '2021-10-05T23:49:49Z'}, {'apiVersion': 'kubeflow.org/v1beta1', 'fieldsType': 'FieldsV1', 'fieldsV1': {'f:metadata': {'f:finalizers': {'.': {}, 'v:\"update-prometheus-metrics\"': {}}}, 'f:status': {'.': {}, 'f:conditions': {}, 'f:currentOptimalTrial': {'.': {}, 'f:bestTrialName': {}, 'f:observation': {'.': {}, 'f:metrics': {}}, 'f:parameterAssignments': {}}, 'f:runningTrialList': {}, 'f:startTime': {}, 'f:trials': {}, 'f:trialsRunning': {}}}, 'manager': 'katib-controller', 'operation': 'Update', 'time': '2021-10-05T23:50:31Z'}], 'name': 'darts-example', 'namespace': 'kubeflow-user-example-com', 'resourceVersion': '393948698', 'uid': '3fbda962-64c0-4474-b1de-03b390f96369'}, 'spec': {'algorithm': {'algorithmName': 'darts', 'algorithmSettings': [{'name': 'num_epochs', 'value': '2'}, {'name': 'stem_multiplier', 'value': '1'}, {'name': 'init_channels', 'value': '4'}, {'name': 'num_nodes', 'value': '3'}]}, 'maxFailedTrialCount': 1, 'maxTrialCount': 1, 'metricsCollectorSpec': {'collector': {'kind': 'StdOut'}, 'source': {'filter': {'metricsFormat': ['([\\\\w-]+)=(Genotype.*)']}}}, 'nasConfig': {'graphConfig': {'numLayers': 2}, 'operations': [{'operationType': 'separable_convolution', 'parameters': [{'feasibleSpace': {'list': ['3']}, 'name': 'filter_size', 'parameterType': 'categorical'}]}, {'operationType': 'dilated_convolution', 'parameters': [{'feasibleSpace': {'list': ['3', '5']}, 'name': 'filter_size', 'parameterType': 'categorical'}]}, {'operationType': 'avg_pooling', 'parameters': [{'feasibleSpace': {'list': ['3']}, 'name': 'filter_size', 'parameterType': 'categorical'}]}, {'operationType': 'max_pooling', 'parameters': [{'feasibleSpace': {'list': ['3']}, 'name': 'filter_size', 'parameterType': 'categorical'}]}, {'operationType': 'skip_connection'}]}, 'objective': {'metricStrategies': [{'name': 'Best-Genotype', 'value': 'max'}], 'objectiveMetricName': 'Best-Genotype', 'type': 'maximize'}, 'parallelTrialCount': 1, 'resumePolicy': 'Never', 'trialTemplate': {'failureCondition': 'status.conditions.#(type==\"Failed\")#|#(status==\"True\")#', 'primaryContainerName': 'training-container', 'retain': True, 'successCondition': 'status.conditions.#(type==\"Complete\")#|#(status==\"True\")#', 'trialParameters': [{'description': ' Algorithm settings of DARTS Experiment', 'name': 'algorithmSettings', 'reference': 'algorithm-settings'}, {'description': 'Search Space of DARTS Experiment', 'name': 'searchSpace', 'reference': 'search-space'}, {'description': 'Number of Neural Network layers', 'name': 'numberLayers', 'reference': 'num-layers'}], 'trialSpec': {'apiVersion': 'batch/v1', 'kind': 'Job', 'spec': {'template': {'metadata': {'annotations': {'sidecar.istio.io/inject': 'false'}}, 'spec': {'containers': [{'command': ['python3', 'run_trial.py', '--algorithm-settings=\"${trialParameters.algorithmSettings}\"', '--search-space=\"${trialParameters.searchSpace}\"', '--num-layers=\"${trialParameters.numberLayers}\"'], 'image': 'ghcr.io/kubeflow/katib/darts-cnn-cifar10:v0.13.0', 'name': 'training-container', 'resources': {'limits': {'nvidia.com/gpu': 1}}}], 'restartPolicy': 'Never'}}}}}}, 'status': {'conditions': [{'lastTransitionTime': '2021-10-05T23:49:49Z', 'lastUpdateTime': '2021-10-05T23:49:49Z', 'message': 'Experiment is created', 'reason': 'ExperimentCreated', 'status': 'True', 'type': 'Created'}, {'lastTransitionTime': '2021-10-05T23:50:30Z', 'lastUpdateTime': '2021-10-05T23:50:30Z', 'message': 'Experiment is running', 'reason': 'ExperimentRunning', 'status': 'True', 'type': 'Running'}], 'currentOptimalTrial': {'bestTrialName': '', 'observation': {'metrics': None}, 'parameterAssignments': None}, 'runningTrialList': ['darts-example-n4fpnxlm'], 'startTime': '2021-10-05T23:49:49Z', 'trials': 1, 'trialsRunning': 1}}\n", "-----------------\n", "\n", "{'lastTransitionTime': '2021-10-05T23:50:30Z', 'lastUpdateTime': '2021-10-05T23:50:30Z', 'message': 'Experiment is running', 'reason': 'ExperimentRunning', 'status': 'True', 'type': 'Running'}\n" @@ -720,7 +720,7 @@ " '--algorithm-settings=\"${trialParameters.algorithmSettings}\"',\n", " '--search-space=\"${trialParameters.searchSpace}\"',\n", " '--num-layers=\"${trialParameters.numberLayers}\"'],\n", - " 'image': 'docker.io/kubeflowkatib/darts-cnn-cifar10:v0.13.0',\n", + " 'image': 'ghcr.io/kubeflow/katib/darts-cnn-cifar10:v0.13.0',\n", " 'name': 'training-container',\n", " 'resources': {'limits': {'nvidia.com/gpu': 1}}}],\n", " 'restartPolicy': 'Never'}}}}}},\n", diff --git a/examples/v1beta1/tekton/README.md b/examples/v1beta1/tekton/README.md index a4ca22e008f..c379ab60f47 100644 --- a/examples/v1beta1/tekton/README.md +++ b/examples/v1beta1/tekton/README.md @@ -30,13 +30,13 @@ set this `nop` image to Metrics Collector image. For example, if you are using [StdOut](https://www.kubeflow.org/docs/components/katib/experiment/#metrics-collector) Metrics Collector, -`nop` image must be equal to `docker.io/kubeflowkatib/file-metrics-collector`. +`nop` image must be equal to `ghcr.io/kubeflow/katib/file-metrics-collector`. Run the following command to modify the `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": "docker.io/kubeflowkatib/file-metrics-collector"}]' + -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/args/9", "value": "ghcr.io/kubeflow/katib/file-metrics-collector"}]' ``` Check that Tekton Pipelines Controller's pod was restarted: @@ -54,7 +54,7 @@ Verify that `nop` image was modified: ```bash $ kubectl get $(kubectl get pods -o name -n tekton-pipelines | grep tekton-pipelines-controller) -n tekton-pipelines -o yaml | grep katib - - docker.io/kubeflowkatib/file-metrics-collector + - ghcr.io/kubeflow/katib/file-metrics-collector ``` ### Katib Controller diff --git a/examples/v1beta1/tekton/pipeline-run.yaml b/examples/v1beta1/tekton/pipeline-run.yaml index d3e1c61ea9a..539efa0d32a 100644 --- a/examples/v1beta1/tekton/pipeline-run.yaml +++ b/examples/v1beta1/tekton/pipeline-run.yaml @@ -88,7 +88,7 @@ spec: description: Number of epochs steps: - name: model-training - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/examples/v1beta1/trial-template/trial-metadata-substitution.yaml b/examples/v1beta1/trial-template/trial-metadata-substitution.yaml index fca944cd21e..becf0308af8 100644 --- a/examples/v1beta1/trial-template/trial-metadata-substitution.yaml +++ b/examples/v1beta1/trial-template/trial-metadata-substitution.yaml @@ -66,7 +66,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/manifests/v1beta1/components/controller/controller.yaml b/manifests/v1beta1/components/controller/controller.yaml index c6f97b5f189..593b4463c7a 100644 --- a/manifests/v1beta1/components/controller/controller.yaml +++ b/manifests/v1beta1/components/controller/controller.yaml @@ -23,7 +23,7 @@ spec: serviceAccountName: katib-controller containers: - name: katib-controller - image: docker.io/kubeflowkatib/katib-controller + image: ghcr.io/kubeflow/katib/katib-controller command: ["./katib-controller"] args: - --katib-config=/katib-config.yaml diff --git a/manifests/v1beta1/components/controller/trial-templates.yaml b/manifests/v1beta1/components/controller/trial-templates.yaml index 7cd05a49aec..055869c15e1 100644 --- a/manifests/v1beta1/components/controller/trial-templates.yaml +++ b/manifests/v1beta1/components/controller/trial-templates.yaml @@ -15,7 +15,7 @@ data: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" @@ -33,7 +33,7 @@ data: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/enas-cnn-cifar10-cpu:latest command: - python3 - -u @@ -54,7 +54,7 @@ data: spec: containers: - name: pytorch - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" @@ -68,7 +68,7 @@ data: spec: containers: - name: pytorch - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/manifests/v1beta1/components/db-manager/db-manager.yaml b/manifests/v1beta1/components/db-manager/db-manager.yaml index f4e6e455b0b..f32b67bc131 100644 --- a/manifests/v1beta1/components/db-manager/db-manager.yaml +++ b/manifests/v1beta1/components/db-manager/db-manager.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: katib-db-manager - image: docker.io/kubeflowkatib/katib-db-manager + image: ghcr.io/kubeflow/katib/katib-db-manager env: - name: DB_NAME value: "mysql" diff --git a/manifests/v1beta1/components/ui/ui.yaml b/manifests/v1beta1/components/ui/ui.yaml index 4d07def4bac..7236e75a5ec 100644 --- a/manifests/v1beta1/components/ui/ui.yaml +++ b/manifests/v1beta1/components/ui/ui.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: katib-ui - image: docker.io/kubeflowkatib/katib-ui + image: ghcr.io/kubeflow/katib/katib-ui command: - "./katib-ui" args: diff --git a/manifests/v1beta1/installs/katib-cert-manager/katib-config.yaml b/manifests/v1beta1/installs/katib-cert-manager/katib-config.yaml index 2e8e771e63c..16c5395ce8e 100644 --- a/manifests/v1beta1/installs/katib-cert-manager/katib-config.yaml +++ b/manifests/v1beta1/installs/katib-cert-manager/katib-config.yaml @@ -13,40 +13,40 @@ init: runtime: metricsCollectors: - kind: StdOut - image: docker.io/kubeflowkatib/file-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:latest - kind: File - image: docker.io/kubeflowkatib/file-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:latest - kind: TensorFlowEvent - image: docker.io/kubeflowkatib/tfevent-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:latest resources: limits: memory: 1Gi suggestions: - algorithmName: random - image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:latest - algorithmName: tpe - image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:latest - algorithmName: grid - image: docker.io/kubeflowkatib/suggestion-optuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:latest - algorithmName: hyperband - image: docker.io/kubeflowkatib/suggestion-hyperband:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperband:latest - algorithmName: bayesianoptimization - image: docker.io/kubeflowkatib/suggestion-skopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-skopt:latest - algorithmName: cmaes - image: docker.io/kubeflowkatib/suggestion-goptuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:latest - algorithmName: sobol - image: docker.io/kubeflowkatib/suggestion-goptuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:latest - algorithmName: multivariate-tpe - image: docker.io/kubeflowkatib/suggestion-optuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:latest - algorithmName: enas - image: docker.io/kubeflowkatib/suggestion-enas:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-enas:latest resources: limits: memory: 400Mi - algorithmName: darts - image: docker.io/kubeflowkatib/suggestion-darts:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-darts:latest - algorithmName: pbt - image: docker.io/kubeflowkatib/suggestion-pbt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-pbt:latest persistentVolumeClaimSpec: accessModes: - ReadWriteMany @@ -55,4 +55,4 @@ runtime: storage: 5Gi earlyStoppings: - algorithmName: medianstop - image: docker.io/kubeflowkatib/earlystopping-medianstop:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/earlystopping-medianstop:latest diff --git a/manifests/v1beta1/installs/katib-cert-manager/kustomization.yaml b/manifests/v1beta1/installs/katib-cert-manager/kustomization.yaml index 202c5ae7ce9..42a9b78fa03 100644 --- a/manifests/v1beta1/installs/katib-cert-manager/kustomization.yaml +++ b/manifests/v1beta1/installs/katib-cert-manager/kustomization.yaml @@ -20,15 +20,15 @@ resources: # Cert-manager certificate for webhooks - certificate.yaml images: - - name: docker.io/kubeflowkatib/katib-controller - newName: docker.io/kubeflowkatib/katib-controller - newTag: v0.18.0-rc.0 - - name: docker.io/kubeflowkatib/katib-db-manager - newName: docker.io/kubeflowkatib/katib-db-manager - newTag: v0.18.0-rc.0 - - name: docker.io/kubeflowkatib/katib-ui - newName: docker.io/kubeflowkatib/katib-ui - newTag: v0.18.0-rc.0 + - name: ghcr.io/kubeflow/katib/katib-controller + newName: ghcr.io/kubeflow/katib/katib-controller + newTag: latest + - name: ghcr.io/kubeflow/katib/katib-db-manager + newName: ghcr.io/kubeflow/katib/katib-db-manager + newTag: latest + - name: ghcr.io/kubeflow/katib/katib-ui + newName: ghcr.io/kubeflow/katib/katib-ui + newTag: latest patchesStrategicMerge: - patches/katib-cert-injection.yaml diff --git a/manifests/v1beta1/installs/katib-external-db/katib-config.yaml b/manifests/v1beta1/installs/katib-external-db/katib-config.yaml index ca7748b7d21..fcc1d8f2bcf 100644 --- a/manifests/v1beta1/installs/katib-external-db/katib-config.yaml +++ b/manifests/v1beta1/installs/katib-external-db/katib-config.yaml @@ -15,40 +15,40 @@ init: runtime: metricsCollectors: - kind: StdOut - image: docker.io/kubeflowkatib/file-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:latest - kind: File - image: docker.io/kubeflowkatib/file-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:latest - kind: TensorFlowEvent - image: docker.io/kubeflowkatib/tfevent-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:latest resources: limits: memory: 1Gi suggestions: - algorithmName: random - image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:latest - algorithmName: tpe - image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:latest - algorithmName: grid - image: docker.io/kubeflowkatib/suggestion-optuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:latest - algorithmName: hyperband - image: docker.io/kubeflowkatib/suggestion-hyperband:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperband:latest - algorithmName: bayesianoptimization - image: docker.io/kubeflowkatib/suggestion-skopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-skopt:latest - algorithmName: cmaes - image: docker.io/kubeflowkatib/suggestion-goptuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:latest - algorithmName: sobol - image: docker.io/kubeflowkatib/suggestion-goptuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:latest - algorithmName: multivariate-tpe - image: docker.io/kubeflowkatib/suggestion-optuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:latest - algorithmName: enas - image: docker.io/kubeflowkatib/suggestion-enas:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-enas:latest resources: limits: memory: 400Mi - algorithmName: darts - image: docker.io/kubeflowkatib/suggestion-darts:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-darts:latest - algorithmName: pbt - image: docker.io/kubeflowkatib/suggestion-pbt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-pbt:latest persistentVolumeClaimSpec: accessModes: - ReadWriteMany @@ -57,4 +57,4 @@ runtime: storage: 5Gi earlyStoppings: - algorithmName: medianstop - image: docker.io/kubeflowkatib/earlystopping-medianstop:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/earlystopping-medianstop:latest diff --git a/manifests/v1beta1/installs/katib-external-db/kustomization.yaml b/manifests/v1beta1/installs/katib-external-db/kustomization.yaml index e9973b0a267..cf8282cc6d5 100644 --- a/manifests/v1beta1/installs/katib-external-db/kustomization.yaml +++ b/manifests/v1beta1/installs/katib-external-db/kustomization.yaml @@ -16,15 +16,15 @@ resources: # Katib webhooks. - ../../components/webhook/ images: - - name: docker.io/kubeflowkatib/katib-controller - newName: docker.io/kubeflowkatib/katib-controller - newTag: v0.18.0-rc.0 - - name: docker.io/kubeflowkatib/katib-db-manager - newName: docker.io/kubeflowkatib/katib-db-manager - newTag: v0.18.0-rc.0 - - name: docker.io/kubeflowkatib/katib-ui - newName: docker.io/kubeflowkatib/katib-ui - newTag: v0.18.0-rc.0 + - name: ghcr.io/kubeflow/katib/katib-controller + newName: ghcr.io/kubeflow/katib/katib-controller + newTag: latest + - name: ghcr.io/kubeflow/katib/katib-db-manager + newName: ghcr.io/kubeflow/katib/katib-db-manager + newTag: latest + - name: ghcr.io/kubeflow/katib/katib-ui + newName: ghcr.io/kubeflow/katib/katib-ui + newTag: latest patchesStrategicMerge: - patches/db-manager.yaml # Modify katib-mysql-secrets with parameters for the DB. diff --git a/manifests/v1beta1/installs/katib-leader-election/katib-config.yaml b/manifests/v1beta1/installs/katib-leader-election/katib-config.yaml index 06338ad99b8..eb433dbc428 100644 --- a/manifests/v1beta1/installs/katib-leader-election/katib-config.yaml +++ b/manifests/v1beta1/installs/katib-leader-election/katib-config.yaml @@ -16,40 +16,40 @@ init: runtime: metricsCollectors: - kind: StdOut - image: docker.io/kubeflowkatib/file-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:latest - kind: File - image: docker.io/kubeflowkatib/file-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:latest - kind: TensorFlowEvent - image: docker.io/kubeflowkatib/tfevent-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:latest resources: limits: memory: 1Gi suggestions: - algorithmName: random - image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:latest - algorithmName: tpe - image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:latest - algorithmName: grid - image: docker.io/kubeflowkatib/suggestion-optuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:latest - algorithmName: hyperband - image: docker.io/kubeflowkatib/suggestion-hyperband:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperband:latest - algorithmName: bayesianoptimization - image: docker.io/kubeflowkatib/suggestion-skopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-skopt:latest - algorithmName: cmaes - image: docker.io/kubeflowkatib/suggestion-goptuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:latest - algorithmName: sobol - image: docker.io/kubeflowkatib/suggestion-goptuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:latest - algorithmName: multivariate-tpe - image: docker.io/kubeflowkatib/suggestion-optuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:latest - algorithmName: enas - image: docker.io/kubeflowkatib/suggestion-enas:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-enas:latest resources: limits: memory: 400Mi - algorithmName: darts - image: docker.io/kubeflowkatib/suggestion-darts:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-darts:latest - algorithmName: pbt - image: docker.io/kubeflowkatib/suggestion-pbt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-pbt:latest persistentVolumeClaimSpec: accessModes: - ReadWriteMany @@ -58,4 +58,4 @@ runtime: storage: 5Gi earlyStoppings: - algorithmName: medianstop - image: docker.io/kubeflowkatib/earlystopping-medianstop:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/earlystopping-medianstop:latest diff --git a/manifests/v1beta1/installs/katib-openshift/katib-config.yaml b/manifests/v1beta1/installs/katib-openshift/katib-config.yaml index 2e8e771e63c..16c5395ce8e 100644 --- a/manifests/v1beta1/installs/katib-openshift/katib-config.yaml +++ b/manifests/v1beta1/installs/katib-openshift/katib-config.yaml @@ -13,40 +13,40 @@ init: runtime: metricsCollectors: - kind: StdOut - image: docker.io/kubeflowkatib/file-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:latest - kind: File - image: docker.io/kubeflowkatib/file-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:latest - kind: TensorFlowEvent - image: docker.io/kubeflowkatib/tfevent-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:latest resources: limits: memory: 1Gi suggestions: - algorithmName: random - image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:latest - algorithmName: tpe - image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:latest - algorithmName: grid - image: docker.io/kubeflowkatib/suggestion-optuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:latest - algorithmName: hyperband - image: docker.io/kubeflowkatib/suggestion-hyperband:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperband:latest - algorithmName: bayesianoptimization - image: docker.io/kubeflowkatib/suggestion-skopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-skopt:latest - algorithmName: cmaes - image: docker.io/kubeflowkatib/suggestion-goptuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:latest - algorithmName: sobol - image: docker.io/kubeflowkatib/suggestion-goptuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:latest - algorithmName: multivariate-tpe - image: docker.io/kubeflowkatib/suggestion-optuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:latest - algorithmName: enas - image: docker.io/kubeflowkatib/suggestion-enas:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-enas:latest resources: limits: memory: 400Mi - algorithmName: darts - image: docker.io/kubeflowkatib/suggestion-darts:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-darts:latest - algorithmName: pbt - image: docker.io/kubeflowkatib/suggestion-pbt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-pbt:latest persistentVolumeClaimSpec: accessModes: - ReadWriteMany @@ -55,4 +55,4 @@ runtime: storage: 5Gi earlyStoppings: - algorithmName: medianstop - image: docker.io/kubeflowkatib/earlystopping-medianstop:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/earlystopping-medianstop:latest diff --git a/manifests/v1beta1/installs/katib-openshift/kustomization.yaml b/manifests/v1beta1/installs/katib-openshift/kustomization.yaml index b51c5a812fa..01cbd7f0655 100644 --- a/manifests/v1beta1/installs/katib-openshift/kustomization.yaml +++ b/manifests/v1beta1/installs/katib-openshift/kustomization.yaml @@ -28,15 +28,15 @@ resources: # Katib webhooks. - ../../components/webhook/ images: - - name: docker.io/kubeflowkatib/katib-controller - newName: docker.io/kubeflowkatib/katib-controller - newTag: v0.18.0-rc.0 - - name: docker.io/kubeflowkatib/katib-db-manager - newName: docker.io/kubeflowkatib/katib-db-manager - newTag: v0.18.0-rc.0 - - name: docker.io/kubeflowkatib/katib-ui - newName: docker.io/kubeflowkatib/katib-ui - newTag: v0.18.0-rc.0 + - name: ghcr.io/kubeflow/katib/katib-controller + newName: ghcr.io/kubeflow/katib/katib-controller + newTag: latest + - name: ghcr.io/kubeflow/katib/katib-db-manager + newName: ghcr.io/kubeflow/katib/katib-db-manager + newTag: latest + - name: ghcr.io/kubeflow/katib/katib-ui + newName: ghcr.io/kubeflow/katib/katib-ui + newTag: latest patchesJson6902: # Annotate Service to delegate TLS-secret generation to OpenShift service controller diff --git a/manifests/v1beta1/installs/katib-standalone-postgres/katib-config.yaml b/manifests/v1beta1/installs/katib-standalone-postgres/katib-config.yaml index ca7748b7d21..fcc1d8f2bcf 100644 --- a/manifests/v1beta1/installs/katib-standalone-postgres/katib-config.yaml +++ b/manifests/v1beta1/installs/katib-standalone-postgres/katib-config.yaml @@ -15,40 +15,40 @@ init: runtime: metricsCollectors: - kind: StdOut - image: docker.io/kubeflowkatib/file-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:latest - kind: File - image: docker.io/kubeflowkatib/file-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:latest - kind: TensorFlowEvent - image: docker.io/kubeflowkatib/tfevent-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:latest resources: limits: memory: 1Gi suggestions: - algorithmName: random - image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:latest - algorithmName: tpe - image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:latest - algorithmName: grid - image: docker.io/kubeflowkatib/suggestion-optuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:latest - algorithmName: hyperband - image: docker.io/kubeflowkatib/suggestion-hyperband:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperband:latest - algorithmName: bayesianoptimization - image: docker.io/kubeflowkatib/suggestion-skopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-skopt:latest - algorithmName: cmaes - image: docker.io/kubeflowkatib/suggestion-goptuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:latest - algorithmName: sobol - image: docker.io/kubeflowkatib/suggestion-goptuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:latest - algorithmName: multivariate-tpe - image: docker.io/kubeflowkatib/suggestion-optuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:latest - algorithmName: enas - image: docker.io/kubeflowkatib/suggestion-enas:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-enas:latest resources: limits: memory: 400Mi - algorithmName: darts - image: docker.io/kubeflowkatib/suggestion-darts:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-darts:latest - algorithmName: pbt - image: docker.io/kubeflowkatib/suggestion-pbt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-pbt:latest persistentVolumeClaimSpec: accessModes: - ReadWriteMany @@ -57,4 +57,4 @@ runtime: storage: 5Gi earlyStoppings: - algorithmName: medianstop - image: docker.io/kubeflowkatib/earlystopping-medianstop:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/earlystopping-medianstop:latest diff --git a/manifests/v1beta1/installs/katib-standalone-postgres/kustomization.yaml b/manifests/v1beta1/installs/katib-standalone-postgres/kustomization.yaml index e792570cdcb..df3457fd38b 100644 --- a/manifests/v1beta1/installs/katib-standalone-postgres/kustomization.yaml +++ b/manifests/v1beta1/installs/katib-standalone-postgres/kustomization.yaml @@ -18,15 +18,15 @@ resources: # Katib webhooks. - ../../components/webhook/ images: - - name: docker.io/kubeflowkatib/katib-controller - newName: docker.io/kubeflowkatib/katib-controller - newTag: v0.18.0-rc.0 - - name: docker.io/kubeflowkatib/katib-db-manager - newName: docker.io/kubeflowkatib/katib-db-manager - newTag: v0.18.0-rc.0 - - name: docker.io/kubeflowkatib/katib-ui - newName: docker.io/kubeflowkatib/katib-ui - newTag: v0.18.0-rc.0 + - name: ghcr.io/kubeflow/katib/katib-controller + newName: ghcr.io/kubeflow/katib/katib-controller + newTag: latest + - name: ghcr.io/kubeflow/katib/katib-db-manager + newName: ghcr.io/kubeflow/katib/katib-db-manager + newTag: latest + - name: ghcr.io/kubeflow/katib/katib-ui + newName: ghcr.io/kubeflow/katib/katib-ui + newTag: latest patchesJson6902: - target: group: apps diff --git a/manifests/v1beta1/installs/katib-standalone/katib-config.yaml b/manifests/v1beta1/installs/katib-standalone/katib-config.yaml index ca7748b7d21..3ec42ff1b90 100644 --- a/manifests/v1beta1/installs/katib-standalone/katib-config.yaml +++ b/manifests/v1beta1/installs/katib-standalone/katib-config.yaml @@ -1,4 +1,3 @@ ---- apiVersion: config.kubeflow.org/v1beta1 kind: KatibConfig init: @@ -15,40 +14,40 @@ init: runtime: metricsCollectors: - kind: StdOut - image: docker.io/kubeflowkatib/file-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:latest - kind: File - image: docker.io/kubeflowkatib/file-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:latest - kind: TensorFlowEvent - image: docker.io/kubeflowkatib/tfevent-metrics-collector:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:latest resources: limits: memory: 1Gi suggestions: - algorithmName: random - image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:latest - algorithmName: tpe - image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:latest - algorithmName: grid - image: docker.io/kubeflowkatib/suggestion-optuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:latest - algorithmName: hyperband - image: docker.io/kubeflowkatib/suggestion-hyperband:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperband:latest - algorithmName: bayesianoptimization - image: docker.io/kubeflowkatib/suggestion-skopt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-skopt:latest - algorithmName: cmaes - image: docker.io/kubeflowkatib/suggestion-goptuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:latest - algorithmName: sobol - image: docker.io/kubeflowkatib/suggestion-goptuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:latest - algorithmName: multivariate-tpe - image: docker.io/kubeflowkatib/suggestion-optuna:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:latest - algorithmName: enas - image: docker.io/kubeflowkatib/suggestion-enas:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-enas:latest resources: limits: memory: 400Mi - algorithmName: darts - image: docker.io/kubeflowkatib/suggestion-darts:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-darts:latest - algorithmName: pbt - image: docker.io/kubeflowkatib/suggestion-pbt:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/suggestion-pbt:latest persistentVolumeClaimSpec: accessModes: - ReadWriteMany @@ -57,4 +56,4 @@ runtime: storage: 5Gi earlyStoppings: - algorithmName: medianstop - image: docker.io/kubeflowkatib/earlystopping-medianstop:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/earlystopping-medianstop:latest diff --git a/manifests/v1beta1/installs/katib-standalone/kustomization.yaml b/manifests/v1beta1/installs/katib-standalone/kustomization.yaml index 930b590f5c0..dbf004c3732 100644 --- a/manifests/v1beta1/installs/katib-standalone/kustomization.yaml +++ b/manifests/v1beta1/installs/katib-standalone/kustomization.yaml @@ -18,15 +18,15 @@ resources: # Katib webhooks. - ../../components/webhook/ images: - - name: docker.io/kubeflowkatib/katib-controller - newName: docker.io/kubeflowkatib/katib-controller - newTag: v0.18.0-rc.0 - - name: docker.io/kubeflowkatib/katib-db-manager - newName: docker.io/kubeflowkatib/katib-db-manager - newTag: v0.18.0-rc.0 - - name: docker.io/kubeflowkatib/katib-ui - newName: docker.io/kubeflowkatib/katib-ui - newTag: v0.18.0-rc.0 + - name: ghcr.io/kubeflow/katib/katib-controller + newName: ghcr.io/kubeflow/katib/katib-controller + newTag: latest + - name: ghcr.io/kubeflow/katib/katib-db-manager + newName: ghcr.io/kubeflow/katib/katib-db-manager + newTag: latest + - name: ghcr.io/kubeflow/katib/katib-ui + newName: ghcr.io/kubeflow/katib/katib-ui + newTag: latest configMapGenerator: - name: katib-config behavior: create diff --git a/manifests/v1beta1/installs/katib-with-kubeflow/kustomization.yaml b/manifests/v1beta1/installs/katib-with-kubeflow/kustomization.yaml index f22b0ba683d..9321af9c930 100644 --- a/manifests/v1beta1/installs/katib-with-kubeflow/kustomization.yaml +++ b/manifests/v1beta1/installs/katib-with-kubeflow/kustomization.yaml @@ -9,15 +9,15 @@ resources: - ui-virtual-service.yaml - istio-authorizationpolicy.yaml images: - - name: docker.io/kubeflowkatib/katib-controller - newName: docker.io/kubeflowkatib/katib-controller - newTag: v0.18.0-rc.0 - - name: docker.io/kubeflowkatib/katib-db-manager - newName: docker.io/kubeflowkatib/katib-db-manager - newTag: v0.18.0-rc.0 - - name: docker.io/kubeflowkatib/katib-ui - newName: docker.io/kubeflowkatib/katib-ui - newTag: v0.18.0-rc.0 + - name: ghcr.io/kubeflow/katib/katib-controller + newName: ghcr.io/kubeflow/katib/katib-controller + newTag: latest + - name: ghcr.io/kubeflow/katib/katib-db-manager + newName: ghcr.io/kubeflow/katib/katib-db-manager + newTag: latest + - name: ghcr.io/kubeflow/katib/katib-ui + newName: ghcr.io/kubeflow/katib/katib-ui + newTag: latest patchesStrategicMerge: - patches/remove-namespace.yaml diff --git a/pkg/controller.v1beta1/experiment/experiment_controller_test.go b/pkg/controller.v1beta1/experiment/experiment_controller_test.go index fd1f41eeb17..22b236f92d7 100644 --- a/pkg/controller.v1beta1/experiment/experiment_controller_test.go +++ b/pkg/controller.v1beta1/experiment/experiment_controller_test.go @@ -483,7 +483,7 @@ func newFakeInstance() *experimentsv1beta1.Experiment { Containers: []corev1.Container{ { Name: primaryContainer, - Image: "docker.io/kubeflowkatib/pytorch-mnist-cpu", + Image: "ghcr.io/kubeflow/katib/pytorch-mnist-cpu", Command: []string{ "python3", "/opt/pytorch-mnist/mnist.py", @@ -619,7 +619,7 @@ func newFakeBatchJob() *batchv1.Job { Containers: []corev1.Container{ { Name: primaryContainer, - Image: "docker.io/kubeflowkatib/pytorch-mnist-cpu", + Image: "ghcr.io/kubeflow/katib/pytorch-mnist-cpu", Command: []string{ "python3", "/opt/pytorch-mnist/mnist.py", diff --git a/pkg/controller.v1beta1/experiment/manifest/generator_test.go b/pkg/controller.v1beta1/experiment/manifest/generator_test.go index 57e2789a2ac..0a35c93f052 100644 --- a/pkg/controller.v1beta1/experiment/manifest/generator_test.go +++ b/pkg/controller.v1beta1/experiment/manifest/generator_test.go @@ -61,7 +61,7 @@ func TestGetRunSpecWithHP(t *testing.T) { Containers: []v1.Container{ { Name: "training-container", - Image: "docker.io/kubeflowkatib/pytorch-mnist-cpu", + Image: "ghcr.io/kubeflow/katib/pytorch-mnist-cpu", Command: []string{ "python3", "/opt/pytorch-mnist/mnist.py", @@ -170,7 +170,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu command: - "python3" - "/opt/pytorch-mnist/mnist.py" @@ -186,7 +186,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu command: - python3 - /opt/pytorch-mnist/mnist.py @@ -207,7 +207,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu command: - "python3" - "/opt/pytorch-mnist/mnist.py" @@ -337,7 +337,7 @@ func newFakeInstance() *experimentsv1beta1.Experiment { Containers: []v1.Container{ { Name: "training-container", - Image: "docker.io/kubeflowkatib/pytorch-mnist-cpu", + Image: "ghcr.io/kubeflow/katib/pytorch-mnist-cpu", Command: []string{ "python3", "/opt/pytorch-mnist/mnist.py", diff --git a/pkg/controller.v1beta1/trial/trial_controller_test.go b/pkg/controller.v1beta1/trial/trial_controller_test.go index d52d77e78e5..e76eae56736 100644 --- a/pkg/controller.v1beta1/trial/trial_controller_test.go +++ b/pkg/controller.v1beta1/trial/trial_controller_test.go @@ -440,7 +440,7 @@ func newFakeTrialBatchJob(mcType commonv1beta1.CollectorKind, trialName string) Containers: []corev1.Container{ { Name: primaryContainer, - Image: "docker.io/kubeflowkatib/pytorch-mnist-cpu", + Image: "ghcr.io/kubeflow/katib/pytorch-mnist-cpu", Command: []string{ "python3", "/opt/pytorch-mnist/mnist.py", diff --git a/pkg/ui/v1beta1/frontend/cypress/fixtures/trial-template.json b/pkg/ui/v1beta1/frontend/cypress/fixtures/trial-template.json index eb515c650fc..960d1c44a65 100644 --- a/pkg/ui/v1beta1/frontend/cypress/fixtures/trial-template.json +++ b/pkg/ui/v1beta1/frontend/cypress/fixtures/trial-template.json @@ -8,15 +8,15 @@ "Templates": [ { "Path": "defaultTrialTemplate.yaml", - "Yaml": "apiVersion: batch/v1\nkind: Job\nspec:\n template:\n spec:\n containers:\n - name: training-container\n image: docker.io/kubeflowkatib/pytorch-mnist:v1beta1-45c5727\n command:\n - \"python3\"\n - \"/opt/pytorch-mnist/mnist.py\"\n - \"--epochs=1\"\n - \"--lr=${trialParameters.learningRate}\"\n - \"--momentum=${trialParameters.momentum}\"\n restartPolicy: Never" + "Yaml": "apiVersion: batch/v1\nkind: Job\nspec:\n template:\n spec:\n containers:\n - name: training-container\n image: ghcr.io/kubeflow/katib/pytorch-mnist:v1beta1-45c5727\n command:\n - \"python3\"\n - \"/opt/pytorch-mnist/mnist.py\"\n - \"--epochs=1\"\n - \"--lr=${trialParameters.learningRate}\"\n - \"--momentum=${trialParameters.momentum}\"\n restartPolicy: Never" }, { "Path": "enasCPUTemplate", - "Yaml": "apiVersion: batch/v1\nkind: Job\nspec:\n template:\n spec:\n containers:\n - name: training-container\n image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v1beta1-45c5727\n command:\n - python3\n - -u\n - RunTrial.py\n - --num_epochs=1\n - \"--architecture=\\\"${trialParameters.neuralNetworkArchitecture}\\\"\"\n - \"--nn_config=\\\"${trialParameters.neuralNetworkConfig}\\\"\"\n restartPolicy: Never" + "Yaml": "apiVersion: batch/v1\nkind: Job\nspec:\n template:\n spec:\n containers:\n - name: training-container\n image: ghcr.io/kubeflow/katib/enas-cnn-cifar10-cpu:v1beta1-45c5727\n command:\n - python3\n - -u\n - RunTrial.py\n - --num_epochs=1\n - \"--architecture=\\\"${trialParameters.neuralNetworkArchitecture}\\\"\"\n - \"--nn_config=\\\"${trialParameters.neuralNetworkConfig}\\\"\"\n restartPolicy: Never" }, { "Path": "pytorchJobTemplate", - "Yaml": "apiVersion: \"kubeflow.org/v1\"\nkind: PyTorchJob\nspec:\n pytorchReplicaSpecs:\n Master:\n replicas: 1\n restartPolicy: OnFailure\n template:\n spec:\n containers:\n - name: pytorch\n image: docker.io/kubeflowkatib/pytorch-mnist:v1beta1-45c5727\n imagePullPolicy: Always\n command:\n - \"python3\"\n - \"/opt/pytorch-mnist/mnist.py\"\n - \"--epochs=1\"\n - \"--lr=${trialParameters.learningRate}\"\n - \"--momentum=${trialParameters.momentum}\"\n Worker:\n replicas: 2\n restartPolicy: OnFailure\n template:\n spec:\n containers:\n - name: pytorch\n image: docker.io/kubeflowkatib/pytorch-mnist:v1beta1-45c5727\n imagePullPolicy: Always\n command:\n - \"python3\"\n - \"/opt/pytorch-mnist/mnist.py\"\n - \"--epochs=1\"\n - \"--lr=${trialParameters.learningRate}\"\n - \"--momentum=${trialParameters.momentum}\"" + "Yaml": "apiVersion: \"kubeflow.org/v1\"\nkind: PyTorchJob\nspec:\n pytorchReplicaSpecs:\n Master:\n replicas: 1\n restartPolicy: OnFailure\n template:\n spec:\n containers:\n - name: pytorch\n image: ghcr.io/kubeflow/katib/pytorch-mnist:v1beta1-45c5727\n imagePullPolicy: Always\n command:\n - \"python3\"\n - \"/opt/pytorch-mnist/mnist.py\"\n - \"--epochs=1\"\n - \"--lr=${trialParameters.learningRate}\"\n - \"--momentum=${trialParameters.momentum}\"\n Worker:\n replicas: 2\n restartPolicy: OnFailure\n template:\n spec:\n containers:\n - name: pytorch\n image: ghcr.io/kubeflow/katib/pytorch-mnist:v1beta1-45c5727\n imagePullPolicy: Always\n command:\n - \"python3\"\n - \"/opt/pytorch-mnist/mnist.py\"\n - \"--epochs=1\"\n - \"--lr=${trialParameters.learningRate}\"\n - \"--momentum=${trialParameters.momentum}\"" } ] } diff --git a/pkg/util/v1beta1/katibconfig/config_test.go b/pkg/util/v1beta1/katibconfig/config_test.go index 9f7d41c2aed..3760f5e7b8d 100644 --- a/pkg/util/v1beta1/katibconfig/config_test.go +++ b/pkg/util/v1beta1/katibconfig/config_test.go @@ -407,7 +407,7 @@ init: runtime: suggestions: - algorithmName: random - image: docker.io/kubeflowkatib/suggestion-hyperopt:latest + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:latest `), os.FileMode(0600)); err != nil { t.Fatal(err) } diff --git a/pkg/webhook/v1beta1/experiment/validator/validator_test.go b/pkg/webhook/v1beta1/experiment/validator/validator_test.go index b8d51548a61..de14f5a3a0c 100644 --- a/pkg/webhook/v1beta1/experiment/validator/validator_test.go +++ b/pkg/webhook/v1beta1/experiment/validator/validator_test.go @@ -1433,7 +1433,7 @@ func newFakeBatchJob() *batchv1.Job { Containers: []v1.Container{ { Name: "training-container", - Image: "docker.io/kubeflowkatib/pytorch-mnist-cpu", + Image: "ghcr.io/kubeflow/katib/pytorch-mnist-cpu", Command: []string{ "python3", "--epochs=1", diff --git a/scripts/v1beta1/release.sh b/scripts/v1beta1/release.sh index 05a8d76eb41..4fa3b2cd236 100755 --- a/scripts/v1beta1/release.sh +++ b/scripts/v1beta1/release.sh @@ -68,7 +68,7 @@ fi # ------------------ Change image tag ------------------ # Change Katib image tags to the new release tag. -make update-images OLD_PREFIX="docker.io/kubeflowkatib/" NEW_PREFIX="docker.io/kubeflowkatib/" TAG="${TAG}" +make update-images OLD_PREFIX="ghcr.io/kubeflow/katib/" NEW_PREFIX="ghcr.io/kubeflow/katib/" TAG="${TAG}" # ------------------ Publish Katib SDK ------------------ # Remove first "v" for the SDK version. diff --git a/scripts/v1beta1/update-images.sh b/scripts/v1beta1/update-images.sh index d7805f7af5d..d1a9b28b285 100755 --- a/scripts/v1beta1/update-images.sh +++ b/scripts/v1beta1/update-images.sh @@ -28,8 +28,8 @@ # 5. Katib Trial training containers # # Run ./scripts/v1beta1/update-images.sh to execute it. -# For example, to update images from: docker.io/kubeflowkatib/ to: docker.io/private/ registry with tag: v0.12.0, run: -# ./scripts/v1beta1/update-images.sh docker.io/kubeflowkatib/ docker.io/private/ v0.12.0 +# For example, to update images from: ghcr.io/kubeflow/katib/ to: ghcr.io/private/ registry with tag: v0.12.0, run: +# ./scripts/v1beta1/update-images.sh ghcr.io/kubeflow/katib/ ghcr.io/private/ v0.12.0 set -o errexit set -o pipefail @@ -42,8 +42,8 @@ TAG=${3:-""} if [[ -z "$OLD_PREFIX" || -z "$NEW_PREFIX" || -z "$TAG" ]]; then echo "Image old prefix, new prefix, and tag must be set" echo -e "Usage: $0 \n" 1>&2 - echo "For example, to update images from: docker.io/kubeflowkatib/ to: docker.io/private/ registry with tag: v0.12.0, run:" - echo "$0 docker.io/kubeflowkatib/ docker.io/private/ v0.12.0" + echo "For example, to update images from: ghcr.io/kubeflow/katib/ to: ghcr.io/private/ registry with tag: v0.12.0, run:" + echo "$0 ghcr.io/kubeflow/katib/ ghcr.io/private/ v0.12.0" exit 1 fi diff --git a/sdk/python/v1beta1/kubeflow/katib/api/katib_client_test.py b/sdk/python/v1beta1/kubeflow/katib/api/katib_client_test.py index db0af56f8c0..f8649816639 100644 --- a/sdk/python/v1beta1/kubeflow/katib/api/katib_client_test.py +++ b/sdk/python/v1beta1/kubeflow/katib/api/katib_client_test.py @@ -100,7 +100,7 @@ def generate_trial_template() -> V1beta1TrialTemplate: "containers": [ { "name": "training-container", - "image": "docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.14.0", + "image": "ghcr.io/kubeflow/katib/pytorch-mnist-cpu:v0.14.0", "command": [ "python3", "/opt/pytorch-mnist/mnist.py", diff --git a/test/e2e/v1beta1/scripts/aws/setup-katib.sh b/test/e2e/v1beta1/scripts/aws/setup-katib.sh index fe6e7061171..e985c96515e 100755 --- a/test/e2e/v1beta1/scripts/aws/setup-katib.sh +++ b/test/e2e/v1beta1/scripts/aws/setup-katib.sh @@ -32,7 +32,7 @@ kubectl version kubectl cluster-info # Update Katib images with the current PULL SHA. -make update-images OLD_PREFIX="docker.io/kubeflowkatib/" NEW_PREFIX="${ECR_REGISTRY}/${REPO_NAME}/v1beta1/" TAG="${PULL_PULL_SHA}" +make update-images OLD_PREFIX="ghcr.io/kubeflow/katib/" NEW_PREFIX="${ECR_REGISTRY}/${REPO_NAME}/v1beta1/" TAG="${PULL_PULL_SHA}" echo -e "\n The Katib will be deployed with the following configs" cat "manifests/v1beta1/installs/katib-standalone/kustomization.yaml" diff --git a/test/e2e/v1beta1/scripts/gh-actions/build-load.sh b/test/e2e/v1beta1/scripts/gh-actions/build-load.sh index cb0ea03cd5a..0f9b237abd9 100755 --- a/test/e2e/v1beta1/scripts/gh-actions/build-load.sh +++ b/test/e2e/v1beta1/scripts/gh-actions/build-load.sh @@ -30,7 +30,7 @@ TUNE_API=${2:-false} TRIAL_IMAGES=${3:-""} EXPERIMENTS=${4:-""} -REGISTRY="docker.io/kubeflowkatib" +REGISTRY="ghcr.io/kubeflow/katib" TAG="e2e-test" VERSION="v1beta1" CMD_PREFIX="cmd" diff --git a/test/e2e/v1beta1/scripts/gh-actions/setup-katib.sh b/test/e2e/v1beta1/scripts/gh-actions/setup-katib.sh index 056ff9ab54f..585c1e52b2b 100755 --- a/test/e2e/v1beta1/scripts/gh-actions/setup-katib.sh +++ b/test/e2e/v1beta1/scripts/gh-actions/setup-katib.sh @@ -30,7 +30,7 @@ TRAINING_OPERATOR_VERSION="v1.9.0" echo "Start to install Katib" # Update Katib images with `e2e-test`. -cd ../../../../../ && make update-images OLD_PREFIX="docker.io/kubeflowkatib/" NEW_PREFIX="docker.io/kubeflowkatib/" TAG="$E2E_TEST_IMAGE_TAG" && cd - +cd ../../../../../ && make update-images OLD_PREFIX="ghcr.io/kubeflow/katib/" NEW_PREFIX="ghcr.io/kubeflow/katib/" TAG="$E2E_TEST_IMAGE_TAG" && cd - # first declare the which kustomization file to use, by default use mysql. KUSTOMIZATION_FILE="../../../../../manifests/v1beta1/installs/katib-standalone/kustomization.yaml" diff --git a/test/e2e/v1beta1/testdata/invalid-experiment.yaml b/test/e2e/v1beta1/testdata/invalid-experiment.yaml index d562793f5f2..b4cf92ed1d7 100644 --- a/test/e2e/v1beta1/testdata/invalid-experiment.yaml +++ b/test/e2e/v1beta1/testdata/invalid-experiment.yaml @@ -40,7 +40,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/test/e2e/v1beta1/testdata/valid-experiment.yaml b/test/e2e/v1beta1/testdata/valid-experiment.yaml index c390dd0df49..e1d7fe7dae8 100644 --- a/test/e2e/v1beta1/testdata/valid-experiment.yaml +++ b/test/e2e/v1beta1/testdata/valid-experiment.yaml @@ -40,7 +40,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.18.0-rc.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:latest command: - "python3" - "/opt/pytorch-mnist/mnist.py" From bd0150ea03f9f37ba5691922cabb1a7153ac7347 Mon Sep 17 00:00:00 2001 From: sailesh duddupudi Date: Mon, 24 Mar 2025 20:34:34 +0000 Subject: [PATCH 2/2] revert changes for ipynb Signed-off-by: sailesh duddupudi --- .../v1beta1/kubeflow-pipelines/early-stopping.ipynb | 2 +- examples/v1beta1/sdk/cmaes-and-resume-policies.ipynb | 4 ++-- examples/v1beta1/sdk/nas-with-darts.ipynb | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/v1beta1/kubeflow-pipelines/early-stopping.ipynb b/examples/v1beta1/kubeflow-pipelines/early-stopping.ipynb index c7d0c52f2da..8866f621ad5 100644 --- a/examples/v1beta1/kubeflow-pipelines/early-stopping.ipynb +++ b/examples/v1beta1/kubeflow-pipelines/early-stopping.ipynb @@ -230,7 +230,7 @@ " \"containers\": [\n", " {\n", " \"name\": \"training-container\",\n", - " \"image\": \"ghcr.io/kubeflow/katib/pytorch-mnist-cpu:v0.14.0\",\n", + " \"image\": \"docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.14.0\",\n", " \"command\": [\n", " \"python3\",\n", " \"/opt/pytorch-mnist/mnist.py\",\n", diff --git a/examples/v1beta1/sdk/cmaes-and-resume-policies.ipynb b/examples/v1beta1/sdk/cmaes-and-resume-policies.ipynb index fac4173766e..d6876f2b864 100644 --- a/examples/v1beta1/sdk/cmaes-and-resume-policies.ipynb +++ b/examples/v1beta1/sdk/cmaes-and-resume-policies.ipynb @@ -133,7 +133,7 @@ " \"containers\": [\n", " {\n", " \"name\": \"training-container\",\n", - " \"image\": \"ghcr.io/kubeflow/katib/pytorch-mnist-cpu:v0.14.0\",\n", + " \"image\": \"docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.14.0\",\n", " \"command\": [\n", " \"python3\",\n", " \"/opt/pytorch-mnist/mnist.py\",\n", @@ -524,7 +524,7 @@ " '--lr=${trialParameters.learningRate}',\n", " '--num-layers=${trialParameters.numberLayers}',\n", " '--optimizer=${trialParameters.optimizer}'],\n", - " 'image': 'ghcr.io/kubeflow/katib/mxnet-mnist:v0.14.0',\n", + " 'image': 'docker.io/kubeflowkatib/mxnet-mnist:v0.14.0',\n", " 'name': 'training-container'}],\n", " 'restartPolicy': 'Never'}}}}}},\n", " 'status': {'completion_time': None,\n", diff --git a/examples/v1beta1/sdk/nas-with-darts.ipynb b/examples/v1beta1/sdk/nas-with-darts.ipynb index 91b97db9ac3..59f97991096 100644 --- a/examples/v1beta1/sdk/nas-with-darts.ipynb +++ b/examples/v1beta1/sdk/nas-with-darts.ipynb @@ -232,7 +232,7 @@ " \"containers\": [\n", " {\n", " \"name\": \"training-container\",\n", - " \"image\": \"ghcr.io/kubeflow/katib/darts-cnn-cifar10:v0.13.0\",\n", + " \"image\": \"docker.io/kubeflowkatib/darts-cnn-cifar10:v0.13.0\",\n", " \"command\": [\n", " 'python3',\n", " 'run_trial.py',\n", @@ -314,7 +314,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "{'name': 'training-container', 'image': 'ghcr.io/kubeflow/katib/darts-cnn-cifar10:v0.13.0', 'command': ['python3', 'run_trial.py', '--algorithm-settings=\"${trialParameters.algorithmSettings}\"', '--search-space=\"${trialParameters.searchSpace}\"', '--num-layers=\"${trialParameters.numberLayers}\"'], 'resources': {'limits': {'nvidia.com/gpu': 1}}}\n" + "{'name': 'training-container', 'image': 'docker.io/kubeflowkatib/darts-cnn-cifar10:v0.13.0', 'command': ['python3', 'run_trial.py', '--algorithm-settings=\"${trialParameters.algorithmSettings}\"', '--search-space=\"${trialParameters.searchSpace}\"', '--num-layers=\"${trialParameters.numberLayers}\"'], 'resources': {'limits': {'nvidia.com/gpu': 1}}}\n" ] } ], @@ -447,7 +447,7 @@ " '--algorithm-settings=\"${trialParameters.algorithmSettings}\"',\n", " '--search-space=\"${trialParameters.searchSpace}\"',\n", " '--num-layers=\"${trialParameters.numberLayers}\"'],\n", - " 'image': 'ghcr.io/kubeflow/katib/darts-cnn-cifar10:v0.13.0',\n", + " 'image': 'docker.io/kubeflowkatib/darts-cnn-cifar10:v0.13.0',\n", " 'name': 'training-container',\n", " 'resources': {'limits': {'nvidia.com/gpu': 1}}}],\n", " 'restartPolicy': 'Never'}}}}}}}" @@ -484,7 +484,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "{'apiVersion': 'kubeflow.org/v1beta1', 'kind': 'Experiment', 'metadata': {'creationTimestamp': '2021-10-05T23:49:49Z', 'finalizers': ['update-prometheus-metrics'], 'generation': 1, 'managedFields': [{'apiVersion': 'kubeflow.org/v1beta1', 'fieldsType': 'FieldsV1', 'fieldsV1': {'f:spec': {'.': {}, 'f:algorithm': {'.': {}, 'f:algorithmName': {}, 'f:algorithmSettings': {}}, 'f:maxFailedTrialCount': {}, 'f:maxTrialCount': {}, 'f:metricsCollectorSpec': {'.': {}, 'f:collector': {'.': {}, 'f:kind': {}}, 'f:source': {'.': {}, 'f:filter': {'.': {}, 'f:metricsFormat': {}}}}, 'f:nasConfig': {'.': {}, 'f:graphConfig': {'.': {}, 'f:numLayers': {}}, 'f:operations': {}}, 'f:objective': {'.': {}, 'f:objectiveMetricName': {}, 'f:type': {}}, 'f:parallelTrialCount': {}, 'f:trialTemplate': {'.': {}, 'f:primaryContainerName': {}, 'f:retain': {}, 'f:trialParameters': {}, 'f:trialSpec': {'.': {}, 'f:apiVersion': {}, 'f:kind': {}, 'f:spec': {'.': {}, 'f:template': {'.': {}, 'f:metadata': {'.': {}, 'f:annotations': {'.': {}, 'f:sidecar.istio.io/inject': {}}}, 'f:spec': {'.': {}, 'f:containers': {}, 'f:restartPolicy': {}}}}}}}}, 'manager': 'OpenAPI-Generator', 'operation': 'Update', 'time': '2021-10-05T23:49:49Z'}, {'apiVersion': 'kubeflow.org/v1beta1', 'fieldsType': 'FieldsV1', 'fieldsV1': {'f:metadata': {'f:finalizers': {'.': {}, 'v:\"update-prometheus-metrics\"': {}}}, 'f:status': {'.': {}, 'f:conditions': {}, 'f:currentOptimalTrial': {'.': {}, 'f:bestTrialName': {}, 'f:observation': {'.': {}, 'f:metrics': {}}, 'f:parameterAssignments': {}}, 'f:runningTrialList': {}, 'f:startTime': {}, 'f:trials': {}, 'f:trialsRunning': {}}}, 'manager': 'katib-controller', 'operation': 'Update', 'time': '2021-10-05T23:50:31Z'}], 'name': 'darts-example', 'namespace': 'kubeflow-user-example-com', 'resourceVersion': '393948698', 'uid': '3fbda962-64c0-4474-b1de-03b390f96369'}, 'spec': {'algorithm': {'algorithmName': 'darts', 'algorithmSettings': [{'name': 'num_epochs', 'value': '2'}, {'name': 'stem_multiplier', 'value': '1'}, {'name': 'init_channels', 'value': '4'}, {'name': 'num_nodes', 'value': '3'}]}, 'maxFailedTrialCount': 1, 'maxTrialCount': 1, 'metricsCollectorSpec': {'collector': {'kind': 'StdOut'}, 'source': {'filter': {'metricsFormat': ['([\\\\w-]+)=(Genotype.*)']}}}, 'nasConfig': {'graphConfig': {'numLayers': 2}, 'operations': [{'operationType': 'separable_convolution', 'parameters': [{'feasibleSpace': {'list': ['3']}, 'name': 'filter_size', 'parameterType': 'categorical'}]}, {'operationType': 'dilated_convolution', 'parameters': [{'feasibleSpace': {'list': ['3', '5']}, 'name': 'filter_size', 'parameterType': 'categorical'}]}, {'operationType': 'avg_pooling', 'parameters': [{'feasibleSpace': {'list': ['3']}, 'name': 'filter_size', 'parameterType': 'categorical'}]}, {'operationType': 'max_pooling', 'parameters': [{'feasibleSpace': {'list': ['3']}, 'name': 'filter_size', 'parameterType': 'categorical'}]}, {'operationType': 'skip_connection'}]}, 'objective': {'metricStrategies': [{'name': 'Best-Genotype', 'value': 'max'}], 'objectiveMetricName': 'Best-Genotype', 'type': 'maximize'}, 'parallelTrialCount': 1, 'resumePolicy': 'Never', 'trialTemplate': {'failureCondition': 'status.conditions.#(type==\"Failed\")#|#(status==\"True\")#', 'primaryContainerName': 'training-container', 'retain': True, 'successCondition': 'status.conditions.#(type==\"Complete\")#|#(status==\"True\")#', 'trialParameters': [{'description': ' Algorithm settings of DARTS Experiment', 'name': 'algorithmSettings', 'reference': 'algorithm-settings'}, {'description': 'Search Space of DARTS Experiment', 'name': 'searchSpace', 'reference': 'search-space'}, {'description': 'Number of Neural Network layers', 'name': 'numberLayers', 'reference': 'num-layers'}], 'trialSpec': {'apiVersion': 'batch/v1', 'kind': 'Job', 'spec': {'template': {'metadata': {'annotations': {'sidecar.istio.io/inject': 'false'}}, 'spec': {'containers': [{'command': ['python3', 'run_trial.py', '--algorithm-settings=\"${trialParameters.algorithmSettings}\"', '--search-space=\"${trialParameters.searchSpace}\"', '--num-layers=\"${trialParameters.numberLayers}\"'], 'image': 'ghcr.io/kubeflow/katib/darts-cnn-cifar10:v0.13.0', 'name': 'training-container', 'resources': {'limits': {'nvidia.com/gpu': 1}}}], 'restartPolicy': 'Never'}}}}}}, 'status': {'conditions': [{'lastTransitionTime': '2021-10-05T23:49:49Z', 'lastUpdateTime': '2021-10-05T23:49:49Z', 'message': 'Experiment is created', 'reason': 'ExperimentCreated', 'status': 'True', 'type': 'Created'}, {'lastTransitionTime': '2021-10-05T23:50:30Z', 'lastUpdateTime': '2021-10-05T23:50:30Z', 'message': 'Experiment is running', 'reason': 'ExperimentRunning', 'status': 'True', 'type': 'Running'}], 'currentOptimalTrial': {'bestTrialName': '', 'observation': {'metrics': None}, 'parameterAssignments': None}, 'runningTrialList': ['darts-example-n4fpnxlm'], 'startTime': '2021-10-05T23:49:49Z', 'trials': 1, 'trialsRunning': 1}}\n", + "{'apiVersion': 'kubeflow.org/v1beta1', 'kind': 'Experiment', 'metadata': {'creationTimestamp': '2021-10-05T23:49:49Z', 'finalizers': ['update-prometheus-metrics'], 'generation': 1, 'managedFields': [{'apiVersion': 'kubeflow.org/v1beta1', 'fieldsType': 'FieldsV1', 'fieldsV1': {'f:spec': {'.': {}, 'f:algorithm': {'.': {}, 'f:algorithmName': {}, 'f:algorithmSettings': {}}, 'f:maxFailedTrialCount': {}, 'f:maxTrialCount': {}, 'f:metricsCollectorSpec': {'.': {}, 'f:collector': {'.': {}, 'f:kind': {}}, 'f:source': {'.': {}, 'f:filter': {'.': {}, 'f:metricsFormat': {}}}}, 'f:nasConfig': {'.': {}, 'f:graphConfig': {'.': {}, 'f:numLayers': {}}, 'f:operations': {}}, 'f:objective': {'.': {}, 'f:objectiveMetricName': {}, 'f:type': {}}, 'f:parallelTrialCount': {}, 'f:trialTemplate': {'.': {}, 'f:primaryContainerName': {}, 'f:retain': {}, 'f:trialParameters': {}, 'f:trialSpec': {'.': {}, 'f:apiVersion': {}, 'f:kind': {}, 'f:spec': {'.': {}, 'f:template': {'.': {}, 'f:metadata': {'.': {}, 'f:annotations': {'.': {}, 'f:sidecar.istio.io/inject': {}}}, 'f:spec': {'.': {}, 'f:containers': {}, 'f:restartPolicy': {}}}}}}}}, 'manager': 'OpenAPI-Generator', 'operation': 'Update', 'time': '2021-10-05T23:49:49Z'}, {'apiVersion': 'kubeflow.org/v1beta1', 'fieldsType': 'FieldsV1', 'fieldsV1': {'f:metadata': {'f:finalizers': {'.': {}, 'v:\"update-prometheus-metrics\"': {}}}, 'f:status': {'.': {}, 'f:conditions': {}, 'f:currentOptimalTrial': {'.': {}, 'f:bestTrialName': {}, 'f:observation': {'.': {}, 'f:metrics': {}}, 'f:parameterAssignments': {}}, 'f:runningTrialList': {}, 'f:startTime': {}, 'f:trials': {}, 'f:trialsRunning': {}}}, 'manager': 'katib-controller', 'operation': 'Update', 'time': '2021-10-05T23:50:31Z'}], 'name': 'darts-example', 'namespace': 'kubeflow-user-example-com', 'resourceVersion': '393948698', 'uid': '3fbda962-64c0-4474-b1de-03b390f96369'}, 'spec': {'algorithm': {'algorithmName': 'darts', 'algorithmSettings': [{'name': 'num_epochs', 'value': '2'}, {'name': 'stem_multiplier', 'value': '1'}, {'name': 'init_channels', 'value': '4'}, {'name': 'num_nodes', 'value': '3'}]}, 'maxFailedTrialCount': 1, 'maxTrialCount': 1, 'metricsCollectorSpec': {'collector': {'kind': 'StdOut'}, 'source': {'filter': {'metricsFormat': ['([\\\\w-]+)=(Genotype.*)']}}}, 'nasConfig': {'graphConfig': {'numLayers': 2}, 'operations': [{'operationType': 'separable_convolution', 'parameters': [{'feasibleSpace': {'list': ['3']}, 'name': 'filter_size', 'parameterType': 'categorical'}]}, {'operationType': 'dilated_convolution', 'parameters': [{'feasibleSpace': {'list': ['3', '5']}, 'name': 'filter_size', 'parameterType': 'categorical'}]}, {'operationType': 'avg_pooling', 'parameters': [{'feasibleSpace': {'list': ['3']}, 'name': 'filter_size', 'parameterType': 'categorical'}]}, {'operationType': 'max_pooling', 'parameters': [{'feasibleSpace': {'list': ['3']}, 'name': 'filter_size', 'parameterType': 'categorical'}]}, {'operationType': 'skip_connection'}]}, 'objective': {'metricStrategies': [{'name': 'Best-Genotype', 'value': 'max'}], 'objectiveMetricName': 'Best-Genotype', 'type': 'maximize'}, 'parallelTrialCount': 1, 'resumePolicy': 'Never', 'trialTemplate': {'failureCondition': 'status.conditions.#(type==\"Failed\")#|#(status==\"True\")#', 'primaryContainerName': 'training-container', 'retain': True, 'successCondition': 'status.conditions.#(type==\"Complete\")#|#(status==\"True\")#', 'trialParameters': [{'description': ' Algorithm settings of DARTS Experiment', 'name': 'algorithmSettings', 'reference': 'algorithm-settings'}, {'description': 'Search Space of DARTS Experiment', 'name': 'searchSpace', 'reference': 'search-space'}, {'description': 'Number of Neural Network layers', 'name': 'numberLayers', 'reference': 'num-layers'}], 'trialSpec': {'apiVersion': 'batch/v1', 'kind': 'Job', 'spec': {'template': {'metadata': {'annotations': {'sidecar.istio.io/inject': 'false'}}, 'spec': {'containers': [{'command': ['python3', 'run_trial.py', '--algorithm-settings=\"${trialParameters.algorithmSettings}\"', '--search-space=\"${trialParameters.searchSpace}\"', '--num-layers=\"${trialParameters.numberLayers}\"'], 'image': 'docker.io/kubeflowkatib/darts-cnn-cifar10:v0.13.0', 'name': 'training-container', 'resources': {'limits': {'nvidia.com/gpu': 1}}}], 'restartPolicy': 'Never'}}}}}}, 'status': {'conditions': [{'lastTransitionTime': '2021-10-05T23:49:49Z', 'lastUpdateTime': '2021-10-05T23:49:49Z', 'message': 'Experiment is created', 'reason': 'ExperimentCreated', 'status': 'True', 'type': 'Created'}, {'lastTransitionTime': '2021-10-05T23:50:30Z', 'lastUpdateTime': '2021-10-05T23:50:30Z', 'message': 'Experiment is running', 'reason': 'ExperimentRunning', 'status': 'True', 'type': 'Running'}], 'currentOptimalTrial': {'bestTrialName': '', 'observation': {'metrics': None}, 'parameterAssignments': None}, 'runningTrialList': ['darts-example-n4fpnxlm'], 'startTime': '2021-10-05T23:49:49Z', 'trials': 1, 'trialsRunning': 1}}\n", "-----------------\n", "\n", "{'lastTransitionTime': '2021-10-05T23:50:30Z', 'lastUpdateTime': '2021-10-05T23:50:30Z', 'message': 'Experiment is running', 'reason': 'ExperimentRunning', 'status': 'True', 'type': 'Running'}\n" @@ -720,7 +720,7 @@ " '--algorithm-settings=\"${trialParameters.algorithmSettings}\"',\n", " '--search-space=\"${trialParameters.searchSpace}\"',\n", " '--num-layers=\"${trialParameters.numberLayers}\"'],\n", - " 'image': 'ghcr.io/kubeflow/katib/darts-cnn-cifar10:v0.13.0',\n", + " 'image': 'docker.io/kubeflowkatib/darts-cnn-cifar10:v0.13.0',\n", " 'name': 'training-container',\n", " 'resources': {'limits': {'nvidia.com/gpu': 1}}}],\n", " 'restartPolicy': 'Never'}}}}}},\n",