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

Jump to bottom

Return the current kubeconfig as the starting config in ClientConfigGetter. #30940

Merged
merged 1 commit into from Aug 21, 2016
Merged

Return the current kubeconfig as the starting config in ClientConfigGetter. #30940

merged 1 commit into from Aug 21, 2016

Conversation

madhusudancs
Copy link
Contributor

@madhusudancs madhusudancs commented Aug 18, 2016 •
edited

This fixes issue #30790.

Fixes the panic that occurs in the federation controller manager when registering a GKE cluster to the federation. Fixes issue #30790.

cc @kubernetes/sig-cluster-federation

This change is Reviewable

@madhusudancs madhusudancs added area/cluster-federation release-note-none Denotes a PR that doesn't merit a release note. labels Aug 18, 2016
@madhusudancs madhusudancs added this to the v1.4 milestone Aug 18, 2016
@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 18, 2016
@k8s-bot
Copy link

k8s-bot commented Aug 18, 2016

GCE e2e build/test passed for commit 2b5d689.

@k8s-github-robot k8s-github-robot mentioned this pull request Aug 18, 2016
Closed
@ghost ghost added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Aug 19, 2016
@nikhiljindal
Copy link
Contributor

LGTM, thanks

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

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Aug 21, 2016

GCE e2e build/test passed for commit 2b5d689.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit db777bb into kubernetes:master Aug 21, 2016
@smarterclayton
Copy link
Contributor

@deads2k for awareness of changes to kubectl clientcmd config loading

@madhusudancs madhusudancs modified the milestones: v1.3, v1.4 Aug 26, 2016
@madhusudancs madhusudancs mentioned this pull request Aug 26, 2016
Merged
@madhusudancs madhusudancs added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Aug 26, 2016
k8s-github-robot pushed a commit that referenced this pull request Sep 8, 2016
Merge pull request #31483 from madhusudancs/automated-cherry-pick-of-…
3f8c29c 
…#30940-upstream-release-1.3

Automatic merge from submit-queue

Automated cherry pick of #30940

Cherry pick of #30940 on release-1.3.
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.3" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
Merge pull request kubernetes#31483 from madhusudancs/automated-cherr…
cff9f98 
…y-pick-of-#30940-upstream-release-1.3

Automatic merge from submit-queue

Automated cherry pick of kubernetes#30940

Cherry pick of kubernetes#30940 on release-1.3.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cjcullen cjcullen

@nikhiljindal nikhiljindal

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.

None yet
8 participants
@madhusudancs @k8s-bot @nikhiljindal @k8s-github-robot @smarterclayton @k8s-cherrypick-bot @googlebot @cjcullen