Automated cherry pick of #47986 #47152 #47860 #47945 #47961 #47986 #47993 #48012 #48085#48146
Merged
Conversation
Signed-off-by: sakeven <jc5930@sina.cn>
…'t mix setting the non-masq-cidr with enabling the addon.
Contributor
Author
|
/release-note-none |
Member
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: caesarxuchao, dchen1107 Associated issue: 47986 The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
|
Automatic merge from submit-queue |
Member
|
/lgtm |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry pick of #47986 #47152 #47860 #47945 #47961 #47986 #47993 #48012 #48085 on release-1.7.
#47986: Change service port to avoid collision
#47152: Kubelet doesn't override addrs from Cloud provider
#47860: Make fluentd log to stdio instead of a dedicated file
#47945: add level for print flags
#47961: Bumped Heapster to v1.4.0-beta.0
#47986: Change service port to avoid collision
#47993: Use a different env var to enable the ip-masq-agent addon. We
#48012: Extending timeout waiting for delete node to become ready
#48085: Move iptables logging in kubeproxy from Errorf to V(2).Infof