Skip to content

[release-4.12] OCPBUGS-34757: Avoid spurious updates for internalTrafficPolicy#1070

Merged
openshift-merge-bot[bot] merged 2 commits intoopenshift:release-4.12from
candita:OCPBUGS-34757-backport-to-4.12-FixNeedlessReverts
Jun 5, 2024
Merged

[release-4.12] OCPBUGS-34757: Avoid spurious updates for internalTrafficPolicy#1070
openshift-merge-bot[bot] merged 2 commits intoopenshift:release-4.12from
candita:OCPBUGS-34757-backport-to-4.12-FixNeedlessReverts

Conversation

@candita
Copy link
Contributor

@candita candita commented May 31, 2024

This is a manual backport of #1055 to fix OCPBUGS-33657.

git cherry-pick 5579aa1
go mod vendor
go mod tidy
make generate
make update
git cherry-pick 6cd3b67
go mod vendor
go mod tidy
make generate
make update

Avoid spurious updates for internalTrafficPolicy

Specify spec.internalTrafficPolicy on NodePort- and ClusterIP-type services that the operator manages. Also, ignore updates to the spec.ipFamilies and spec.ipFamilyPolicy fields.

Before this PR, the update logic for NodePort- and ClusterIP-type services would try to revert the default values that the API set for these fields.

  • assets/router/service-cloud.yaml:
  • assets/router/service-internal.yaml: Specify internalTrafficPolicy: Cluster.
  • pkg/manifests/bindata.go: Regenerate.
  • pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.
  • pkg/operator/controller/ingress/internal_service_test.go (Test_desiredInternalIngressControllerService): Verify that spec.internalServiceChanged is set to "Cluster". (Test_internalServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.
  • pkg/operator/controller/ingress/nodeport_service.go (desiredNodePortService): Set spec.internalTrafficPolicy to "Cluster". (nodePortServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.
  • pkg/operator/controller/ingress/nodeport_service_test.go (TestDesiredNodePortService): Verify that spec.internalTrafficPolicy is set to "Cluster". (TestNodePortServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.

Ignore updates for null versus empty ennotations
Ignore updates to annotations when the update is from null to empty or vice versa.

  • pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Use EquateEmpty when comparing annotations.
  • pkg/operator/controller/ingress/internal_service_test.go (TestInternalServiceChangedEmptyAnnotations): New test to verify that internalServiceChanged treats empty and null annotations as equal.
  • pkg/operator/controller/ingress/load_balancer_service_test.go (TestLoadBalancerServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.
  • pkg/operator/controller/ingress/nodeport_service.go (nodePortServiceChanged): Use EquateEmpty when comparing annotations.
  • pkg/operator/controller/ingress/nodeport_service_test.go (TestNodePortServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.

@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 31, 2024
@openshift-ci-robot
Copy link
Contributor

@candita: This pull request references Jira Issue OCPBUGS-34757, which is invalid:

  • expected Jira Issue OCPBUGS-34757 to depend on a bug targeting a version in 4.13.0, 4.13.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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.

Details

In response to this:

git cherry-pick 82ee3f6
go mod tidy
make generate
make update

Avoid spurious updates for internalTrafficPolicy

Specify spec.internalTrafficPolicy on NodePort- and ClusterIP-type services that the operator manages. Also, ignore updates to the spec.ipFamilies and spec.ipFamilyPolicy fields.

Before this PR, the update logic for NodePort- and ClusterIP-type services would try to revert the default values that the API set for these fields.

  • assets/router/service-cloud.yaml:
  • assets/router/service-internal.yaml: Specify internalTrafficPolicy: Cluster.
  • pkg/manifests/bindata.go: Regenerate.
  • pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.
  • pkg/operator/controller/ingress/internal_service_test.go (Test_desiredInternalIngressControllerService): Verify that spec.internalServiceChanged is set to "Cluster". (Test_internalServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.
  • pkg/operator/controller/ingress/nodeport_service.go (desiredNodePortService): Set spec.internalTrafficPolicy to "Cluster". (nodePortServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy. pkg/operator/controller/ingress/nodeport_service_test.go (TestDesiredNodePortService): Verify that spec.internalTrafficPolicy is set to "Cluster". (TestNodePortServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.

Ignore updates for null versus empty ennotations
Ignore updates to annotations when the update is from null to empty or vice versa.

  • pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Use EquateEmpty when comparing annotations.
  • pkg/operator/controller/ingress/internal_service_test.go (TestInternalServiceChangedEmptyAnnotations): New test to verify that internalServiceChanged treats empty and null annotations as equal.
  • pkg/operator/controller/ingress/load_balancer_service_test.go (TestLoadBalancerServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.
  • pkg/operator/controller/ingress/nodeport_service.go (nodePortServiceChanged): Use EquateEmpty when comparing annotations.
  • pkg/operator/controller/ingress/nodeport_service_test.go (TestNodePortServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.

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 openshift-ci bot requested review from gcs278 and knobunc May 31, 2024 21:57
@melvinjoseph86
Copy link

/test e2e-azure-ovn
/jira refresh

@openshift-ci-robot
Copy link
Contributor

@melvinjoseph86: This pull request references Jira Issue OCPBUGS-34757, which is invalid:

  • expected Jira Issue OCPBUGS-34757 to depend on a bug targeting a version in 4.13.0, 4.13.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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.

Details

In response to this:

/test e2e-azure-ovn
/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.

@rfredette
Copy link
Contributor

/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 Jun 3, 2024
@openshift-ci-robot
Copy link
Contributor

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.12.z) matches configured target version for branch (4.12.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-33990 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-33990 targets the "4.13.z" version, which is one of the valid target versions: 4.13.0, 4.13.z
  • bug has dependents

Requesting review from QA contact:
/cc @melvinjoseph86

Details

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.

@openshift-ci openshift-ci bot requested a review from melvinjoseph86 June 3, 2024 15:04
Miciah added 2 commits June 3, 2024 17:22
Specify spec.internalTrafficPolicy on NodePort- and ClusterIP-type services
that the operator manages.  Also, ignore updates to the spec.ipFamilies and
spec.ipFamilyPolicy fields.

Before this commit, the update logic for NodePort- and ClusterIP-type
services would try to revert the default values that the API set for these
fields.

This commit fixes OCPBUGS-13190.

https://issues.redhat.com/browse/OCPBUGS-13190

* assets/router/service-cloud.yaml:
* assets/router/service-internal.yaml: Specify
"internalTrafficPolicy: Cluster".
* pkg/manifests/bindata.go: Regenerate.
* pkg/operator/controller/ingress/internal_service.go
(internalServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.
* pkg/operator/controller/ingress/internal_service_test.go
(Test_desiredInternalIngressControllerService): Verify that
spec.internalServiceChanged is set to "Cluster".
(Test_internalServiceChanged): Verify that changes to
spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies
and spec.ipFamilyPolicy are ignored.
* pkg/operator/controller/ingress/nodeport_service.go
(desiredNodePortService): Set spec.internalTrafficPolicy to "Cluster".
(nodePortServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.
* pkg/operator/controller/ingress/nodeport_service_test.go
(TestDesiredNodePortService): Verify that spec.internalTrafficPolicy is set
to "Cluster".
(TestNodePortServiceChanged): Verify that changes to
spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies
and spec.ipFamilyPolicy are ignored.
Ignore updates to annotations when the update is from null to empty or vice
versa.

* pkg/operator/controller/ingress/internal_service.go
(internalServiceChanged): Use EquateEmpty when comparing annotations.
* pkg/operator/controller/ingress/internal_service_test.go
(TestInternalServiceChangedEmptyAnnotations): New test to verify that
internalServiceChanged treats empty and null annotations as equal.
* pkg/operator/controller/ingress/load_balancer_service_test.go
(TestLoadBalancerServiceChangedEmptyAnnotations): New test to verify that
loadBalancerServiceChanged treats empty and null annotations as equal.
* pkg/operator/controller/ingress/nodeport_service.go
(nodePortServiceChanged): Use EquateEmpty when comparing annotations.
* pkg/operator/controller/ingress/nodeport_service_test.go
(TestNodePortServiceChangedEmptyAnnotations): New test to verify that
loadBalancerServiceChanged treats empty and null annotations as equal.
@candita candita force-pushed the OCPBUGS-34757-backport-to-4.12-FixNeedlessReverts branch from bd85cfa to 701f646 Compare June 3, 2024 21:26
@openshift-ci-robot
Copy link
Contributor

@candita: This pull request references Jira Issue OCPBUGS-34757, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.12.z) matches configured target version for branch (4.12.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-33990 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-33990 targets the "4.13.z" version, which is one of the valid target versions: 4.13.0, 4.13.z
  • bug has dependents

Requesting review from QA contact:
/cc @melvinjoseph86

Details

In response to this:

This is a manual backport of #1055 to fix OCPBUGS-33657.

git cherry-pick 5579aa1
go mod vendor
go mod tidy
make generate
make update
git cherry-pick 6cd3b67
go mod vendor
go mod tidy
make generate
make update

Avoid spurious updates for internalTrafficPolicy

Specify spec.internalTrafficPolicy on NodePort- and ClusterIP-type services that the operator manages. Also, ignore updates to the spec.ipFamilies and spec.ipFamilyPolicy fields.

Before this PR, the update logic for NodePort- and ClusterIP-type services would try to revert the default values that the API set for these fields.

  • assets/router/service-cloud.yaml:
  • assets/router/service-internal.yaml: Specify internalTrafficPolicy: Cluster.
  • pkg/manifests/bindata.go: Regenerate.
  • pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.
  • pkg/operator/controller/ingress/internal_service_test.go (Test_desiredInternalIngressControllerService): Verify that spec.internalServiceChanged is set to "Cluster". (Test_internalServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.
  • pkg/operator/controller/ingress/nodeport_service.go (desiredNodePortService): Set spec.internalTrafficPolicy to "Cluster". (nodePortServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.
  • pkg/operator/controller/ingress/nodeport_service_test.go (TestDesiredNodePortService): Verify that spec.internalTrafficPolicy is set to "Cluster". (TestNodePortServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.

Ignore updates for null versus empty ennotations
Ignore updates to annotations when the update is from null to empty or vice versa.

  • pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Use EquateEmpty when comparing annotations.
  • pkg/operator/controller/ingress/internal_service_test.go (TestInternalServiceChangedEmptyAnnotations): New test to verify that internalServiceChanged treats empty and null annotations as equal.
  • pkg/operator/controller/ingress/load_balancer_service_test.go (TestLoadBalancerServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.
  • pkg/operator/controller/ingress/nodeport_service.go (nodePortServiceChanged): Use EquateEmpty when comparing annotations.
  • pkg/operator/controller/ingress/nodeport_service_test.go (TestNodePortServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.

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.

@candita
Copy link
Contributor Author

candita commented Jun 3, 2024

images issue:

{ failed to wait for importing imagestreamtags on ci-op-3i9dbxb0/stable: failed to reimport the tag ci-op-3i9dbxb0/stable:cluster-samples-operator: unable to import tag ci-op-3i9dbxb0/stable:cluster-samples-operator with message Internal error occurred: [you may not have access to the container image "qci-pull-through-cache-us-east-1-ci.apps.ci.l2s4.p1.openshiftapps.com/openshift/ci:ci-op-3i9dbxb0_stable_cluster-samples-operator", dockerimage.image.openshift.io "quay.io/openshift/ci:ci-op-3i9dbxb0_stable_cluster-samples-operator" not found, dockerimage.image.openshift.io "quay-proxy.ci.openshift.org/openshift/ci:ci-op-3i9dbxb0_stable_cluster-samples-operator" not found] on the image stream even after (6) imports: timed out waiting for the condition}

/test images

@candita
Copy link
Contributor Author

candita commented Jun 3, 2024

/tide refresh

@candita
Copy link
Contributor Author

candita commented Jun 3, 2024

/honk

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 3, 2024

@candita:
goose image

Details

In response to this:

/honk

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.

@candita
Copy link
Contributor Author

candita commented Jun 3, 2024

/test images

1 similar comment
@candita
Copy link
Contributor Author

candita commented Jun 3, 2024

/test images

@candita
Copy link
Contributor Author

candita commented Jun 4, 2024

I deleted the test namespace, let's see what happens
/test images

@Miciah
Copy link
Contributor

Miciah commented Jun 4, 2024

This change is low-risk. The changes in the PR are scoped to the update logic for services, and the changes are to set internalTrafficPolicy to its default value and ignore updates to the ipFamilies and ipFamilyPolicy fields. The feature gate for internalTrafficPolicy has been enabled by default since OpenShift 4.9, and the feature gate for ipFamilies and ipFamilyPolicy has been enabled by default since OpenShift 4.8. As long as the fields exist, explicitly setting a value that is equal to the default value or ignoring the update by the API server to set the default value should be safe.

Also, as this is a manual cherry-pick, I'll note that the diff between https://patch-diff.githubusercontent.com/raw/openshift/cluster-ingress-operator/pull/1070.patch and https://patch-diff.githubusercontent.com/raw/openshift/cluster-ingress-operator/pull/927.patch only shows some fuzz and changes in bindata.go; this is a clean backport but for that.
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jun 4, 2024
@melvinjoseph86
Copy link

/retest-required

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 4, 2024
@candita
Copy link
Contributor Author

candita commented Jun 4, 2024

/test images

@candita
Copy link
Contributor Author

candita commented Jun 4, 2024

/test images

@candita
Copy link
Contributor Author

candita commented Jun 4, 2024

/test e2e-aws-operator

@melvinjoseph86
Copy link

Verified using pre-image with cluster bot.
melvinjoseph@mjoseph-mac Downloads % oc get clusterversion
NAME VERSION AVAILABLE PROGRESSING SINCE STATUS
version 4.12.0-0.ci.test-2024-06-05-052414-ci-ln-7tjs33t-latest True False 83m Cluster version is 4.12.0-0.ci.test-2024-06-05-052414-ci-ln-7tjs33t-latest

After the cluster installation there was no more 'updated internal service' log messages in openshift-ingress-operator logs.
Even after creating a custom nodeport controller and a loadbalncer controller, there was no above log messages. Hence marking as verified.

@melvinjoseph86
Copy link

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jun 5, 2024
@Miciah
Copy link
Contributor

Miciah commented Jun 5, 2024

/retitle [release-4.12] OCPBUGS-34757: Avoid spurious updates for internalTrafficPolicy

@openshift-ci openshift-ci bot changed the title OCPBUGS-34757: Avoid spurious updates for internalTrafficPolicy [backport 4.12] [release-4.12] OCPBUGS-34757: Avoid spurious updates for internalTrafficPolicy Jun 5, 2024
@Miciah
Copy link
Contributor

Miciah commented Jun 5, 2024

/assign

@candita
Copy link
Contributor Author

candita commented Jun 5, 2024

CI images issue should be resolved.

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 5, 2024

@candita: all tests passed!

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

@Miciah
Copy link
Contributor

Miciah commented Jun 5, 2024

/approve
/lgtm

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

openshift-ci bot commented Jun 5, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Miciah

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 Jun 5, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 3e1b3f9 into openshift:release-4.12 Jun 5, 2024
@openshift-ci-robot
Copy link
Contributor

@candita: Jira Issue OCPBUGS-34757: All pull requests linked via external trackers have merged:

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

Details

In response to this:

This is a manual backport of #1055 to fix OCPBUGS-33657.

git cherry-pick 5579aa1
go mod vendor
go mod tidy
make generate
make update
git cherry-pick 6cd3b67
go mod vendor
go mod tidy
make generate
make update

Avoid spurious updates for internalTrafficPolicy

Specify spec.internalTrafficPolicy on NodePort- and ClusterIP-type services that the operator manages. Also, ignore updates to the spec.ipFamilies and spec.ipFamilyPolicy fields.

Before this PR, the update logic for NodePort- and ClusterIP-type services would try to revert the default values that the API set for these fields.

  • assets/router/service-cloud.yaml:
  • assets/router/service-internal.yaml: Specify internalTrafficPolicy: Cluster.
  • pkg/manifests/bindata.go: Regenerate.
  • pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.
  • pkg/operator/controller/ingress/internal_service_test.go (Test_desiredInternalIngressControllerService): Verify that spec.internalServiceChanged is set to "Cluster". (Test_internalServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.
  • pkg/operator/controller/ingress/nodeport_service.go (desiredNodePortService): Set spec.internalTrafficPolicy to "Cluster". (nodePortServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.
  • pkg/operator/controller/ingress/nodeport_service_test.go (TestDesiredNodePortService): Verify that spec.internalTrafficPolicy is set to "Cluster". (TestNodePortServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.

Ignore updates for null versus empty ennotations
Ignore updates to annotations when the update is from null to empty or vice versa.

  • pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Use EquateEmpty when comparing annotations.
  • pkg/operator/controller/ingress/internal_service_test.go (TestInternalServiceChangedEmptyAnnotations): New test to verify that internalServiceChanged treats empty and null annotations as equal.
  • pkg/operator/controller/ingress/load_balancer_service_test.go (TestLoadBalancerServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.
  • pkg/operator/controller/ingress/nodeport_service.go (nodePortServiceChanged): Use EquateEmpty when comparing annotations.
  • pkg/operator/controller/ingress/nodeport_service_test.go (TestNodePortServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.

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

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-cluster-ingress-operator-container-v4.12.0-202406052154.p0.g3e1b3f9.assembly.stream.el8 for distgit ose-cluster-ingress-operator.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.12.0-0.nightly-2024-06-06-104737

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-moderate Referenced Jira bug's severity is moderate 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. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

Comments