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.

Sign up for GitHub

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

Jump to bottom

Cherry pick #1727 #1777

Merged
merged 1 commit into from
Oct 15, 2018
Merged

Cherry pick #1727 #1777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions kubeflow/katib/prototypes/all.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
// @optionalParam modeldbFrontendImage string gcr.io/kubeflow-images-public/katib/katib-frontend:v0.1.2-alpha-34-gb46378c The image for modeldb frontend.
// @optionalParam suggestionRandomImage string gcr.io/kubeflow-images-public/katib/suggestion-random:v0.1.2-alpha-34-gb46378c The image for random suggestion.
// @optionalParam suggestionGridImage string gcr.io/kubeflow-images-public/katib/suggestion-grid:v0.1.2-alpha-34-gb46378c The image for grid suggestion.
// @optionalParam suggestionHyperbandImage string gcr.io/kubeflow-images-public/katib/suggestion-hyperband:v0.1.2-alpha-34-gb46378c The image for grid suggestion.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked this image exists
gcr.io/kubeflow-images-public/katib/suggestion-hyperband:v0.1.2-alpha-34-gb46378c

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK. This image does exist.
But, the version of bayesianoptimization suggestion image does not work.

I will fire another PR to latest version.

// @optionalParam suggestionBayesianOptimizationImage string gcr.io/kubeflow-images-public/katib/suggestion-bayesianoptimization:v0.1.2-alpha-34-gb46378c The image for grid suggestion.
// @optionalParam vizierCoreImage string gcr.io/kubeflow-images-public/katib/vizier-core:v0.1.2-alpha-34-gb46378c The image for vizier core.
// @optionalParam vizierDbImage string mysql:8.0.3 The image for vizier db.
// @optionalParam studyJobControllerImage string katib/studyjob-controller The image for studyjob-controller.
Expand Down
136 changes: 136 additions & 0 deletions kubeflow/katib/suggestion.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
$.parts(params, namespace).randomDeployment,
$.parts(params, namespace).gridService,
$.parts(params, namespace).gridDeployment,
$.parts(params, namespace).hyperbandService,
$.parts(params, namespace).hyperbandDeployment,
$.parts(params, namespace).bayesianoptimizationService,
$.parts(params, namespace).bayesianoptimizationDeployment,
],

parts(params, namespace):: {
Expand Down Expand Up @@ -140,5 +144,137 @@
},
}, // gridDeployment

hyperbandService: {
apiVersion: "v1",
kind: "Service",
metadata: {
labels: {
app: "vizier",
component: "suggestion-hyperband",
},
name: "vizier-suggestion-hyperband",
namespace: namespace,
},
spec: {
ports: [
{
name: "api",
port: 6789,
protocol: "TCP",
},
],
selector: {
app: "vizier",
component: "suggestion-hyperband",
},
type: "ClusterIP",
},
}, // hyperbandService

hyperbandDeployment: {
apiVersion: "extensions/v1beta1",
kind: "Deployment",
metadata: {
labels: {
app: "vizier",
component: "suggestion-hyperband",
},
name: "vizier-suggestion-hyperband",
namespace: namespace,
},
spec: {
replicas: 1,
template: {
metadata: {
labels: {
app: "vizier",
component: "suggestion-hyperband",
},
name: "vizier-suggestion-hyperband",
},
spec: {
containers: [
{
image: params.suggestionHyperbandImage,
name: "vizier-suggestion-hyperband",
ports: [
{
containerPort: 6789,
name: "api",
},
],
},
],
},
},
},
}, // hyperbandDeployment

bayesianoptimizationService: {
apiVersion: "v1",
kind: "Service",
metadata: {
labels: {
app: "vizier",
component: "suggestion-bayesianoptimization",
},
name: "vizier-suggestion-bayesianoptimization",
namespace: namespace,
},
spec: {
ports: [
{
name: "api",
port: 6789,
protocol: "TCP",
},
],
selector: {
app: "vizier",
component: "suggestion-bayesianoptimization",
},
type: "ClusterIP",
},
}, // bayesianoptimizationService

bayesianoptimizationDeployment: {
apiVersion: "extensions/v1beta1",
kind: "Deployment",
metadata: {
labels: {
app: "vizier",
component: "suggestion-bayesianoptimization",
},
name: "vizier-suggestion-bayesianoptimization",
namespace: namespace,
},
spec: {
replicas: 1,
template: {
metadata: {
labels: {
app: "vizier",
component: "suggestion-bayesianoptimization",
},
name: "vizier-suggestion-bayesianoptimization",
},
spec: {
containers: [
{
image: params.suggestionBayesianOptimizationImage,
name: "vizier-suggestion-bayesianoptimization",
ports: [
{
containerPort: 6789,
name: "api",
},
],
},
],
},
},
},
}, // bayesianoptimizationDeployment

}, // parts
}
8 changes: 5 additions & 3 deletions releasing/update_katib_ksonnet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ export PYTHONPATH=${PYTHONPATH}:${ROOT_DIR}/../git_kubeflow-testing/py
RELEASE=v0.1.2-alpha-34-gb46378c

VALUES="modeldbFrontendImage=gcr.io/kubeflow-images-public/katib/katib-frontend:${RELEASE}"
VALUES="${VALUES},suggestionRandomImage=gcr.io/kubeflow-images-public/katib/katib-suggestion-random:${RELEASE}"
VALUES="${VALUES},suggestionGridImage=gcr.io/kubeflow-images-public/katib/katib-suggestion-grid:${RELEASE}"
VALUES="${VALUES},vizierCoreImage=gcr.io/kubeflow-images-public/katib/katib-vizier-core:${RELEASE}"
VALUES="${VALUES},suggestionRandomImage=gcr.io/kubeflow-images-public/katib/suggestion-random:${RELEASE}"
VALUES="${VALUES},suggestionGridImage=gcr.io/kubeflow-images-public/katib/suggestion-grid:${RELEASE}"
VALUES="${VALUES},suggestionHyperbandImage=gcr.io/kubeflow-images-public/katib/suggestion-hyperband:${RELEASE}"
VALUES="${VALUES},suggestionBayesianOptimizationImage=gcr.io/kubeflow-images-public/katib/suggestion-bayesianoptimization:${RELEASE}"
VALUES="${VALUES},vizierCoreImage=gcr.io/kubeflow-images-public/katib/vizier-core:${RELEASE}"
# Update the TFJob operator image
python ${ROOT_DIR}/scripts/update_prototype.py \
--file=${ROOT_DIR}/kubeflow/katib/prototypes/all.jsonnet \
Expand Down