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

make kubeadm default to stable-1.6 #44101

Merged
merged 1 commit into from
Apr 5, 2017

Conversation

mikedanese
Copy link
Member

No description provided.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 5, 2017
@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Apr 5, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@krousey
Copy link
Contributor

krousey commented Apr 5, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 5, 2017
@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Apr 5, 2017
@luxas
Copy link
Member

luxas commented Apr 5, 2017

Hmm, why is this targeted at master? I'd expect this to be cherrypicked to the release-1.6 branch.
What's your intention here?

Code itself
/lgtm

@luxas luxas added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. release-note-label-needed labels Apr 5, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: krousey, luxas, mikedanese

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

@mikedanese
Copy link
Member Author

@luxas we want both.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 577a0e8 into kubernetes:master Apr 5, 2017
@mikedanese mikedanese deleted the kubeadm-default branch April 5, 2017 18:26
k8s-github-robot pushed a commit that referenced this pull request Apr 5, 2017
…3999-#44101-release-1.6

Automatic merge from submit-queue

Automated cherry pick of #43999 #44101 release 1.6

Automated cherry pick of #43999 #44101 release 1.6

```release-note
kubeadm: Remove hard-coded default version when fetching stable version from the web fails. Fixes [kubeadm 1.6.1 deploying 1.6.0 control plane](kubernetes/kubeadm#224).
```
mintzhao pushed a commit to mintzhao/kubernetes that referenced this pull request Jun 1, 2017
…pick-of-#43999-kubernetes#44101-release-1.6

Automatic merge from submit-queue

Automated cherry pick of kubernetes#43999 kubernetes#44101 release 1.6

Automated cherry pick of kubernetes#43999 kubernetes#44101 release 1.6

```release-note
kubeadm: Remove hard-coded default version when fetching stable version from the web fails. Fixes [kubeadm 1.6.1 deploying 1.6.0 control plane](kubernetes/kubeadm#224).
```
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. 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants