Skip to content

OCPBUGS-11716: [release-4.14] Use loadbalancer.Name as client index#1652

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
npinaeva:ocpbugs-11716
Apr 25, 2023
Merged

OCPBUGS-11716: [release-4.14] Use loadbalancer.Name as client index#1652
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
npinaeva:ocpbugs-11716

Conversation

@npinaeva
Copy link
Contributor

@npinaeva npinaeva commented Apr 21, 2023

Revert predicate search optimization
3369d38 as predicate search should not bee needed anymore

Signed-off-by: Nadia Pinaeva npinaeva@redhat.com
(cherry picked from commit ad052c1)

Conflicts:
go-controller/pkg/libovsdb/libovsdb.go: acl client index is not
merged downstream yet
go-controller/pkg/ovn/controller/services/loadbalancer.go:
loadbalancer cache removal is not merged downstream yet

Cherry-pick of ovn-kubernetes/ovn-kubernetes#3533

@npinaeva
Use loadbalancer.Name as client index
ba263ab 
Revert predicate search optimization
3369d38 as predicate search should not
bee needed anymore

Signed-off-by: Nadia Pinaeva <npinaeva@redhat.com>
(cherry picked from commit ad052c1)

Conflicts:
	go-controller/pkg/libovsdb/libovsdb.go: acl client index is not
merged downstream yet
	go-controller/pkg/ovn/controller/services/loadbalancer.go:
loadbalancer cache removal is not merged downstream yet
@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. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Apr 21, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 21, 2023

@npinaeva: This pull request references Jira Issue OCPBUGS-11716, 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

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

Details

In response to this:

Revert predicate search optimization
3369d38 as predicate search should not bee needed anymore

Signed-off-by: Nadia Pinaeva npinaeva@redhat.com
(cherry picked from commit ad052c1)

Conflicts:
go-controller/pkg/libovsdb/libovsdb.go: acl client index is not
merged downstream yet
go-controller/pkg/ovn/controller/services/loadbalancer.go:
loadbalancer cache removal is not merged downstream yet

Cherry-pick of ovn-kubernetes/ovn-kubernetes#3533

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 Apr 21, 2023 •
edited
Loading

@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-aws-ovn-hypershift ba263ab link false /test e2e-aws-ovn-hypershift
ci/prow/e2e-vsphere-ovn ba263ab link false /test e2e-vsphere-ovn

Full PR test history. Your PR dashboard.

Details

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.

@npinaeva
Copy link
Contributor Author

npinaeva commented Apr 24, 2023

/retest-required

@trozet
Copy link
Contributor

trozet commented Apr 24, 2023

/hold

master branch may be unlocked soon and we can do clean downstream merge

@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 Apr 24, 2023
@trozet
Copy link
Contributor

trozet commented Apr 25, 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 Apr 25, 2023
trozet
trozet approved these changes Apr 25, 2023
View reviewed changes
Copy link
Contributor

@trozet trozet left a comment

Choose a reason for hiding this comment

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

/lgtm

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

openshift-ci bot commented Apr 25, 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

Details 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 Apr 25, 2023
@openshift-merge-robot openshift-merge-robot merged commit d03d2d0 into openshift:master Apr 25, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 25, 2023

@npinaeva: Jira Issue OCPBUGS-11716: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

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

Details

In response to this:

Revert predicate search optimization
3369d38 as predicate search should not bee needed anymore

Signed-off-by: Nadia Pinaeva npinaeva@redhat.com
(cherry picked from commit ad052c1)

Conflicts:
go-controller/pkg/libovsdb/libovsdb.go: acl client index is not
merged downstream yet
go-controller/pkg/ovn/controller/services/loadbalancer.go:
loadbalancer cache removal is not merged downstream yet

Cherry-pick of ovn-kubernetes/ovn-kubernetes#3533

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 deleted the ocpbugs-11716 branch April 25, 2023 15:06
@npinaeva npinaeva mentioned this pull request Apr 25, 2023
Merged
tssurya added a commit to tssurya/ovn-kubernetes-1 that referenced this pull request May 18, 2023
@tssurya
Merge remote-tracking branch 'ovnorg/master' into ovn-ic-scale-ds-merge
d6af650 
Conflicts:
	go-controller/pkg/clustermanager/network_cluster_controller.go
	go-controller/pkg/clustermanager/network_cluster_controller_test.go
because openshift#1643 went in
	go-controller/pkg/libovsdb/libovsdb.go
because openshift#1652 went in
	go-controller/pkg/ovn/controller/services/lb_config.go
because we have to take care of ETP=local OCPHACK:
openshift#1622
	go-controller/pkg/ovn/controller/services/loadbalancer.go
because openshift#1652 went in
	go-controller/pkg/ovn/master.go
	go-controller/pkg/ovn/master_test.go
because openshift#1643 went in
tssurya added a commit to tssurya/ovn-kubernetes-1 that referenced this pull request May 19, 2023
@tssurya
Merge remote-tracking branch 'ovnorg/master' into downstream-merge-ic…
fbc9ce5 
…-scale

Conflicts:
	go-controller/pkg/clustermanager/network_cluster_controller.go
	go-controller/pkg/clustermanager/network_cluster_controller_test.go
because openshift#1643 went in
	go-controller/pkg/libovsdb/libovsdb.go
because openshift#1652 went in
	go-controller/pkg/node/healthcheck_service.go
because openshift#1671 went in
	go-controller/pkg/ovn/controller/services/lb_config.go
because we have to take care of ETP=local OCPHACK:
openshift#1622
	go-controller/pkg/ovn/controller/services/loadbalancer.go
because openshift#1652 went in
	go-controller/pkg/ovn/master.go
	go-controller/pkg/ovn/master_test.go
because openshift#1643 went in
tssurya added a commit to tssurya/ovn-kubernetes-1 that referenced this pull request May 25, 2023
@tssurya
Merge remote-tracking branch 'ovnorg-origin/lb-templates-merge' into …
83f29d1 
…lb-templates-merge-downstream

Conflicts:
	go-controller/pkg/ovn/controller/services/lb_config.go
because we have to take care of ETP=local OCPHACK:
openshift#1622
	go-controller/pkg/ovn/controller/services/loadbalancer.go
because openshift#1652 went in
@tssurya tssurya mentioned this pull request May 25, 2023
Merged
4 tasks
tssurya added a commit to tssurya/ovn-kubernetes-1 that referenced this pull request May 26, 2023
@tssurya
Merge remote-tracking branch 'ovnorg-origin/acl-indexes-merge' into a…
331f2b2 
…cl-indexes-merge-downstream

Conflicts:
	go-controller/pkg/libovsdb/libovsdb.go
because openshift#1652 is merged
already
tssurya added a commit to tssurya/ovn-kubernetes-1 that referenced this pull request May 30, 2023
@tssurya
Merge remote-tracking branch 'ovnorg-origin/acl-indexes-merge' into a…
2f2bc32 
…cl-indexes-merge-downstream

Conflicts:
	go-controller/pkg/libovsdb/libovsdb.go
because openshift#1652 is merged
already
@tssurya tssurya mentioned this pull request May 30, 2023
Closed
4 tasks
tssurya added a commit to tssurya/ovn-kubernetes-1 that referenced this pull request May 31, 2023
@tssurya
Merge remote-tracking branch 'ovn-org/master' into downstream-merge-3…
9a584ce 
…1st-may-2023

Conflicts:
	go-controller/pkg/clustermanager/network_cluster_controller.go
	go-controller/pkg/clustermanager/network_cluster_controller_test.go
because openshift#1643 went in
	go-controller/pkg/libovsdb/libovsdb.go
because openshift#1652 went in
	go-controller/pkg/node/healthcheck_service.go
because openshift#1671 went in
	go-controller/pkg/ovn/master.go
	go-controller/pkg/ovn/master_test.go
because because openshift#1643 went in
@tssurya tssurya mentioned this pull request Jun 1, 2023
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@anuragthehatter anuragthehatter Awaiting requested review from anuragthehatter

@dcbw dcbw Awaiting requested review from dcbw

@jcaamano jcaamano Awaiting requested review from jcaamano

1 more reviewer

@trozet trozet trozet approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@trozet trozet

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@npinaeva @openshift-ci-robot @trozet @openshift-merge-robot