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

Reflect kubeadm-specific kubelet changes in the bazel debs #48042

Merged
merged 1 commit into from
Jun 27, 2017

Conversation

luxas
Copy link
Member

@luxas luxas commented Jun 26, 2017

What this PR does / why we need it:

Sync this file with the one in kubernetes/release

cc @pipejakob @mikedanese @ixdy

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #

Fixes: kubernetes/kubeadm#321

Special notes for your reviewer:

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 26, 2017
@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-none Denotes a PR that doesn't merit a release note. labels Jun 26, 2017
@luxas
Copy link
Member Author

luxas commented Jun 26, 2017

/test pull-kubernetes-e2e-kubeadm-gce

@mikedanese
Copy link
Member

Please link to PR in release.

@luxas
Copy link
Member Author

luxas commented Jun 27, 2017

@mikedanese The real PR is here: kubernetes/release#356

Also noticed that it wasn't generally up-to-date, the --authorization-mode=Webhook --client-ca-file=/etc/kubernetes/pki/ca.crt flags were missing (which I think are crucial, since they enable secure master<->node communication)

Anyway, I'd like to merge this now so we can see how the e2e reacts. If everything's fine, we have confidence in the real PR as well.

If we had the presubmit thing we wouldn't have to merge first, but... let's proceed.

Can I add LGTM on this or will you?

@mikedanese
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 27, 2017
@dchen1107 dchen1107 added this to the v1.7 milestone Jun 27, 2017
@dchen1107 dchen1107 added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate labels Jun 27, 2017
@dchen1107
Copy link
Member

/lgtm

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

No associated issue. Update pull-request body to add a reference to an issue, or get approval with /approve no-issue

The full list of commands accepted by this bot can be found here.

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

@luxas luxas added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 27, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 48139, 48042, 47645, 48054, 48003)

@k8s-github-robot k8s-github-robot merged commit 51c43ed into kubernetes:master Jun 27, 2017
k8s-github-robot pushed a commit that referenced this pull request Jun 28, 2017
…#48139-#48049-#48042-upstream-release-1.7

Automatic merge from submit-queue

Automated cherry pick of #48139 #48049 #48042

Cherry pick of #48139 #48049 #48042 on release-1.7.

#48139: Fix fluentd-gcp configuration to facilitate JSON parsing
#48049: kubeadm: Make kube-proxy RollingUpgradeable
#48042: Reflect kubeadm-specific kubelet changes in the bazel debs
@k8s-cherrypick-bot
Copy link

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

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-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.

cAdvisor shouldn't be publicly exposed by default
7 participants