Skip to content

[release-4.7] Bug 1937214: Fix spurious reconciliation of NodePort services#570

Merged
openshift-merge-robot merged 2 commits intoopenshift:release-4.7from
openshift-cherrypick-robot:cherry-pick-567-to-release-4.7
Mar 22, 2021
Merged

[release-4.7] Bug 1937214: Fix spurious reconciliation of NodePort services#570
openshift-merge-robot merged 2 commits intoopenshift:release-4.7from
openshift-cherrypick-robot:cherry-pick-567-to-release-4.7

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #567

/assign Miciah

Miciah added 2 commits March 10, 2021 07:45
This commit improves log output when reconciling managed resources to
include the diff between the current and updated resources when updating
resources.

* pkg/operator/controller/canary/route.go (updateCanaryRoute): Log the diff
between the current and updated resources when updating the route.
* pkg/operator/controller/ingress/cluster-role.go (ensureClusterRole): Move
logging of updates from here...
(updateClusterRole): ...to here.  Log diff.
* pkg/operator/controller/ingress/dns.go (ensureWildcardDNSRecord): Move
logging of updates from here...
(updateDNSRecord): ...to here.  Log diff.
* pkg/operator/controller/ingress/load_balancer_service.go
(ensureLoadBalancerService): Move logging of updates from here...
(updateLoadBalancerService): ...to here.  Log diff.
* pkg/operator/controller/ingress/monitoring.go (ensureServiceMonitor):
Move logging of updates from here...
(updateServiceMonitor): ...to here.  Log diff.
* pkg/operator/controller/ingress/nodeport_service.go
(ensureNodePortService): Move logging of updates from here...
(updateNodePortService): ...to here.  Log diff.
* pkg/operator/controller/ingress/poddisruptionbudget.go
(ensureRouterPodDisruptionBudget): Move logging of updates from here...
(updateRouterPodDisruptionBudget): ...to here.  Log diff.
* pkg/operator/controller/ingress/rsyslog_configmap.go
(ensureRsyslogConfigMap): Move logging of updates from here...
(updateRouterPodDisruptionBudget): ...to here.  Log diff.
* pkg/operator/controller/ingress/serviceca_configmap.go
(ensureServiceCAConfigMap): Move logging of updates from here...
(updateServiceCAConfigMap): ...to here.  Log diff.
Ignore the clusterIPs field when comparing NodePort services to determine
whether an update is required.

Before this commit, the update logic would keep trying to revert the
default value that the API set for the service's clusterIPs field.

The clusterIPs field is new in Kubernetes 1.20 (OpenShift 4.7).

This commit fixes bug 1936030.

https://bugzilla.redhat.com/show_bug.cgi?id=1936030

* pkg/operator/controller/ingress/nodeport_service.go
(nodePortServiceChanged): Ignore the service's clusterIPs field.
* pkg/operator/controller/ingress/nodeport_service_test.go
(TestNodePortServiceChanged): Verify that nodePortServiceChanged returns
false if the only mutation is that the clusterIPs field's value has
changed.
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Bugzilla bug 1936030 has been cloned as Bugzilla bug 1937214. Retitling PR to link against new bug.
/retitle [release-4.7] Bug 1937214: Fix spurious reconciliation of NodePort services

Details

In response to this:

[release-4.7] Bug 1936030: Fix spurious reconciliation of NodePort services

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 openshift-ci-robot changed the title [release-4.7] Bug 1936030: Fix spurious reconciliation of NodePort services [release-4.7] Bug 1937214: Fix spurious reconciliation of NodePort services Mar 10, 2021
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Mar 10, 2021
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1937214, which is invalid:

  • expected dependent Bugzilla bug 1936030 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is MODIFIED instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

[release-4.7] Bug 1937214: Fix spurious reconciliation of NodePort services

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 openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Mar 10, 2021
@Miciah
Copy link
Contributor

Miciah commented Mar 10, 2021

TestHTTPHeaderCapture failed due to an API glitch:

=== RUN   TestHTTPHeaderCapture
    operator_test.go:1272: failed to get the console route: the server is currently unable to handle the request (get routes.route.openshift.io console)
    operator_test.go:1883: deleted ingresscontroller headercapture
--- FAIL: TestHTTPHeaderCapture (53.80s)

/test e2e-aws-operator

@openshift-ci-robot
Copy link
Contributor

@Miciah: The specified target(s) for /test were not found.
The following commands are available to trigger jobs:

  • /test e2e-aws
  • /test e2e-aws-operator
  • /test e2e-azure
  • /test e2e-upgrade
  • /test images
  • /test unit
  • /test verify

Use /test all to run the following jobs:

  • pull-ci-openshift-cluster-ingress-operator-release-4.7-e2e-aws
  • pull-ci-openshift-cluster-ingress-operator-release-4.7-e2e-aws-operator
  • pull-ci-openshift-cluster-ingress-operator-release-4.7-e2e-upgrade
  • pull-ci-openshift-cluster-ingress-operator-release-4.7-images
  • pull-ci-openshift-cluster-ingress-operator-release-4.7-unit
  • pull-ci-openshift-cluster-ingress-operator-release-4.7-verify
Details

In response to this:

TestHTTPHeaderCapture failed due to an API glitch:

=== RUN   TestHTTPHeaderCapture
   operator_test.go:1272: failed to get the console route: the server is currently unable to handle the request (get routes.route.openshift.io console)
   operator_test.go:1883: deleted ingresscontroller headercapture
--- FAIL: TestHTTPHeaderCapture (53.80s)

/test e2e-operator

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.

@Miciah
Copy link
Contributor

Miciah commented Mar 10, 2021

/test e2e-aws-operator

@sgreene570
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 15, 2021
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, sgreene570

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 15, 2021
@openshift-bot
Copy link
Contributor

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

@openshift-ci-robot
Copy link
Contributor

@openshift-bot: This pull request references Bugzilla bug 1937214, which is invalid:

  • expected dependent Bugzilla bug 1936030 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

@openshift-ci-robot
Copy link
Contributor

@openshift-bot: This pull request references Bugzilla bug 1937214, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.z) matches configured target release for branch (4.7.z)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1936030 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1936030 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
  • bug has dependents

Requesting review from QA contact:
/cc @lihongan

Details

In response to this:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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 openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Mar 17, 2021
@lihongan
Copy link
Contributor

/bugzilla cc-qa

@openshift-ci-robot
Copy link
Contributor

@lihongan: This pull request references Bugzilla bug 1937214, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.z) matches configured target release for branch (4.7.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1936030 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1936030 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
  • bug has dependents

Requesting review from QA contact:
/cc @lihongan

Details

In response to this:

/bugzilla cc-qa

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.

@ecordell ecordell added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 22, 2021
@openshift-merge-robot openshift-merge-robot merged commit 1d9717b into openshift:release-4.7 Mar 22, 2021
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

Bugzilla bug 1937214 has been moved to the MODIFIED state.

Details

In response to this:

[release-4.7] Bug 1937214: Fix spurious reconciliation of NodePort services

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.

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. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium 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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants