Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automated cherry pick of #2204: Update katib for v0.4.0 release Cherry pick of #2204 on v0.4-branch. #2204: Update katib for v0.4.0 release #2205

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions kubeflow/katib/prototypes/all.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
// @description Kubeflow hyperparameter tuning component
// @shortDescription hp-tuning
// @param name string Name to give to each of the components
// @optionalParam suggestionRandomImage string gcr.io/kubeflow-images-public/katib/suggestion-random:v0.1.2-alpha-98-g07e0fd2 The image for random suggestion.
// @optionalParam suggestionGridImage string gcr.io/kubeflow-images-public/katib/suggestion-grid:v0.1.2-alpha-98-g07e0fd2 The image for grid suggestion.
// @optionalParam suggestionHyperbandImage string gcr.io/kubeflow-images-public/katib/suggestion-hyperband:v0.1.2-alpha-98-g07e0fd2 The image for grid suggestion.
// @optionalParam suggestionBayesianOptimizationImage string gcr.io/kubeflow-images-public/katib/suggestion-bayesianoptimization:v0.1.2-alpha-98-g07e0fd2 The image for grid suggestion.
// @optionalParam vizierCoreImage string gcr.io/kubeflow-images-public/katib/vizier-core:v0.1.2-alpha-100-gbca0b58 The image for vizier core.
// @optionalParam vizierCoreRestImage string gcr.io/kubeflow-images-public/katib/vizier-core-rest:v0.1.2-alpha-100-gbca0b58 The image for vizier core rest.
// @optionalParam katibUIImage string gcr.io/kubeflow-images-public/katib/katib-ui:v0.1.2-alpha-100-gbca0b58 The image for katib ui.
// @optionalParam suggestionRandomImage string gcr.io/kubeflow-images-public/katib/suggestion-random:v0.4.0 The image for random suggestion.
// @optionalParam suggestionGridImage string gcr.io/kubeflow-images-public/katib/suggestion-grid:v0.4.0 The image for grid suggestion.
// @optionalParam suggestionHyperbandImage string gcr.io/kubeflow-images-public/katib/suggestion-hyperband:v0.4.0 The image for grid suggestion.
// @optionalParam suggestionBayesianOptimizationImage string gcr.io/kubeflow-images-public/katib/suggestion-bayesianoptimization:v0.4.0 The image for grid suggestion.
// @optionalParam vizierCoreImage string gcr.io/kubeflow-images-public/katib/vizier-core:v0.4.0 The image for vizier core.
// @optionalParam vizierCoreRestImage string gcr.io/kubeflow-images-public/katib/vizier-core-rest:v0.4.0 The image for vizier core rest.
// @optionalParam katibUIImage string gcr.io/kubeflow-images-public/katib/katib-ui:v0.4.0 The image for katib ui.
// @optionalParam vizierDbImage string mysql:8.0.3 The image for vizier db.
// @optionalParam studyJobControllerImage string gcr.io/kubeflow-images-public/katib/studyjob-controller:v0.1.2-alpha-100-gbca0b58 The image for studyjob-controller.
// @optionalParam metricsCollectorImage string gcr.io/kubeflow-images-public/katib/metrics-collector:v0.1.2-alpha-100-gbca0b58 The image for metrics-collector.
// @optionalParam studyJobControllerImage string gcr.io/kubeflow-images-public/katib/studyjob-controller:v0.4.0 The image for studyjob-controller.
// @optionalParam metricsCollectorImage string gcr.io/kubeflow-images-public/katib/metrics-collector:v0.4.0 The image for metrics-collector.

local k = import "k.libsonnet";

Expand Down
22 changes: 17 additions & 5 deletions releasing/add_image_shas.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ def main(unparsed_args=None): # pylint: disable=too-many-locals
type=str,
help="Yaml file containing the tags to attach.")

parser.add_argument(
"--repository",
default=None,
type=str,
help="GCR repository name (optional).")

