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

SDN-4308: Update status merge for APBRoute and EgressFirewall. #2132

Merged
merged 2 commits into from
Dec 1, 2023

Conversation

npinaeva
Copy link
Member

Update APBRoute IP validation.
Depends on ovn-org/ovn-kubernetes#3750

Update APBRoute IP validation.

Signed-off-by: Nadia Pinaeva <[email protected]>
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 28, 2023
Copy link
Contributor

openshift-ci bot commented Nov 28, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@npinaeva npinaeva changed the title Update status merge for APBRoute and EgressFirewall. SDN-4308: Update status merge for APBRoute and EgressFirewall. Nov 29, 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 Nov 29, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 29, 2023

@npinaeva: This pull request references SDN-4308 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

In response to this:

Update APBRoute IP validation.
Depends on ovn-org/ovn-kubernetes#3750

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.

@npinaeva npinaeva marked this pull request as ready for review November 29, 2023 16:13
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 29, 2023
@jcaamano
Copy link
Contributor

/retest

@npinaeva
Copy link
Member Author

/retest-required

status:
description: A concise indication of whether the AdminPolicyBasedRoute
resource is applied with success
type: string
required:
- lastTransitionTime
- messages
- status
Copy link
Contributor

Choose a reason for hiding this comment

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

I talked with @npinaeva about this being a backward incompatible change. Need to confirm if we are ok with this.

@@ -138,6 +138,7 @@ rules:
resources:
- adminpolicybasedexternalroutes
- egressfirewalls
- egressfirewalls/status
Copy link
Contributor

Choose a reason for hiding this comment

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

Why did you need this and not adminpolicybasedexternalroutes/status as well?

Copy link
Member Author

@npinaeva npinaeva Nov 30, 2023

Choose a reason for hiding this comment

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

I actually need it, but it should've already been here, because node updates status already 😕

Copy link
Member Author

Choose a reason for hiding this comment

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

nice catch @jcaamano , it is a 4.14 bug :) just checked, 4.14 can't update status

W1130 14:58:55.081710    5185 master_controller.go:227] Failed to update AdminPolicyBasedExternalRoutes default status: failed to update AdminPolicyBasedExternalRoutes default status: adminpolicybasedexternalroutes.k8s.ovn.org "default" is forbidden: User "system:ovn-node:ci-ln-f2400f2-72292-sgnts-master-2" cannot update resource "adminpolicybasedexternalroutes/status" in API group "k8s.ovn.org" at the cluster scope

Copy link
Member Author

Choose a reason for hiding this comment

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

created a separate PR for that, since it is a different problem and should be backported to 4.14 #2139

Comment on lines +64 to +67
- adminpolicybasedexternalroutes
- adminpolicybasedexternalroutes/status
- egressfirewalls
- egressfirewalls/status
Copy link
Contributor

Choose a reason for hiding this comment

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

I guess we are following the status quo here but we should really only need update perms on adminpolicybasedexternalroutes/status and egressfirewalls/status

Comment on lines 166 to 167
required:
- messages
Copy link
Contributor

Choose a reason for hiding this comment

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

So thinking about it a bit, I wouldn't add this as required. It is just a hassle.

@@ -713,14 +720,14 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: set
status:
description: A concise indication of whether the AdminPolicyBasedRoute
resource is applied with success
type: string
required:
- lastTransitionTime
- messages
Copy link
Contributor

Choose a reason for hiding this comment

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

Now that we are at making backward incompatible changes, shouldn't we just remove messages and lastTransitionTime from required. It just can't make sense of them being required.

egressfirewall. For ovnkube-controller: watch and patch APBRoute and
egressfirewall.
Make all .stauts fields optional (backward incompatible change for
apbroute)

Signed-off-by: Nadia Pinaeva <[email protected]>
@trozet
Copy link
Contributor

trozet commented Dec 1, 2023

/lgtm

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 1, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 1, 2023
Copy link
Contributor

openshift-ci bot commented Dec 1, 2023

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@trozet
Copy link
Contributor

trozet commented Dec 1, 2023

/override ci/prow/e2e-metal-ipi-ovn-ipv6

Copy link
Contributor

openshift-ci bot commented Dec 1, 2023

@trozet: Overrode contexts on behalf of trozet: ci/prow/e2e-metal-ipi-ovn-ipv6

In response to this:

/override ci/prow/e2e-metal-ipi-ovn-ipv6

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-bot openshift-merge-bot bot merged commit 4f14d36 into openshift:master Dec 1, 2023
29 of 40 checks passed
Copy link
Contributor

openshift-ci bot commented Dec 1, 2023

@npinaeva: The following tests 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/e2e-azure-ovn-dualstack b31c88d link false /test e2e-azure-ovn-dualstack
ci/prow/e2e-vsphere-ovn-dualstack-primaryv6 b31c88d link false /test e2e-vsphere-ovn-dualstack-primaryv6
ci/prow/e2e-vsphere-ovn b31c88d link false /test e2e-vsphere-ovn
ci/prow/e2e-metal-ipi-ovn-ipv6-ipsec b31c88d link false /test e2e-metal-ipi-ovn-ipv6-ipsec
ci/prow/e2e-aws-ovn-serial b31c88d link false /test e2e-aws-ovn-serial
ci/prow/4.15-upgrade-from-stable-4.14-e2e-gcp-ovn-upgrade b31c88d link false /test 4.15-upgrade-from-stable-4.14-e2e-gcp-ovn-upgrade
ci/prow/e2e-azure-ovn b31c88d link false /test e2e-azure-ovn
ci/prow/e2e-network-mtu-migration-ovn-ipv6 b31c88d link false /test e2e-network-mtu-migration-ovn-ipv6
ci/prow/e2e-openstack-sdn b31c88d link false /test e2e-openstack-sdn
ci/prow/e2e-vsphere-ovn-dualstack b31c88d link false /test e2e-vsphere-ovn-dualstack

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.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build cluster-network-operator-container-v4.15.0-202312012309.p0.g4f14d36.assembly.stream for distgit cluster-network-operator.
All builds following this will include this PR.

@npinaeva npinaeva deleted the status-subresource branch December 4, 2023 09:19
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/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