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

Update docker and docker-multinode docs on master to require 1.2.x #19929

Merged
merged 1 commit into from
Jan 31, 2016
Merged

Update docker and docker-multinode docs on master to require 1.2.x #19929

merged 1 commit into from
Jan 31, 2016
+32 −21

Conversation

luxas
Copy link
Member

@luxas luxas commented Jan 21, 2016

Proposed fix for: #19227

Full comment here

But the easiest way to solve this, is to update the hyperkube version to v1.2.0-alpha.6 which is pushed thanks to #19061, then everything except for default ServiceAccounts combined with docker-multinode should work. And that will be fixed in #17213 => v1.2.0-alpha.7

@brendandburns @ihmccreery @fgrzadkowski @david-mcmahon @borg286

@k8s-bot
Copy link

k8s-bot commented Jan 21, 2016

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

1 similar comment
@k8s-bot
Copy link

k8s-bot commented Jan 21, 2016

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

@k8s-github-robot k8s-github-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 21, 2016
@k8s-github-robot
Copy link

Labelling this PR as size/S

@luxas
Copy link
Member Author

luxas commented Jan 24, 2016

Wait a minute, I'll update the PR: s/hyperkube/hyperkube-amd64/g, so it works

@luxas luxas mentioned this pull request Jan 27, 2016
Closed
@luxas luxas force-pushed the fix_hyperkube_version branch from 93db91f to 5e7e689 Compare January 27, 2016 21:21
@k8s-github-robot
Copy link

Labelling this PR as size/M

@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 27, 2016
@luxas
Copy link
Member Author

luxas commented Jan 27, 2016

@thockin We'll have to wait for #20235 before merging this patch. It works, but right now only with 1.2.0-alpha.6 and 1.1.2. Someone have to push all images > 1.0.1 for hyperkube-amd64 too

@luxas luxas changed the title Update docker and docker-multinode docs on master to require 1.2.x WIP: Update docker and docker-multinode docs on master to require 1.2.x Jan 27, 2016
@thockin
Copy link
Member

thockin commented Jan 28, 2016

Does someone else have bandwidth to review this? I am buried this week...

@k8s-bot
Copy link

k8s-bot commented Jan 28, 2016

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

1 similar comment
@k8s-bot
Copy link

k8s-bot commented Jan 28, 2016

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

@luxas
Copy link
Member Author

luxas commented Jan 29, 2016

Maybe @bgrant0607 can take it?
Images in #20235 have to be pushed, then this PR can be merged

@thockin
Copy link
Member

thockin commented Jan 29, 2016

If there's anyone more behind than me it's probably Brian or Brendan. If
nobody steps up on this, one of us will get around to it soon. Sorry.

On Thu, Jan 28, 2016 at 9:29 PM, Lucas Käldström notifications@github.com
wrote:

Maybe @bgrant0607 https://github.com/bgrant0607 can take it?
Images in #20235 #20235
have to be pushed, then this PR can be merged

—
Reply to this email directly or view it on GitHub
#19929 (comment)
.

@bgrant0607
Copy link
Member

We really need to automatically substitute all of these release numbers every time we cut a release.

cc @david-mcmahon

@bgrant0607
Copy link
Member

I'm fine with updating these to the latest 1.2 alpha release for now. Let's use #16087 for the automatic updates.

@bgrant0607 bgrant0607 assigned fgrzadkowski and unassigned thockin Jan 29, 2016
bgrant0607
bgrant0607 reviewed Jan 29, 2016
View reviewed changes
docs/getting-started-guides/docker.md
([OS X](http://storage.googleapis.com/kubernetes-release/release/v1.1.1/bin/darwin/amd64/kubectl))
([linux](http://storage.googleapis.com/kubernetes-release/release/v1.1.1/bin/linux/amd64/kubectl))
([OS X](http://storage.googleapis.com/kubernetes-release/release/v1.1.3/bin/darwin/amd64/kubectl))
([linux](http://storage.googleapis.com/kubernetes-release/release/v1.1.3/bin/linux/amd64/kubectl))
Copy link
Member

Choose a reason for hiding this comment

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

Why isn't kubectl from a 1.2 release also?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oops, forgot it... Will fix
I'll add the other client platforms at the same time (e.g. linux/arm, windows/amd64 and such)

@luxas luxas force-pushed the fix_hyperkube_version branch from 5e7e689 to 0b8701f Compare January 29, 2016 17:36
@luxas
Copy link
Member Author

luxas commented Jan 29, 2016

@bgrant0607 @fgrzadkowski Fixed. It's made clear that the version have to be >= 1.2.0-alpha.6 for the docs to work. And that's how it is. The hyperkube-amd64 image is only pushed for 1.2.0-alpha.6 and 1.1.2. But it will push automatically since @fgrzadkowski patch.

Ready to merge?

@luxas luxas changed the title WIP: Update docker and docker-multinode docs on master to require 1.2.x Update docker and docker-multinode docs on master to require 1.2.x Jan 29, 2016
bgrant0607
bgrant0607 reviewed Jan 29, 2016
View reviewed changes
docs/getting-started-guides/docker-multinode/master.md
@@ -204,7 +204,7 @@ sudo docker run \
--privileged=true \
--pid=host \
-d \
gcr.io/google_containers/hyperkube:v${K8S_VERSION} \
gcr.io/google_containers/hyperkube-amd64:v${K8S_VERSION} \
Copy link
Member

Choose a reason for hiding this comment

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

There are still some links not updated below.

@luxas luxas force-pushed the fix_hyperkube_version branch from 0b8701f to 75e8c3f Compare January 29, 2016 21:02
@luxas
Copy link
Member Author

luxas commented Jan 29, 2016

Fixed the comment. We need to get these values automatically replaced and docs harmonized with each other.
@bgrant0607 @fgrzadkowski PTAL

@bgrant0607
Copy link
Member

LGTM, thanks

@bgrant0607 bgrant0607 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 29, 2016
@k8s-github-robot
Copy link

@k8s-bot ok to test
@k8s-bot test this

pr builder appears to be missing, activating due to 'lgtm' label.

@k8s-bot
Copy link

k8s-bot commented Jan 29, 2016

GCE e2e test build/test passed for commit 75e8c3f.

@k8s-github-robot
Copy link

The author of this PR is not in the whitelist for merge, can one of the admins add the 'ok-to-merge' label?

a-robinson added a commit that referenced this pull request Jan 31, 2016
@a-robinson
Merge pull request #19929 from luxas/fix_hyperkube_version
52cc7d9 
Update docker and docker-multinode docs on master to require 1.2.x
@a-robinson a-robinson merged commit 52cc7d9 into kubernetes:master Jan 31, 2016
@david-mcmahon david-mcmahon mentioned this pull request Feb 5, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@bgrant0607 bgrant0607

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@luxas @k8s-bot @k8s-github-robot @thockin @bgrant0607 @googlebot @a-robinson @fgrzadkowski