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.

Sign up for GitHub

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

UPSTREAM: 64860:checkLimitsForResolvConf for the pod create and update events instead of checking period #20070

Merged
merged 1 commit into from
Jul 25, 2018
Merged

UPSTREAM: 64860:checkLimitsForResolvConf for the pod create and update events instead of checking period #20070

merged 1 commit into from
Jul 25, 2018

Conversation

ravisantoshgudimetla
Copy link
Contributor

@ravisantoshgudimetla ravisantoshgudimetla commented Jun 22, 2018 •
edited

This fixes the frequent checking for resolv.conf entries on kubelet side.

xref: https://bugzilla.redhat.com/show_bug.cgi?id=1569137

Upstream PR: kubernetes/kubernetes#64860

/cc @derekwaynecarr

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 22, 2018
@ravisantoshgudimetla
Copy link
Contributor Author

/hold

Till the PR merges upstream

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 22, 2018
@ravisantoshgudimetla
Copy link
Contributor Author

ravisantoshgudimetla commented Jun 22, 2018 •
edited

/hold cancel

The upstream PR got merged.

@ravisantoshgudimetla
Copy link
Contributor Author

/retest

@ravisantoshgudimetla
Copy link
Contributor Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 23, 2018
@ravisantoshgudimetla
Copy link
Contributor Author

/retest

1 similar comment
@ravisantoshgudimetla
Copy link
Contributor Author

/retest

@ravisantoshgudimetla
Copy link
Contributor Author

/retest

@sjenning
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 25, 2018
@sjenning
Copy link
Contributor

/assign @derekwaynecarr

@derekwaynecarr
Copy link
Member

/approve

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 27, 2018
@derekwaynecarr
Copy link
Member

/cherrypick release-3.10

@openshift-cherrypick-robot
Copy link

@derekwaynecarr: once the present PR merges, I will cherry-pick it on top of release-3.10 in a new PR and assign it to you.

In response to this:

/cherrypick release-3.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 28, 2018
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 25, 2018
@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 25, 2018
@sjenning
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 25, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, ravisantoshgudimetla, sjenning

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ravisantoshgudimetla
Copy link
Contributor Author

/retest

@openshift-merge-robot openshift-merge-robot merged commit deab162 into openshift:master Jul 25, 2018
@openshift-cherrypick-robot
Copy link

@derekwaynecarr: #20070 failed to apply on top of branch "release-3.10":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go
M	vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_test.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_test.go
CONFLICT (content): Merge conflict in vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_test.go
Auto-merging vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go
Patch failed at 0001 UPSTREAM: 64860:checkLimitsForResolvConf for the pod create and update events instead of checking period

In response to this:

/cherrypick release-3.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@sjenning
Copy link
Contributor

@ravisantoshgudimetla the automated cherry-pick failed. Can you pick this back to the Origin release-1.10 branch? It will be picked up by OSE automatically from there.

@ravisantoshgudimetla
Copy link
Contributor Author

Yes, I will look into it. Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@derekwaynecarr derekwaynecarr Awaiting requested review from derekwaynecarr

Assignees

@sjenning sjenning

@derekwaynecarr derekwaynecarr

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@ravisantoshgudimetla @sjenning @derekwaynecarr @openshift-cherrypick-robot @openshift-ci-robot @openshift-bot @openshift-merge-robot