Bug 2019754: Ensure pending CSR count is valid post approval #139

JoelSpeed · 2021-11-03T10:09:48Z

This is a manual cherry pick of #135

Currently, we reconcile the limits (which the metrics are sourced from) at the beginning of the reconcile loop.

We only reconcile when there is a pending CSR.

So at the beginning of the reconcile loop, there is 1 pending CSR, we set the metric to 1.
We then approve the CSR, now there are no pending CSRs, so we don't have anything to reconcile.
With no reconciles happening, we never update the metric value, so it stays at 1.

This PR adjusts so that once we have reconciled, assuming it was successful, we re-reconcile the limits (metrics) to ensure they are still up to date. If we made an approval during the reconcileCSR this should now be accounted for
during the metric collection.

If there are any errors throughout this, we don't need to reconcile the limits as this will be handled when we requeue anyway

openshift-ci · 2021-11-03T10:09:56Z

@JoelSpeed: This pull request references Bugzilla bug 2019754, 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.9.z) matches configured target release for branch (4.9.z)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 2013528 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 2013528 targets the "4.10.0" release, which is one of the valid target releases: 4.10.0
bug has dependents

Requesting review from QA contact:
/cc @sunzhaohua2

In response to this:

Bug 2019754: Ensure pending CSR count is valid post approval

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.

alexander-demicev

/lgtm

lobziik · 2021-11-03T10:16:11Z

/lgtm

Fedosin · 2021-11-03T10:18:19Z

/approve

openshift-ci · 2021-11-03T12:22:53Z

@JoelSpeed: 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-gcp-operator	`be85d20`	link	false	`/test e2e-gcp-operator`
ci/prow/e2e-aws-disruptive	`be85d20`	link	false	`/test e2e-aws-disruptive`
ci/prow/e2e-azure-operator	`be85d20`	link	false	`/test e2e-azure-operator`

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.

JoelSpeed · 2021-11-11T12:59:22Z

/approve
On Fedosin's behalf

/label backport-risk-assessed

openshift-ci · 2021-11-11T12:59:58Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Fedosin, JoelSpeed

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:

~~OWNERS~~ [JoelSpeed]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-bot · 2021-11-11T13:14:53Z

/retest-required