args = parser.parse_args()

with open(args.images_file) as hf:
Expand All @@ -40,10 +46,16 @@ def main(unparsed_args=None): # pylint: disable=too-many-locals
for v in image["versions"]:
existing_images[image["name"]][v["digest"]] = v

raw_images = util.run(["gcloud",
"--project=kubeflow-images-public",
"container", "images", "list",
"--format=json"])
list_images_cmd = ["gcloud",
"--project=kubeflow-images-public",
"container", "images", "list",
"--format=json"]
# By default gcloud uses gcr.io/[project] as the repository.
# However for images like katib, we may need to specify the
# repository as gcr.io/[project]/katib.
if args.repository:
list_images_cmd.append("--repository=" + args.repository)
raw_images = util.run(list_images_cmd)

all_images = json.loads(raw_images)
name_pattern, tag_pattern = args.pattern.split(":")
Expand Down Expand Up @@ -115,4 +127,4 @@ def main(unparsed_args=None): # pylint: disable=too-many-locals
datefmt='%Y-%m-%dT%H:%M:%S',
)
logging.getLogger().setLevel(logging.INFO)
main()
main()
6 changes: 3 additions & 3 deletions releasing/add_katib_image_shas.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ IMAGES_FILE=${ROOT_DIR}/releasing/image_tags.yaml
# we depend on the python code in that repo.
export PYTHONPATH=${PYTHONPATH}:${ROOT_DIR}/../git_kubeflow-testing/py

KATIB_TAG=v0.1.2-alpha-34-gb46378c
KATIB_TAG=v0.1.2-alpha-106-gfae6aa5

# Fetch shas for Jupyter images
# Fetch shas for katib images
python ${ROOT_DIR}/releasing/add_image_shas.py --pattern=.*katib/.*:${KATIB_TAG} \
--images_file=${IMAGES_FILE}
--images_file=${IMAGES_FILE} --repository=gcr.io/kubeflow-images-public/katib
218 changes: 186 additions & 32 deletions releasing/image_tags.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
images:
- name: gcr.io/kubeflow-images-public/centraldashboard
versions:
- digest: sha256:9a410ef29484aa6d8b2acacbed8cc708bbf928436b67f1ab326eaf096424139a
tags:
- v0.3.0
- digest: sha256:3b0a17231c1e8f0c1f6b2eda70bb212998506008176ec0ab066ffc0e7c3854bc
tags:
- v0.4.0
- digest: sha256:9a410ef29484aa6d8b2acacbed8cc708bbf928436b67f1ab326eaf096424139a
tags:
- v0.3.0
- name: gcr.io/kubeflow-images-public/chainer-operator
versions:
- digest: sha256:2cd5d5adbb97373f0ef978f39618cb43d214973aadee0d1b01dae61a9d0c48cc
Expand All @@ -21,19 +21,173 @@ images:
month: 9
second: 13
year: 2018
- name: gcr.io/kubeflow-images-public/katib/earlystopping-medianstopping
versions:
- digest: sha256:7020b138465117d8fe24ed717456689fc961a12504c3a7769558e1696cf74b3a
tags:
- v0.4.0
timestamp:
datetime: '2019-01-02 20:00:28-08:00'
day: 2
hour: 20
microsecond: 0
minute: 0
month: 1
second: 28
year: 2019
- name: gcr.io/kubeflow-images-public/katib/katib-ui
versions:
- digest: sha256:7b655bdbcb75370f2eb2a47427bfa8df2c3ab8c9c2ea8000ca564ef6d4177dc9
tags:
- v0.4.0
timestamp:
datetime: '2019-01-02 20:01:26-08:00'
day: 2
hour: 20
microsecond: 0
minute: 1
month: 1
second: 26
year: 2019
- name: gcr.io/kubeflow-images-public/katib/metrics-collector
versions:
- digest: sha256:6c4be5eedba27d509e194e59a2b951d3769e3936963221671b3d948d74551714
tags:
- v0.4.0
timestamp:
datetime: '2019-01-02 20:04:24-08:00'
day: 2
hour: 20
microsecond: 0
minute: 4
month: 1
second: 24
year: 2019
- name: gcr.io/kubeflow-images-public/katib/studyjob-controller
versions:
- digest: sha256:84fbef8d809d8a32c308606a0fcfe44ef0fbbc35e76655dd57ade05d6df5e3d8
tags:
- v0.4.0
timestamp:
datetime: '2019-01-02 20:01:39-08:00'
day: 2
hour: 20
microsecond: 0
minute: 1
month: 1
second: 39
year: 2019
- name: gcr.io/kubeflow-images-public/katib/suggestion-bayesianoptimization
versions:
- digest: sha256:ddcf562d36f4602c23372ed65e20e0161016cc517fc5489e7cf9cd94fd316d93
tags:
- v0.4.0
timestamp:
datetime: '2019-01-02 20:00:36-08:00'
day: 2
hour: 20
microsecond: 0
minute: 0
month: 1
second: 36
year: 2019
- name: gcr.io/kubeflow-images-public/katib/suggestion-grid
versions:
- digest: sha256:920bfb2bb43afc6f5743bc9a822ac934d0091769e5abaec31d82e341cc5f5f9c
tags:
- v0.4.0
timestamp:
datetime: '2019-01-02 20:00:38-08:00'
day: 2
hour: 20
microsecond: 0
minute: 0
month: 1
second: 38
year: 2019
- name: gcr.io/kubeflow-images-public/katib/suggestion-hyperband
versions:
- digest: sha256:53ccf880f57d974e9657d0cd07abf9f0085d0742e8440b9e49d9c4b0f8fdcb3c
tags:
- v0.4.0
timestamp:
datetime: '2019-01-02 20:00:40-08:00'
day: 2
hour: 20
microsecond: 0
minute: 0
month: 1
second: 40
year: 2019
- name: gcr.io/kubeflow-images-public/katib/suggestion-random
versions:
- digest: sha256:309c8e1f2564c57c9c153be3d336abae17c93dca947e30e03bc765b5d7f56659
tags:
- v0.4.0
timestamp:
datetime: '2019-01-02 20:00:59-08:00'
day: 2
hour: 20
microsecond: 0
minute: 0
month: 1
second: 59
year: 2019
- name: gcr.io/kubeflow-images-public/katib/tfevent-metrics-collector
versions:
- digest: sha256:f088ba5427daef22a420ae9405cec4061edb93380f3d5ef456f783224ab3c03c
tags:
- v0.4.0
timestamp:
datetime: '2019-01-02 20:06:20-08:00'
day: 2
hour: 20
microsecond: 0
minute: 6
month: 1
second: 20
year: 2019
- name: gcr.io/kubeflow-images-public/katib/vizier-core
versions:
- digest: sha256:e1a429e00432d80ce45f3191c414e4070e5e1169d10ee4feac272b9d838d3e94
tags:
- v0.4.0
timestamp:
datetime: '2019-01-02 20:00:51-08:00'
day: 2
hour: 20
microsecond: 0
minute: 0
month: 1
second: 51
year: 2019
- name: gcr.io/kubeflow-images-public/katib/vizier-core-rest
versions:
- digest: sha256:fbb9c84bde820ece2b967e66c1191010d14f8acc6beb3f9919b634833286776b
tags:
- v0.4.0
timestamp:
datetime: '2019-01-02 20:00:25-08:00'
day: 2
hour: 20
microsecond: 0
minute: 0
month: 1
second: 25
year: 2019
- name: gcr.io/kubeflow-images-public/kubebench/kubebench-controller
versions:
- digest: sha256:275d44380f23019f77222f23a3816786759b752e5db9ccb0da24f5471b0eff96
tags:
- v0.3.0
- name: gcr.io/kubeflow-images-public/pytorch-operator
versions:
- digest: sha256:33aa95a3aa0108d5bc631fa3f8a04e646d4eef08a0e8c4695842f92ef0c79027
tags:
- v0.3.0
- digest: sha256:a51b91ab69f61b709b747089bee34c692b9fdbf016f518a040696502a317ce26
tags:
- v0.4.0
- digest: sha256:33aa95a3aa0108d5bc631fa3f8a04e646d4eef08a0e8c4695842f92ef0c79027
tags:
- v0.3.0
- name: gcr.io/kubeflow-images-public/tensorflow-1.10.1-notebook-cpu
versions:
- digest: sha256:bd3d2ae9a4e07b2b58910e99a26676ab31f4ba5ae2a633fbde5ce8dee8b63024
Expand Down Expand Up @@ -442,19 +596,6 @@ images:
month: 9
second: 13
year: 2018
- digest: sha256:8df95a6e81610595347c6cb00be6fe06f1504933392deea848181463a42cc0e4
tags:
- v-base-b321075-822
- v0.3.1
timestamp:
datetime: '2018-10-18 13:35:30-07:00'
day: 18
hour: 13
microsecond: 0
minute: 35
month: 10
second: 30
year: 2018
- digest: sha256:dadb6730d9aadb7b024e3ebe0c4c76ff46e4b56f0c12367db3afbd4c1a732550
tags:
- latest
Expand All @@ -469,19 +610,18 @@ images:
month: 6
second: 37
year: 2018
- digest: sha256:ee61d16658d6baa0bb6f18ad0d456de66d3931b2f0484bbd185f4af96170f5d6
- digest: sha256:8df95a6e81610595347c6cb00be6fe06f1504933392deea848181463a42cc0e4
tags:
- latest
- v20180707-5a11c84d
- v0.2.1
- v-base-b321075-822
- v0.3.1
timestamp:
datetime: '2018-07-07 09:23:39-07:00'
day: 7
hour: 9
datetime: '2018-10-18 13:35:30-07:00'
day: 18
hour: 13
microsecond: 0
minute: 23
month: 7
second: 39
minute: 35
month: 10
second: 30
year: 2018
- digest: sha256:160383f1bfc246ac9021900a9e44f4cfd8bf83aeccf82cd9518125197bcf8e7a
tags:
Expand All @@ -496,6 +636,20 @@ images:
month: 12
second: 15
year: 2018
- digest: sha256:ee61d16658d6baa0bb6f18ad0d456de66d3931b2f0484bbd185f4af96170f5d6
tags:
- latest
- v20180707-5a11c84d
- v0.2.1
timestamp:
datetime: '2018-07-07 09:23:39-07:00'
day: 7
hour: 9
microsecond: 0
minute: 23
month: 7
second: 39
year: 2018
- name: gcr.io/kubeflow-images-public/tensorflow-1.6.0-notebook-gpu
versions:
- digest: sha256:bc343131c6ef4bdf29f7e54b945438b756b969aab1d786e16553b5209ca4e4b8
Expand Down Expand Up @@ -914,12 +1068,12 @@ images:
- v0.3.0
- name: gcr.io/kubeflow-images-public/tf_operator
versions:
- digest: sha256:4f20e349f79059a009ef75aea158ca0c555fcc4a22e7c80a7cb9bff54fbab6c1
tags:
- v0.2.0
- digest: sha256:9007f398a8da9287e4693f7cb01e711c94d1404e8bf91885837fdd5fe3cca35
tags:
- v0.3.0
- digest: sha256:4f20e349f79059a009ef75aea158ca0c555fcc4a22e7c80a7cb9bff54fbab6c1
tags:
- v0.2.0
- digest: sha256:95a360e82bb3ed76f4c31b8d463e4d342e1b8023d20d6650f8653599bf4b57ab
tags:
- v0.4.0