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

SDN-3635: OSDN kube 1.26.0 rebase #504

Merged
merged 3 commits into from Feb 15, 2023
Merged

SDN-3635: OSDN kube 1.26.0 rebase #504

merged 3 commits into from Feb 15, 2023

Conversation

msherif1234
Copy link
Contributor

No description provided.

@msherif1234
Copy link
Contributor Author

/payload 4.13 ci blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 11, 2023

@msherif1234: trigger 4 job(s) of type blocking for the ci release of OCP 4.13

  • periodic-ci-openshift-release-master-ci-4.13-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-azure-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-e2e-aws-sdn-serial

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/46b253f0-aa24-11ed-97e9-825d6152f9ce-0

@msherif1234
Copy link
Contributor Author

/assign @danwinship

@msherif1234 msherif1234 changed the title SDN rebase kube 1.26.0 SDN kube 1.26.0 rebase Feb 12, 2023
danwinship
danwinship reviewed Feb 12, 2023
View reviewed changes
Copy link
Contributor

@danwinship danwinship left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, just nitpicks

pkg/cmd/openshift-sdn-node/kube_proxy.go Outdated Show resolved Hide resolved
pkg/cmd/openshift-sdn-node/kube_proxy.go Outdated Show resolved Hide resolved
pkg/cmd/openshift-sdn-node/kube_proxy.go Outdated Show resolved Hide resolved
pkg/cmd/openshift-sdn-node/proxy.go Outdated Show resolved Hide resolved
pkg/network/node/node.go Show resolved Hide resolved
pkg/network/node/runtime.go Outdated Show resolved Hide resolved
go.mod Show resolved Hide resolved
pkg/cmd/openshift-sdn-node/kube_proxy.go Outdated Show resolved Hide resolved
@ricky-rav @msherif1234
Rebase against 1.26 kubernetes
bdb787f 
Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
@msherif1234 msherif1234 force-pushed the reset-k8s-update branch 2 times, most recently from a6ba361 to 1479ee6 Compare February 12, 2023 15:19
@msherif1234
Copy link
Contributor Author

/payload 4.13 ci blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 12, 2023

@msherif1234: trigger 4 job(s) of type blocking for the ci release of OCP 4.13

  • periodic-ci-openshift-release-master-ci-4.13-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-azure-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-e2e-aws-sdn-serial

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/ed56b290-aae8-11ed-8848-e0bff74b4d46-0

@msherif1234 msherif1234 requested review from danwinship and removed request for tssurya and trozet February 12, 2023 15:22
@msherif1234
Copy link
Contributor Author

/retest

@msherif1234 msherif1234 force-pushed the reset-k8s-update branch 2 times, most recently from 78db0c8 to 17a3d16 Compare February 12, 2023 20:51
@msherif1234
Copy link
Contributor Author

/payload 4.13 ci blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 12, 2023

@msherif1234: trigger 4 job(s) of type blocking for the ci release of OCP 4.13

  • periodic-ci-openshift-release-master-ci-4.13-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-azure-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-e2e-aws-sdn-serial

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/409fb7c0-ab17-11ed-92e6-30a7c249d488-0

@msherif1234 msherif1234 changed the title SDN kube 1.26.0 rebase SDN-3635: OSDN kube 1.26.0 rebase Feb 13, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 13, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 13, 2023 •
edited by openshift-ci bot

@msherif1234: This pull request references SDN-3635 which is a valid jira issue.

In response to this:

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.

@msherif1234
Copy link
Contributor Author

/payload 4.13 ci blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 13, 2023

@msherif1234: trigger 4 job(s) of type blocking for the ci release of OCP 4.13

  • periodic-ci-openshift-release-master-ci-4.13-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-azure-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-e2e-aws-sdn-serial

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/98aa7b90-abc5-11ed-99ed-fe6091e436e2-0

@ricky-rav ricky-rav mentioned this pull request Feb 14, 2023
Closed
danwinship
danwinship reviewed Feb 14, 2023
View reviewed changes
pkg/cmd/openshift-sdn-node/kube_proxy.go Outdated Show resolved Hide resolved
pkg/cmd/openshift-sdn-node/kube_proxy.go Outdated Show resolved Hide resolved
pkg/network/node/node.go Outdated Show resolved Hide resolved
pkg/network/node/node.go Outdated Show resolved Hide resolved
@ricky-rav @msherif1234
Adjust to changes in upstream 1.26
c543c90 
Also, k8s.io/kubernetes/pkg/proxy/userspace was removed from 1.26 code base, so let's keep  "--proxy-mode userspace" for backwards compatibility, but let's make it use iptables instead.

Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
@msherif1234
Copy link
Contributor Author

/payload 4.13 ci blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 14, 2023

@msherif1234: trigger 4 job(s) of type blocking for the ci release of OCP 4.13

  • periodic-ci-openshift-release-master-ci-4.13-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-azure-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-e2e-aws-sdn-serial

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/6d54e290-ac89-11ed-9c23-cb1d9ec746bd-0

@msherif1234
Bump ruleVersion because userspace and multitenant needs conntrack-aw…
219140a 
…are flows

Signed-off-by: Mohamed Mahmoud <mmahmoud@redhat.com>
@msherif1234
Copy link
Contributor Author

/payload 4.13 ci blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 14, 2023

@msherif1234: trigger 4 job(s) of type blocking for the ci release of OCP 4.13

  • periodic-ci-openshift-release-master-ci-4.13-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-azure-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-e2e-aws-sdn-serial

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/9e1acb40-aca9-11ed-9be2-aa2f77dfb3b6-0

@danwinship
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 15, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 15, 2023

[APPROVALNOTIFIER] This PR is APPROVED

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

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 15, 2023
@openshift-merge-robot openshift-merge-robot merged commit f2ff994 into openshift:master Feb 15, 2023
@neisw neisw mentioned this pull request Feb 18, 2023
Merged
@danwinship danwinship mentioned this pull request Feb 21, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danwinship danwinship Awaiting requested review from danwinship

Assignees

@danwinship danwinship

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@msherif1234 @openshift-ci-robot @danwinship @openshift-merge-robot @ricky-rav