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

OCPBUGS-43764: Revendor to a patched k/k with our prefer-local-DNS hack #638

Merged
merged 1 commit into from
Oct 24, 2024

Conversation

danwinship
Copy link
Contributor

Apparently IBM was relying on this behavior in the standalone kube-proxy image.

(This also updates from k8s v1.30.3 to v1.30.5, which pulls in some irrelevant changes, and probably I should have just stuck with 1.30.3 to keep it simple but whatever. Anyway, the relevant change is in vendor/k8s.io/kubernetes/pkg/proxy/iptables/proxier.go.)

The replace stuff in go.mod is just taken from the 4.16 branch. I had simplified things when rebasing to 1.30 for 4.17 because we weren't going to be keeping local patches any more, but now we are again, so...

(Also updates from v1.30.3 to v1.30.5.)
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Oct 23, 2024
@openshift-ci-robot
Copy link
Contributor

@danwinship: This pull request references Jira Issue OCPBUGS-43764, which is invalid:

  • expected the bug to target the "4.18.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Apparently IBM was relying on this behavior in the standalone kube-proxy image.

(This also updates from k8s v1.30.3 to v1.30.5, which pulls in some irrelevant changes, and probably I should have just stuck with 1.30.3 to keep it simple but whatever. Anyway, the relevant change is in vendor/k8s.io/kubernetes/pkg/proxy/iptables/proxier.go.)

The replace stuff in go.mod is just taken from the 4.16 branch. I had simplified things when rebasing to 1.30 for 4.17 because we weren't going to be keeping local patches any more, but now we are again, so...

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Oct 23, 2024
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 23, 2024
@danwinship
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 23, 2024
@openshift-ci-robot
Copy link
Contributor

@danwinship: This pull request references Jira Issue OCPBUGS-43764, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.0) matches configured target version for branch (4.18.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @zhaozhanqi

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@danwinship
Copy link
Contributor Author

/override ci/prow/unit
/override ci/prow/verify

openshift/sdn CI is broken on master

Copy link
Contributor

openshift-ci bot commented Oct 24, 2024

@danwinship: Overrode contexts on behalf of danwinship: ci/prow/unit, ci/prow/verify

In response to this:

/override ci/prow/unit
/override ci/prow/verify

openshift/sdn CI is broken on master

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-sigs/prow repository.

Copy link
Contributor

openshift-ci bot commented Oct 24, 2024

@danwinship: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/security 44c7965 link false /test security

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

@kyrtapz
Copy link
Contributor

kyrtapz commented Oct 24, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 24, 2024
Copy link
Contributor

openshift-ci bot commented Oct 24, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danwinship, kyrtapz

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

@openshift-merge-bot openshift-merge-bot bot merged commit 18a57d7 into openshift:master Oct 24, 2024
5 of 6 checks passed
@openshift-ci-robot
Copy link
Contributor

@danwinship: Jira Issue OCPBUGS-43764: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-43764 has been moved to the MODIFIED state.

In response to this:

Apparently IBM was relying on this behavior in the standalone kube-proxy image.

(This also updates from k8s v1.30.3 to v1.30.5, which pulls in some irrelevant changes, and probably I should have just stuck with 1.30.3 to keep it simple but whatever. Anyway, the relevant change is in vendor/k8s.io/kubernetes/pkg/proxy/iptables/proxier.go.)

The replace stuff in go.mod is just taken from the 4.16 branch. I had simplified things when rebasing to 1.30 for 4.17 because we weren't going to be keeping local patches any more, but now we are again, so...

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 openshift-eng/jira-lifecycle-plugin repository.

@danwinship danwinship deleted the dns-hack-4.17 branch October 24, 2024 18:52
@danwinship
Copy link
Contributor Author

/cherry-pick release-4.17

@openshift-cherrypick-robot

@danwinship: new pull request created: #640

In response to this:

/cherry-pick release-4.17

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-sigs/prow repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: kube-proxy
This PR has been included in build kube-proxy-container-v4.18.0-202410241142.p0.g18a57d7.assembly.stream.el9.
All builds following this will include this PR.

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. jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants