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-14769,SDN-3885: Downstream Merge 13th June 2023 #1707

Merged

Conversation

tssurya
Copy link
Contributor

@tssurya tssurya commented Jun 13, 2023

This brings in two critical fixes:
https://issues.redhat.com/browse/SDN-3885 cc @pliurh
and a high priority bug fix: https://issues.redhat.com/browse/OCPBUGS-14769

NO CONFLICTS, CLEAN CHERRY-PICKs

/cc @trozet @pliurh @andreaskaris

pliurh and others added 3 commits June 13, 2023 09:44
Users can create the external gateway bridge without attaching a
host physical interface as the uplink port in local gateway mode.

The gateway router will use 169.254.169.4 as the default gateway.

Add a new gateway config flag 'allow-no-uplink' to controll if this
setup is allowed or not. It's disabled by default.

With this setup, egressIP and egressGW can not work.

Signed-off-by: Peng Liu <pliu@redhat.com>
(cherry picked from commit 89f953d)
Signed-off-by: Peng Liu <pliu@redhat.com>
(cherry picked from commit e80027a)
For services and endpoints, make sure that the protocol and port are
valid before deleting conntrack flows.
Under certain circumstances, the port may be the default value
(meaning 0), indicating that all conntrack flows for a given IP shall
be deleted. However, for endpoints and services, only ever delete
exact matches. Otherwise, ovnkube-node might remove conntrack flows
inserted by unrelated components (such as iptables rules).
If for any reason protocol is invalid, skip conntrack deletion instead.

Reported-at: https://issues.redhat.com/browse/OCPBUGS-14769
Signed-off-by: Andreas Karis <ak.karis@gmail.com>
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jun 13, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jun 13, 2023

@tssurya: This pull request references Jira Issue OCPBUGS-14769, 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.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @anuragthehatter

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

This pull request references SDN-3885 which is a valid jira issue.

In response to this:

This brings in two critical fixes:
https://issues.redhat.com/browse/SDN-3885 cc @pliurh
and a high priority bug fix: https://issues.redhat.com/browse/OCPBUGS-14769

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-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jun 13, 2023

@tssurya: This pull request references Jira Issue OCPBUGS-14769, which is valid.

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

Requesting review from QA contact:
/cc @anuragthehatter

This pull request references SDN-3885 which is a valid jira issue.

In response to this:

This brings in two critical fixes:
https://issues.redhat.com/browse/SDN-3885 cc @pliurh
and a high priority bug fix: https://issues.redhat.com/browse/OCPBUGS-14769

NO CONFLICTS, CLEAN CHERRY-PICKs

/cc @trozet @pliurh @andreaskaris

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.

@andreaskaris
Copy link
Contributor

lgtm for my commit as soon as upstream merges. NIT: "Validate port before deleting conntrack flow" wasn't cherry-picked with -x

@tssurya
Copy link
Contributor Author

tssurya commented Jun 13, 2023

lgtm for my commit as soon as upstream merges. NIT: "Validate port before deleting conntrack flow" wasn't cherry-picked with -x

it was but since its not merged it wasn't found in any tree... so couldn't do it that way :)

@tssurya
Copy link
Contributor Author

tssurya commented Jun 13, 2023

/payload 4.14 nightly blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 13, 2023

@tssurya: trigger 7 job(s) of type blocking for the nightly release of OCP 4.14

  • periodic-ci-openshift-release-master-nightly-4.14-e2e-aws-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.14-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.14-upgrade-from-stable-4.13-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-release-master-ci-4.14-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.14-e2e-aws-sdn-serial
  • periodic-ci-openshift-release-master-nightly-4.14-e2e-metal-ipi-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.14-e2e-metal-ipi-sdn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/048732b0-09d4-11ee-9fef-9ca7b2a00a5e-0

@tssurya
Copy link
Contributor Author

tssurya commented Jun 13, 2023

/payload 4.14 ci blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 13, 2023

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

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

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/12b25d60-09d4-11ee-91d3-8acb156de6f2-0

@tssurya
Copy link
Contributor Author

tssurya commented Jun 13, 2023

/retest-required

@tssurya
Copy link
Contributor Author

tssurya commented Jun 13, 2023

/payload-aggregate periodic-ci-openshift-release-master-ci-4.14-upgrade-from-stable-4.13-e2e-aws-ovn-upgrade 10

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 13, 2023

@tssurya: trigger 1 job(s) for the /payload-(job|aggregate) command

  • periodic-ci-openshift-release-master-ci-4.14-upgrade-from-stable-4.13-e2e-aws-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/71f5d720-09ed-11ee-94bd-2402d6917c25-0

@trozet
Copy link
Contributor

trozet commented Jun 13, 2023

/override ci/prow/e2e-aws-ovn-upgrade-local-gateway

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 13, 2023

@trozet: Overrode contexts on behalf of trozet: ci/prow/e2e-aws-ovn-upgrade-local-gateway

In response to this:

/override ci/prow/e2e-aws-ovn-upgrade-local-gateway

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.

@tssurya
Copy link
Contributor Author

tssurya commented Jun 13, 2023

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 13, 2023
@trozet
Copy link
Contributor

trozet commented Jun 13, 2023

/lgtm

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

openshift-ci bot commented Jun 13, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: trozet, tssurya

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 Jun 13, 2023
@tssurya
Copy link
Contributor Author

tssurya commented Jun 13, 2023

/payload-aggregate periodic-ci-openshift-release-master-ci-4.14-e2e-azure-ovn-upgrade 10
/payload-aggregate periodic-ci-openshift-release-master-ci-4.14-upgrade-from-stable-4.13-e2e-gcp-ovn-rt-upgrade 10

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 13, 2023

@tssurya: trigger 2 job(s) for the /payload-(job|aggregate) command

  • periodic-ci-openshift-release-master-ci-4.14-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.14-upgrade-from-stable-4.13-e2e-gcp-ovn-rt-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/f20fff70-0a20-11ee-8dfc-81f7574ff818-0

@neisw
Copy link

neisw commented Jun 14, 2023

/hold cancel

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

/retest-required

Remaining retests: 0 against base HEAD 23c67c6 and 2 for PR HEAD eacdaa7 in total

@trozet
Copy link
Contributor

trozet commented Jun 15, 2023

/override ci/prow/e2e-aws-ovn-upgrade-local-gateway

@trozet
Copy link
Contributor

trozet commented Jun 15, 2023

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 15, 2023

@trozet: Overrode contexts on behalf of trozet: ci/prow/e2e-aws-ovn-upgrade-local-gateway

In response to this:

/override ci/prow/e2e-aws-ovn-upgrade-local-gateway

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.

@trozet
Copy link
Contributor

trozet commented Jun 15, 2023

/retest-required

@trozet
Copy link
Contributor

trozet commented Jun 15, 2023

/override ci/prow/e2e-aws-ovn-upgrade-local-gateway

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 15, 2023

@trozet: Overrode contexts on behalf of trozet: ci/prow/e2e-aws-ovn-upgrade-local-gateway

In response to this:

/override ci/prow/e2e-aws-ovn-upgrade-local-gateway

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-merge-robot openshift-merge-robot merged commit 5217351 into openshift:master Jun 15, 2023
27 checks passed
@openshift-ci-robot
Copy link
Contributor

@tssurya: Jira Issue OCPBUGS-14769: All pull requests linked via external trackers have merged:

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

In response to this:

This brings in two critical fixes:
https://issues.redhat.com/browse/SDN-3885 cc @pliurh
and a high priority bug fix: https://issues.redhat.com/browse/OCPBUGS-14769

NO CONFLICTS, CLEAN CHERRY-PICKs

/cc @trozet @pliurh @andreaskaris

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-ci
Copy link
Contributor

openshift-ci bot commented Jun 15, 2023

@tssurya: all tests passed!

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

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-important Referenced Jira bug's severity is important 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.

None yet

7 participants