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

AWS kube-up: export kube_user to salt #29428

Merged
merged 1 commit into from
Jul 22, 2016
Merged

AWS kube-up: export kube_user to salt #29428

merged 1 commit into from
Jul 22, 2016

Conversation

justinsb
Copy link
Member

This was done for GCE in #29164, but not for AWS.

Fixes #29424

@justinsb
AWS kube-up: export kube_user to salt
55d0d3b 
This was done for GCE in kubernetes#29164, but not for AWS.

Fixes kubernetes#29424
@justinsb justinsb added the release-note-none Denotes a PR that doesn't merit a release note. label Jul 22, 2016
@justinsb
Copy link
Member Author

cc @cjcullen

@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 22, 2016
@roberthbailey roberthbailey added lgtm "Looks good to me", indicates that a PR is ready to be merged. cherrypick-candidate labels Jul 22, 2016
@roberthbailey
Copy link
Contributor

We should cherry pick this into the 1.3 branch once #29393 has merged (before 1.3.4).

@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@roberthbailey roberthbailey added this to the v1.3 milestone Jul 22, 2016
@justinsb
Copy link
Member Author

Oh and I was so happy that I didn't think it needed cherry picking :-(

Pretty sure this is right, but obviously we should scrutinize it all the more closely if it's going to hit the released branch so soon.

Also might this affect other clouds?

{% if grains['cloud'] is defined and grains.cloud in ['aws', 'gce', 'vagrant', 'vsphere', 'photon-controller', 'openstack'] %}

@k8s-bot
Copy link

k8s-bot commented Jul 22, 2016

GCE e2e build/test passed for commit 55d0d3b.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 33f96bb into kubernetes:master Jul 22, 2016
@cjcullen cjcullen mentioned this pull request Jul 22, 2016
Merged
@cjcullen
Copy link
Member

Good catch on the other cloud providers!

I just opened up #29475

@justinsb justinsb mentioned this pull request Jul 23, 2016
Merged
@justinsb
Copy link
Member Author

Created cherry pick #29428

k8s-github-robot pushed a commit that referenced this pull request Jul 23, 2016
Merge pull request #29475 from cjcullen/customuser
d173428 
Automatic merge from submit-queue

export KUBE_USER to salt (support custom usernames) for vagrant, vsph…

GCE/GKE were handled in #29164, AWS was handled in #29428. This should cover the rest of the configurations that use ABAC.
@fabioy fabioy added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jul 24, 2016
fabioy added a commit that referenced this pull request Jul 26, 2016
@fabioy
Merge pull request #29487 from justinsb/automated-cherry-pick-of-#294…
2316256 
…28-origin-release-1.3

Automated cherry pick of #29428
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@fabioy
Merge pull request kubernetes#29487 from justinsb/automated-cherry-pi…
d01a5c9 
…ck-of-#29428-origin-release-1.3

Automated cherry pick of kubernetes#29428
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@roberthbailey roberthbailey

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.3
Development

Successfully merging this pull request may close these issues.
9 participants
@justinsb @roberthbailey @k8s-cherrypick-bot @k8s-bot @k8s-github-robot @cjcullen @googlebot @fabioy @wojtek-t