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

Automated cherry pick of #44570 #44862 #44901

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Apr 25, 2017

Cherry pick of #44570 #44862 on release-1.5.

#44570: Explicit namespace from kubeconfig should override in-cluster
#44862: Stop treating in-cluster-config namespace as an override

@k8s-reviewable
Copy link

This change is Reviewable

@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Apr 25, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 25, 2017
@liggitt
Copy link
Member Author

liggitt commented Apr 25, 2017

if we cut another 1.5 release, this would be good to include.

unfortunately, the supporting test code for extracting kubectl and injecting it into a test pod didn't exist in 1.5, so the in-cluster-config tests can't pick back to 1.5 easily

@smarterclayton
Copy link
Contributor

Lgtm wrt backport. Up to release manager, but agree that getting this straightened out so people aren't broken on upgrade is a good plan

@mwielgus
Copy link
Contributor

@liggitt Did you test it manually on 1.5?

@pieterlange
Copy link

pieterlange commented Apr 26, 2017

I just cherrypicked both commits into v1.5.7-beta0 and built kubectl manually.

Running this kubectl build in-pod:

/ # /usr/local/bin/kubectl version
Client Version: version.Info{Major:"1", Minor:"5+", GitVersion:"v1.5.7-beta.0.2+2f9aaeda2ccb5c-dirty", GitCommit:"2f9aaeda2ccb5ca77684973bfbb3e7d8abbcb46a", GitTreeState:"dirty", BuildDate:"2017-04-26T10:38:13Z", GoVersion:"go1.7.4", Compiler:"gc", Platform:"linux/amd64"}
Server Version: version.Info{Major:"1", Minor:"5", GitVersion:"v1.5.3+coreos.0", GitCommit:"8fc95b64d0fe1608d0f6c788eaad2c004f31e7b7", GitTreeState:"clean", BuildDate:"2017-02-15T19:52:15Z", GoVersion:"go1.7.4", Compiler:"gc", Platform:"linux/amd64"}
/ # kubectl apply -f /k8s/resources/debugger-rc.yaml 
error: the namespace from the provided object "staging" does not match the namespace "kube-system". You must pass '--namespace=staging' to perform this operation.

I'm still seeing the old behaviour, so this doesn't seem to be fixed..

//Edit
this seems to be more of a result of me not properly loading the changes from the client-go staging directory. Please ignore.

@pieterlange
Copy link

Verified this fixes the original issue on release-1.5.

/ # kubectl apply -f /k8s/resources/debugger-rc.yaml 
replicationcontroller "debugger" configured

I didn't run any other testsuites though.

@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 Apr 26, 2017
@liggitt
Copy link
Member Author

liggitt commented Apr 26, 2017

this seems to be more of a result of me not properly loading the changes from the client-go staging directory

actually, I didn't notice that there were still two copies of the client builder code in 1.5... fixed the version under pkg as well.

@pieterlange
Copy link

/bump so this gets picked up in 1.5.8 :(
@mwielgus @smarterclayton

@mwielgus
Copy link
Contributor

@pieterlange please get the lgtm + approve label to have it merged.

@pieterlange
Copy link

@smarterclayton @saad-ali Please review & apply lgtm label

@liggitt
Copy link
Member Author

liggitt commented May 15, 2017

I just ran manual tests and confirm this fixes both issues for 1.5

@liggitt liggitt added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels May 15, 2017
@smarterclayton
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 23, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, smarterclayton

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 23, 2017
@liggitt liggitt added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Jun 2, 2017
@liggitt
Copy link
Member Author

liggitt commented Jun 2, 2017

tagging per #44901 (comment) and #44901 (comment)

@liggitt
Copy link
Member Author

liggitt commented Jun 2, 2017

@k8s-bot pull-kubernetes-e2e-gce-etcd3 test this

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 1a11994 into kubernetes:release-1.5 Jun 5, 2017
@k8s-cherrypick-bot
Copy link

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

@liggitt liggitt deleted the automated-cherry-pick-of-#44570-#44862-upstream-release-1.5 branch February 15, 2019 03:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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 Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet