[release-4.15] OCPBUGS-36813: [CARRY] perform operator apiService certificate validity checks directly #819

ankitathomas · 2024-07-10T13:48:15Z

Manual cherry-pick of #798 to 4.15

openshift-ci-robot · 2024-07-10T13:48:21Z

@ankitathomas: This pull request references Jira Issue OCPBUGS-36813, 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-36138 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-36138 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:

Manual cherry-pick of #798 to 4.15

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 · 2024-07-10T14:03:07Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ankitathomas

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~~ [ankitathomas]

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

…cks directly (#3217) * perform operator apiService certificate validity checks directly Signed-off-by: Ankita Thomas <[email protected]> * use sets to track certs to install, revert to checking for installPlan timeouts after API availability checks, add service FQDN to list of hostnames. Signed-off-by: Ankita Thomas <[email protected]> --------- Signed-off-by: Ankita Thomas <[email protected]>

ankitathomas · 2024-07-10T14:48:20Z

/retest

jianzhangbjz · 2024-07-11T11:02:20Z

Test pass, see: https://issues.redhat.com/browse/OCPBUGS-36813
/lable qe-approved
/label cherry-pick-approved

jianzhangbjz · 2024-07-11T11:02:31Z

/label qe-approved

jianzhangbjz · 2024-07-11T11:02:41Z

/lgtm

kevinrizza · 2024-07-11T13:33:44Z

/retest

kevinrizza · 2024-07-11T13:33:54Z

/label backport-risk-assessed

openshift-ci · 2024-07-11T17:21:03Z

@ankitathomas: 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.

openshift-ci-robot · 2024-07-11T17:25:23Z

@ankitathomas: Jira Issue OCPBUGS-36813: All pull requests linked via external trackers have merged:

openshift/operator-framework-olm#819

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

In response to this:

Manual cherry-pick of #798 to 4.15

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.

ankitathomas · 2024-07-11T20:45:09Z

/cherry-pick release-4.14

openshift-cherrypick-robot · 2024-07-11T20:46:01Z

@ankitathomas: #819 failed to apply on top of branch "release-4.14":

Applying: perform operator apiService certificate validity checks directly (#3217)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/pkg/controller/install/certresources.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/olm/apiservices.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator_test.go
M	staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/webhook_e2e_test.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install/certresources.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/apiservices.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/apiservices.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install/certresources.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install/certresources.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/webhook_e2e_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/test/e2e/webhook_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/olm/apiservices.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/install/certresources.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/install/certresources.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 perform operator apiService certificate validity checks directly (#3217)
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.

openshift-bot · 2024-07-11T21:15:14Z

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-lifecycle-manager-container-v4.15.0-202407112037.p0.g882fdf4.assembly.stream.el9 for distgit operator-lifecycle-manager.
All builds following this will include this PR.

ankitathomas · 2024-07-12T19:53:57Z

/cherry-pick release-4.14

openshift-cherrypick-robot · 2024-07-12T19:54:38Z

@ankitathomas: #819 failed to apply on top of branch "release-4.14":

Applying: perform operator apiService certificate validity checks directly (#3217)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/pkg/controller/install/certresources.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/olm/apiservices.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator_test.go
M	staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go
M	staging/operator-lifecycle-manager/test/e2e/webhook_e2e_test.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install/certresources.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/apiservices.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/apiservices.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install/certresources.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install/certresources.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/webhook_e2e_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/test/e2e/webhook_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/olm/apiservices.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/install/certresources.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/install/certresources.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 perform operator apiService certificate validity checks directly (#3217)
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.

openshift-merge-robot · 2024-07-13T02:46:53Z

Fix included in accepted release 4.15.0-0.nightly-2024-07-12-193851

ankitathomas mentioned this pull request Jul 10, 2024

[release-4.15] OCPBUGS-36813: perform operator apiService certificate validity checks directly #818

Closed

openshift-ci bot requested review from grokspawn and kevinrizza July 10, 2024 14:01

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 10, 2024

ankitathomas force-pushed the OCP25341-4.15 branch from c2de061 to 1849397 Compare July 10, 2024 14:17

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 Jul 11, 2024

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jul 11, 2024

openshift-ci bot assigned jianzhangbjz Jul 11, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 11, 2024

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jul 11, 2024

openshift-ci bot assigned bandrade, emmajiafan, KeenonLee, kuiwang02 and Xia-Zhao-rh Jul 11, 2024

openshift-merge-bot bot merged commit 882fdf4 into openshift:release-4.15 Jul 11, 2024
13 checks passed

ankitathomas mentioned this pull request Jul 12, 2024

[release-4.14] OCPBUGS-36949: [CARRY] perform operator apiService certificate validity checks directly #821

Merged

[release-4.15] OCPBUGS-36813: [CARRY] perform operator apiService certificate validity checks directly #819

[release-4.15] OCPBUGS-36813: [CARRY] perform operator apiService certificate validity checks directly #819

Uh oh!

Conversation

ankitathomas commented Jul 10, 2024

Uh oh!

openshift-ci-robot commented Jul 10, 2024

Uh oh!

openshift-ci bot commented Jul 10, 2024

Uh oh!

ankitathomas commented Jul 10, 2024

Uh oh!

jianzhangbjz commented Jul 11, 2024

Uh oh!

jianzhangbjz commented Jul 11, 2024

Uh oh!

jianzhangbjz commented Jul 11, 2024

Uh oh!

kevinrizza commented Jul 11, 2024

Uh oh!

kevinrizza commented Jul 11, 2024

Uh oh!

openshift-ci bot commented Jul 11, 2024

Uh oh!

Uh oh!

openshift-ci-robot commented Jul 11, 2024

Uh oh!

ankitathomas commented Jul 11, 2024

Uh oh!

openshift-cherrypick-robot commented Jul 11, 2024

Uh oh!

openshift-bot commented Jul 11, 2024

Uh oh!

ankitathomas commented Jul 12, 2024

Uh oh!

openshift-cherrypick-robot commented Jul 12, 2024

Uh oh!

openshift-merge-robot commented Jul 13, 2024

Uh oh!

Uh oh!