From b4025fcd39814a9381e0df3f8b174575531f2c63 Mon Sep 17 00:00:00 2001 From: Orfeas Kourkakis Date: Fri, 29 Sep 2023 09:36:38 +0200 Subject: [PATCH] chore: bump Katib ROCKs version 0.15.0 -> 0.16.0-rc.1 for CKF release 1.8 (#33) Bumped all ROCKs with following exceptions: - `cert-generator` ROCK is completely removed since corresponding component was consolidated into `katib-controller` component. See kubeflow/katib#2185 - `katib-ui-rock` needs to be rewritten since it is now based on wrong Dockerfile. Thus, no changes were introduced in this ROCK. See #32 - `katib-db-manager`: Diverged from upstream by keeping binary for GRPC health checks --- cert-generator/rockcraft.yaml | 40 ------------------------ earlystopping-medianstop/rockcraft.yaml | 8 ++--- file-metrics-collector/rockcraft.yaml | 6 ++-- katib-controller/rockcraft.yaml | 6 ++-- katib-db-manager/rockcraft.yaml | 6 ++-- katib-ui-rock/rockcraft.yaml | 2 +- suggestion-enas/rockcraft.yaml | 2 +- suggestion-hyperband/rockcraft.yaml | 19 +++-------- suggestion-hyperopt/rockcraft.yaml | 19 +++-------- suggestion-optuna/rockcraft.yaml | 19 +++-------- suggestion-pbt/rockcraft.yaml | 19 +++-------- suggestion-skopt/rockcraft.yaml | 19 +++-------- tfevent-metrics-collector/rockcraft.yaml | 8 ++--- 13 files changed, 39 insertions(+), 134 deletions(-) delete mode 100644 cert-generator/rockcraft.yaml diff --git a/cert-generator/rockcraft.yaml b/cert-generator/rockcraft.yaml deleted file mode 100644 index ec54123..0000000 --- a/cert-generator/rockcraft.yaml +++ /dev/null @@ -1,40 +0,0 @@ -# Based on https://github.com/kubeflow/katib/blob/release-0.15/cmd/cert-generator/v1beta1/Dockerfile -name: cert-generator -summary: Certificate generator for Katib standalone installation. -description: "Katib cert generator" -version: "v0.15.0_22.04_1" -license: Apache-2.0 -base: ubuntu:22.04 -build-base: ubuntu:22.04 -run-user: _daemon_ -services: - cert-generator: - override: replace - summary: "Cert genrator service" - startup: enabled - command: ./katib-cert-generator - working-dir: /app -platforms: - amd64: - -parts: - cert-generator: - plugin: go - source: https://github.com/kubeflow/katib - source-type: git - source-tag: "v0.15.0" - build-snaps: - - go/1.19/stable - override-build: | - go mod download -x - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o katib-cert-generator ./cmd/cert-generator/v1beta1 - mkdir -p ${CRAFT_PART_INSTALL}/app/ - cp -rp katib-cert-generator ${CRAFT_PART_INSTALL}/app/ - - security-team-requirement: - plugin: nil - override-build: | - mkdir -p ${CRAFT_PART_INSTALL}/usr/share/rocks - (echo "# os-release" && cat /etc/os-release && echo "# dpkg-query" && \ - dpkg-query --root=${CRAFT_PROJECT_DIR}/../bundles/ubuntu-22.04/rootfs/ -f '${db:Status-Abbrev},${binary:Package},${Version},${source:Package},${Source:Version}\n' -W) \ - > ${CRAFT_PART_INSTALL}/usr/share/rocks/dpkg.query diff --git a/earlystopping-medianstop/rockcraft.yaml b/earlystopping-medianstop/rockcraft.yaml index 11a043c..d271591 100644 --- a/earlystopping-medianstop/rockcraft.yaml +++ b/earlystopping-medianstop/rockcraft.yaml @@ -1,7 +1,7 @@ -# Based on https://github.com/kubeflow/katib/tree/master/cmd/earlystopping/medianstop/v1beta1 +# Based on https://github.com/kubeflow/katib/blob/v0.16.0-rc.1/cmd/earlystopping/medianstop/v1beta1/Dockerfile name: earlystopping-medianstop base: ubuntu:22.04 -version: 'v0.15.0_22.04_1' +version: 'v0.16.0_22.04_1' summary: Early stopping algorithm for katib. description: | The median stopping rule stops a pending trial X at step S if the trial’s best @@ -26,7 +26,7 @@ parts: requirements-and-deps: plugin: python source: https://github.com/kubeflow/katib.git - source-tag: "v0.15.0" + source-tag: "v0.16.0-rc.1" source-depth: 1 source-type: git source-subdir: cmd/earlystopping/medianstop/v1beta1 @@ -45,7 +45,7 @@ parts: earlystopping-medianstop: plugin: dump source: https://github.com/kubeflow/katib.git - source-tag: "v0.15.0" + source-tag: "v0.16.0-rc.1" source-depth: 1 source-type: git organize: diff --git a/file-metrics-collector/rockcraft.yaml b/file-metrics-collector/rockcraft.yaml index d017a22..98a360f 100644 --- a/file-metrics-collector/rockcraft.yaml +++ b/file-metrics-collector/rockcraft.yaml @@ -1,9 +1,9 @@ -# Based on https://github.com/kubeflow/katib/blob/v0.15.0/cmd/metricscollector/v1beta1/file-metricscollector +# Based on https://github.com/kubeflow/katib/blob/v0.16.0-rc.1/cmd/metricscollector/v1beta1/file-metricscollector/Dockerfile name: file-metrics-collector summary: Metrics collector for file info for Katib. description: | Collects metrics from specified file. -version: v0.15.0_22.04_1 +version: v0.16.0_22.04_1 license: Apache-2.0 build-base: ubuntu:22.04 base: bare @@ -22,7 +22,7 @@ parts: plugin: go source: https://github.com/kubeflow/katib source-type: git - source-tag: v0.15.0 + source-tag: v0.16.0-rc.1 build-snaps: - go stage-packages: diff --git a/katib-controller/rockcraft.yaml b/katib-controller/rockcraft.yaml index da377b0..c4b47cd 100644 --- a/katib-controller/rockcraft.yaml +++ b/katib-controller/rockcraft.yaml @@ -1,4 +1,4 @@ -# Based on https://github.com/kubeflow/katib/blob/v0.15.0/cmd/katib-controller/v1beta1/Dockerfile +# Based on https://github.com/kubeflow/katib/blob/v0.16.0-rc.1/cmd/katib-controller/v1beta1/Dockerfile name: katib-controller summary: Katib AutoML Controller description: | @@ -8,7 +8,7 @@ description: | Katib can perform training jobs using any Kubernetes Custom Resources with out of the box support for Kubeflow Training Operator, Argo Workflows, Tekton Pipelines and many more. -version: v0.15.0_22.04_1 +version: v0.16.0_22.04_1 license: Apache-2.0 build-base: ubuntu:22.04 base: bare @@ -27,7 +27,7 @@ parts: plugin: go source: https://github.com/kubeflow/katib source-type: git - source-tag: v0.15.0 + source-tag: v0.16.0-rc.1 build-snaps: - go stage-packages: diff --git a/katib-db-manager/rockcraft.yaml b/katib-db-manager/rockcraft.yaml index eaf8e12..2943ee7 100644 --- a/katib-db-manager/rockcraft.yaml +++ b/katib-db-manager/rockcraft.yaml @@ -1,9 +1,9 @@ -# Based on https://github.com/kubeflow/katib/blob/v0.15.0/cmd/katib-controller/v1beta1/Dockerfile +# Based on https://github.com/kubeflow/katib/blob/v0.16.0-rc.1/cmd/db-manager/v1beta1/Dockerfile name: katib-db-manager summary: Katib DB Controller description: | Katib database manager. -version: v0.15.0_22.04_1 +version: v0.16.0_22.04_1 license: Apache-2.0 build-base: ubuntu:22.04 base: bare @@ -23,7 +23,7 @@ parts: plugin: go source: https://github.com/kubeflow/katib source-type: git - source-tag: v0.15.0 + source-tag: v0.16.0-rc.1 build-snaps: - go stage-packages: diff --git a/katib-ui-rock/rockcraft.yaml b/katib-ui-rock/rockcraft.yaml index b60904f..5f69ca2 100644 --- a/katib-ui-rock/rockcraft.yaml +++ b/katib-ui-rock/rockcraft.yaml @@ -1,4 +1,4 @@ -# https://github.com/kubeflow/katib/blob/v0.15.0/cmd/ui/v1beta1 +# Based on https://github.com/kubeflow/katib/blob/v0.15.0/cmd/ui/v1beta1 name: katib-ui summary: Katib UI description: | diff --git a/suggestion-enas/rockcraft.yaml b/suggestion-enas/rockcraft.yaml index 5f31c92..d5f2d69 100644 --- a/suggestion-enas/rockcraft.yaml +++ b/suggestion-enas/rockcraft.yaml @@ -1,4 +1,4 @@ -# Based on https://github.com/kubeflow/katib/blob/v0.16.0/cmd/suggestion/nas/enas/v1beta1 +# Based on https://github.com/kubeflow/katib/blob/v0.16.0-rc.1/cmd/suggestion/nas/enas/v1beta1/Dockerfile name: suggestion-enas base: ubuntu:22.04 version: 'v0.16.0_22.04_1' diff --git a/suggestion-hyperband/rockcraft.yaml b/suggestion-hyperband/rockcraft.yaml index 9ad8029..afcf1c8 100644 --- a/suggestion-hyperband/rockcraft.yaml +++ b/suggestion-hyperband/rockcraft.yaml @@ -1,7 +1,7 @@ -# Based on https://github.com/kubeflow/katib/blob/v0.15.0/cmd/suggestion/hyperband/v1beta1 +# Based on https://github.com/kubeflow/katib/blob/v0.16.0-rc.1/cmd/suggestion/hyperband/v1beta1/Dockerfile name: suggestion-hyperband base: ubuntu:22.04 -version: 'v0.15.0_22.04_1' +version: 'v0.16.0_22.04_1' summary: "Katib Suggestion Hyperband" description: | Katib suggestion Hyperband. Hyperband focuses on early stopping as a strategy for optimizing resource allocation. @@ -24,7 +24,7 @@ parts: requirements-and-deps: plugin: python source: https://github.com/kubeflow/katib.git - source-tag: "v0.15.0" + source-tag: "v0.16.0-rc.1" source-depth: 1 source-type: git source-subdir: cmd/suggestion/hyperband/v1beta1 @@ -43,7 +43,7 @@ parts: suggestion-hyperband: plugin: dump source: https://github.com/kubeflow/katib.git - source-tag: "v0.15.0" + source-tag: "v0.16.0-rc.1" source-depth: 1 source-type: git organize: @@ -55,17 +55,6 @@ parts: - opt/katib/cmd/suggestion/hyperband/v1beta1/main.py - opt/katib/cmd/suggestion/hyperband/v1beta1/requirements.txt - # health check - grpc-health-check: - plugin: dump - source: https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.4.15/grpc_health_probe-linux-amd64 - source-type: file - organize: - grpc_health_probe-linux-amd64: bin/grpc_health_probe - override-stage: | - craftctl default - chmod +x ${CRAFT_STAGE}/bin/grpc_health_probe - security-team-requirement: plugin: nil override-build: | diff --git a/suggestion-hyperopt/rockcraft.yaml b/suggestion-hyperopt/rockcraft.yaml index 75d3376..b635e8b 100644 --- a/suggestion-hyperopt/rockcraft.yaml +++ b/suggestion-hyperopt/rockcraft.yaml @@ -1,7 +1,7 @@ -# Based on https://github.com/kubeflow/katib/blob/v0.15.0/cmd/suggestion/hyperopt/v1beta1 +# Based on https://github.com/kubeflow/katib/blob/v0.16.0-rc.1/cmd/suggestion/hyperopt/v1beta1/Dockerfile name: suggestion-hyperopt base: ubuntu:22.04 -version: 'v0.15.0_22.04_1' +version: 'v0.16.0_22.04_1' summary: "Katib Suggestion Hyperopt" description: | Ktibe Suggetion Hyperopt. Hyperopt is a Python library for serial and parallel optimization over awkward search spaces, which may include real-valued, discrete, and conditional dimensions. @@ -24,7 +24,7 @@ parts: requirements-and-deps: plugin: python source: https://github.com/kubeflow/katib.git - source-tag: "v0.15.0" + source-tag: "v0.16.0-rc.1" source-depth: 1 source-type: git source-subdir: cmd/suggestion/hyperopt/v1beta1 @@ -43,7 +43,7 @@ parts: suggestion-hyperopt: plugin: dump source: https://github.com/kubeflow/katib.git - source-tag: "v0.15.0" + source-tag: "v0.16.0-rc.1" source-depth: 1 source-type: git organize: @@ -55,17 +55,6 @@ parts: - opt/katib/cmd/suggestion/hyperopt/v1beta1/main.py - opt/katib/cmd/suggestion/hyperopt/v1beta1/requirements.txt - # health check - grpc-health-check: - plugin: dump - source: https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.4.15/grpc_health_probe-linux-amd64 - source-type: file - organize: - grpc_health_probe-linux-amd64: bin/grpc_health_probe - override-stage: | - craftctl default - chmod +x ${CRAFT_STAGE}/bin/grpc_health_probe - security-team-requirement: plugin: nil override-build: | diff --git a/suggestion-optuna/rockcraft.yaml b/suggestion-optuna/rockcraft.yaml index 0c089d3..55d7dc9 100644 --- a/suggestion-optuna/rockcraft.yaml +++ b/suggestion-optuna/rockcraft.yaml @@ -1,7 +1,7 @@ -# Based on https://github.com/kubeflow/katib/blob/v0.15.0/cmd/suggestion/optuna/v1beta1 +# Based on https://github.com/kubeflow/katib/blob/v0.16.0-rc.1/cmd/suggestion/optuna/v1beta1/Dockerfile name: suggestion-optuna base: ubuntu:22.04 -version: 'v0.15.0_22.04_1' +version: 'v0.16.0_22.04_1' summary: "Katib Suggestion Optuna" description: | Katib Suggestion Optuna. Optuna is an automatic hyperparameter optimization software framework, particularly designed for machine learning. @@ -24,7 +24,7 @@ parts: requirements-and-deps: plugin: python source: https://github.com/kubeflow/katib.git - source-tag: "v0.15.0" + source-tag: "v0.16.0-rc.1" source-depth: 1 source-type: git source-subdir: cmd/suggestion/optuna/v1beta1 @@ -43,7 +43,7 @@ parts: suggestion-optuna: plugin: dump source: https://github.com/kubeflow/katib.git - source-tag: "v0.15.0" + source-tag: "v0.16.0-rc.1" source-depth: 1 source-type: git organize: @@ -55,17 +55,6 @@ parts: - opt/katib/cmd/suggestion/optuna/v1beta1/main.py - opt/katib/cmd/suggestion/optuna/v1beta1/requirements.txt - # health check - grpc-health-check: - plugin: dump - source: https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.4.15/grpc_health_probe-linux-amd64 - source-type: file - organize: - grpc_health_probe-linux-amd64: bin/grpc_health_probe - override-stage: | - craftctl default - chmod +x ${CRAFT_STAGE}/bin/grpc_health_probe - security-team-requirement: plugin: nil override-build: | diff --git a/suggestion-pbt/rockcraft.yaml b/suggestion-pbt/rockcraft.yaml index 17aa37c..5173eea 100644 --- a/suggestion-pbt/rockcraft.yaml +++ b/suggestion-pbt/rockcraft.yaml @@ -1,7 +1,7 @@ -# Based on https://github.com/kubeflow/katib/blob/v0.15.0/cmd/suggestion/pbt/v1beta1 +# Based on https://github.com/kubeflow/katib/blob/v0.16.0-rc.1/cmd/suggestion/pbt/v1beta1/Dockerfile name: suggestion-pbt base: ubuntu:22.04 -version: 'v0.15.0_22.04_1' +version: 'v0.16.0_22.04_1' summary: "Katib Suggestion PBT" description: | Katib Suggestion PBT. Population Based Training, a simple asynchronous optimisation algorithm which effectively utilises a fixed computational budget to jointly optimise a population of models and their hyperparameters to maximise performance. @@ -24,7 +24,7 @@ parts: requirements-and-deps: plugin: python source: https://github.com/kubeflow/katib.git - source-tag: "v0.15.0" + source-tag: "v0.16.0-rc.1" source-depth: 1 source-type: git source-subdir: cmd/suggestion/pbt/v1beta1 @@ -43,7 +43,7 @@ parts: suggestion-pbt: plugin: dump source: https://github.com/kubeflow/katib.git - source-tag: "v0.15.0" + source-tag: "v0.16.0-rc.1" source-depth: 1 source-type: git organize: @@ -55,17 +55,6 @@ parts: - opt/katib/cmd/suggestion/pbt/v1beta1/main.py - opt/katib/cmd/suggestion/pbt/v1beta1/requirements.txt - # health check - grpc-health-check: - plugin: dump - source: https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.4.15/grpc_health_probe-linux-amd64 - source-type: file - organize: - grpc_health_probe-linux-amd64: bin/grpc_health_probe - override-stage: | - craftctl default - chmod +x ${CRAFT_STAGE}/bin/grpc_health_probe - security-team-requirement: plugin: nil override-build: | diff --git a/suggestion-skopt/rockcraft.yaml b/suggestion-skopt/rockcraft.yaml index f4a350e..088ad1b 100644 --- a/suggestion-skopt/rockcraft.yaml +++ b/suggestion-skopt/rockcraft.yaml @@ -1,7 +1,7 @@ -# Based on https://github.com/kubeflow/katib/blob/v0.15.0/cmd/suggestion/skopt/v1beta1 +# Based on https://github.com/kubeflow/katib/blob/v0.16.0-rc.1/cmd/suggestion/skopt/v1beta1/Dockerfile name: suggestion-skopt base: ubuntu:22.04 -version: 'v0.15.0_22.04_1' +version: 'v0.16.0_22.04_1' summary: "Katib Suggestion skopt" description: | Katib Suggestion skopt. Scikit-Optimize, or skopt, is a simple and efficient library to minimize expensive and noisy black-box functions. It implements several methods for sequential model-based optimization. @@ -24,7 +24,7 @@ parts: requirements-and-deps: plugin: python source: https://github.com/kubeflow/katib.git - source-tag: "v0.15.0" + source-tag: "v0.16.0-rc.1" source-depth: 1 source-type: git source-subdir: cmd/suggestion/skopt/v1beta1 @@ -43,7 +43,7 @@ parts: suggestion-skopt: plugin: dump source: https://github.com/kubeflow/katib.git - source-tag: "v0.15.0" + source-tag: "v0.16.0-rc.1" source-depth: 1 source-type: git organize: @@ -55,17 +55,6 @@ parts: - opt/katib/cmd/suggestion/skopt/v1beta1/main.py - opt/katib/cmd/suggestion/skopt/v1beta1/requirements.txt - # health check - grpc-health-check: - plugin: dump - source: https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.4.15/grpc_health_probe-linux-amd64 - source-type: file - organize: - grpc_health_probe-linux-amd64: bin/grpc_health_probe - override-stage: | - craftctl default - chmod +x ${CRAFT_STAGE}/bin/grpc_health_probe - security-team-requirement: plugin: nil override-build: | diff --git a/tfevent-metrics-collector/rockcraft.yaml b/tfevent-metrics-collector/rockcraft.yaml index 727230e..639eec0 100644 --- a/tfevent-metrics-collector/rockcraft.yaml +++ b/tfevent-metrics-collector/rockcraft.yaml @@ -1,7 +1,7 @@ -# Based on https://github.com/kubeflow/katib/blob/master/cmd/metricscollector/v1beta1/tfevent-metricscollector +# Based on https://github.com/kubeflow/katib/blob/v0.16.0-rc.1/cmd/metricscollector/v1beta1/tfevent-metricscollector/Dockerfile name: tfevent-metrics-collector base: ubuntu:22.04 -version: 'v0.15.0_22.04_1' +version: 'v0.16.0_22.04_1' summary: Metrics collector for TF Events for Katib. description: | Collects metrics and stores them on the persistent layer (katib-db-manager). Used as sidecar. @@ -24,7 +24,7 @@ parts: requirements-and-deps: plugin: python source: https://github.com/kubeflow/katib.git - source-tag: "v0.15.0" + source-tag: "v0.16.0-rc.1" source-depth: 1 source-type: git source-subdir: cmd/metricscollector/v1beta1/tfevent-metricscollector @@ -43,7 +43,7 @@ parts: tfevent-metrics-collector: plugin: dump source: https://github.com/kubeflow/katib.git - source-tag: "v0.15.0" + source-tag: "v0.16.0-rc.1" source-depth: 1 source-type: git organize: