OCPBUGS-41981: (fix) registry pods do not come up again after node failure (#3366)

[anik120]

PR 3201 attempted to solve for the issue by deleting the pods stuck in Terminating due to unreachable node. However, the logic to do that was included in EnsureRegistryServer, which only gets executed if polling in requested by the user.

This PR moves the logic of checking for dead pods out of EnsureRegistryServer, and puts it in CheckRegistryServer instead. This way, if there are any dead pods detected during CheckRegistryServer, the value of healthy is returned false, which inturn triggers EnsureRegistryServer.

Upstream-repository: operator-lifecycle-manager
Upstream-commit: f2431893193e7112f78298ad7682ff3e1b179d8c

[openshift-ci-robot]

@anik120: This pull request references Jira Issue OCPBUGS-41981, 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.15.z) matches configured target version for branch (4.15.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-41217 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-41217 targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z
• bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

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

In response to this:

PR 3201 attempted to solve for the issue by deleting the pods stuck in Terminating due to unreachable node. However, the logic to do that was included in EnsureRegistryServer, which only gets executed if polling in requested by the user.

This PR moves the logic of checking for dead pods out of EnsureRegistryServer, and puts it in CheckRegistryServer instead. This way, if there are any dead pods detected during CheckRegistryServer, the value of healthy is returned false, which inturn triggers EnsureRegistryServer.

Upstream-repository: operator-lifecycle-manager
Upstream-commit: f2431893193e7112f78298ad7682ff3e1b179d8c

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]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: anik120

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:

• DOWNSTREAM_OWNERS [anik120]

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

[perdasilva]

/lgtm
/label backport-risk-assessed

[openshift-ci]

@anik120: all tests passed!

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

[jianzhangbjz]

Test pass, details: https://issues.redhat.com/browse/OCPBUGS-41981
/lgtm
/label qe-approved
/label cherry-pick-approved

[openshift-ci-robot]

@anik120: This pull request references Jira Issue OCPBUGS-41981, which is valid.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.15.z) matches configured target version for branch (4.15.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-41217 is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-41217 targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z
• bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

In response to this:

PR 3201 attempted to solve for the issue by deleting the pods stuck in Terminating due to unreachable node. However, the logic to do that was included in EnsureRegistryServer, which only gets executed if polling in requested by the user.

This PR moves the logic of checking for dead pods out of EnsureRegistryServer, and puts it in CheckRegistryServer instead. This way, if there are any dead pods detected during CheckRegistryServer, the value of healthy is returned false, which inturn triggers EnsureRegistryServer.

Upstream-repository: operator-lifecycle-manager
Upstream-commit: f2431893193e7112f78298ad7682ff3e1b179d8c

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-robot]

@anik120: Jira Issue OCPBUGS-41981: All pull requests linked via external trackers have merged:

• openshift/operator-framework-olm#868

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

In response to this:

PR 3201 attempted to solve for the issue by deleting the pods stuck in Terminating due to unreachable node. However, the logic to do that was included in EnsureRegistryServer, which only gets executed if polling in requested by the user.

This PR moves the logic of checking for dead pods out of EnsureRegistryServer, and puts it in CheckRegistryServer instead. This way, if there are any dead pods detected during CheckRegistryServer, the value of healthy is returned false, which inturn triggers EnsureRegistryServer.

Upstream-repository: operator-lifecycle-manager
Upstream-commit: f2431893193e7112f78298ad7682ff3e1b179d8c

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]

[ART PR BUILD NOTIFIER]

Distgit: operator-lifecycle-manager
This PR has been included in build operator-lifecycle-manager-container-v4.15.0-202409180305.p0.g1da79fe.assembly.stream.el9.
All builds following this will include this PR.

[openshift-bot]

[ART PR BUILD NOTIFIER]

Distgit: operator-registry
This PR has been included in build operator-registry-container-v4.15.0-202409180305.p0.g1da79fe.assembly.stream.el9.
All builds following this will include this PR.

[anik120]

/cherry-pick release-4.14

[openshift-cherrypick-robot]

@anik120: #868 failed to apply on top of branch "release-4.14":

Applying: OCPBUGS-41981: (fix) registry pods do not come up again after node failure (#3366)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap.go
M	staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap_test.go
M	staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go
M	staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc_test.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-41981: (fix) registry pods do not come up again after node failure (#3366)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.14

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.