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

Fix kubemark image-registry name assignment #62539

Merged
merged 1 commit into from
Apr 16, 2018
Merged

Fix kubemark image-registry name assignment #62539

merged 1 commit into from
Apr 16, 2018

Conversation

krzysied
Copy link
Contributor

Allows to create kubemark instance without explicitly specifying the project name.
start-kubemark.sh used to not run properly when using project name acquired from the cloud provider.

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 13, 2018
shyamjvs
shyamjvs reviewed Apr 13, 2018
View reviewed changes
test/kubemark/cloud-provider-config.sh Outdated
@@ -17,5 +17,5 @@
CLOUD_PROVIDER="${CLOUD_PROVIDER:-gce}"
CONTAINER_REGISTRY="${CONTAINER_REGISTRY:-gcr.io}"
PROJECT="${PROJECT:-}"
FULL_REGISTRY="${CONTAINER_REGISTRY}/${PROJECT}"
FULL_REGISTRY="${FULL_REGISTRY:-}"
Copy link
Member

Choose a reason for hiding this comment

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

Could you maybe rename this variable to KUBEMARK_IMAGE_REGISTRY to be more explicit?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

shyamjvs
shyamjvs reviewed Apr 13, 2018
View reviewed changes
test/kubemark/start-kubemark.sh Outdated
@@ -207,6 +207,9 @@ function create-and-upload-hollow-node-image {
CURR_DIR=`pwd`
cd "${MAKE_DIR}"
RETRIES=3
if [[ -z "${FULL_REGISTRY-}" ]]; then
Copy link
Member

Choose a reason for hiding this comment

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

I guess you can replace this whole if statement with sth like FULL_REGISTRY="${FULL_REGISTRY:-$CONTAINER_REGISTRY/..}"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@shyamjvs
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 13, 2018
@shyamjvs
Copy link
Member

Also I would suggest having more descriptive PR title. For e.g "Fix kubemark image-registry name assignment"

@krzysied krzysied force-pushed the kubemark_img_repo_fix branch from 4e5b455 to b8b0ee2 Compare April 13, 2018 14:37
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 13, 2018
@krzysied krzysied force-pushed the kubemark_img_repo_fix branch from b8b0ee2 to afc3bef Compare April 13, 2018 14:49
@krzysied krzysied changed the title Fixing FULL_REGISTRY assignment Fix kubemark image-registry name assignment Apr 13, 2018
@krzysied
Copy link
Contributor Author

/retest

1 similar comment
@krzysied
Copy link
Contributor Author

/retest

@shyamjvs
Copy link
Member

/lgtm

Thanks!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 16, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: krzysied, shyamjvs

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 16, 2018
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 62407, 62602, 62539, 62639, 62647). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit c47b147 into kubernetes:master Apr 16, 2018
@krzysied krzysied deleted the kubemark_img_repo_fix branch April 16, 2018 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shyamjvs shyamjvs shyamjvs left review comments

@wojtek-t wojtek-t Awaiting requested review from wojtek-t

Assignees

@shyamjvs shyamjvs

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@krzysied @shyamjvs @k8s-ci-robot @k8s-github-robot