[release-4.11] OCPBUGS-16075: fix dynamic conversion webhook #536

perdasilva · 2023-08-10T11:48:07Z

Copy of #508:

This is an automated cherry-pick of #503

#508 was blocked by CI because of the global catalog changes we put in had a problem downstream. How they got in, I don't know.

Signed-off-by: Tommy Hughes <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 858c7cdb2f4cfe3d351225972aede54e3b114ce4 Signed-off-by: perdasilva <[email protected]>

Signed-off-by: timflannagan <[email protected]> Upstream-commit: c652154fd7eeb72a23f78856b2cbade775efad41 Upstream-repository: operator-lifecycle-manager

Signed-off-by: timflannagan <[email protected]>

perdasilva · 2023-08-10T13:09:50Z

/retest

perdasilva · 2023-08-10T14:41:25Z

/retest

openshift-ci-robot · 2023-08-10T15:56:38Z

@perdasilva: This pull request references Jira Issue OCPBUGS-16075, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.11.z) matches configured target version for branch (4.11.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
dependent bug Jira Issue OCPBUGS-15858 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
dependent Jira Issue OCPBUGS-15858 targets the "4.12.z" version, which is one of the valid target versions: 4.12.0, 4.12.z
bug has dependents

Requesting review from QA contact:
/cc @kuiwang02

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

In response to this:

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 · 2023-08-10T15:57:54Z

@perdasilva: This pull request references Jira Issue OCPBUGS-16075, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.11.z) matches configured target version for branch (4.11.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
dependent bug Jira Issue OCPBUGS-15858 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
dependent Jira Issue OCPBUGS-15858 targets the "4.12.z" version, which is one of the valid target versions: 4.12.0, 4.12.z
bug has dependents

Requesting review from QA contact:
/cc @kuiwang02

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

In response to this:

Copy of #508:

This is an automated cherry-pick of #503

#508 was blocked by CI because of the global catalog changes we put in had a problem downstream. How they got in, I don't know.

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.

perdasilva · 2023-08-10T15:58:20Z

/label backport-risk-assessed

kuiwang02 · 2023-08-11T01:48:12Z

/label cherry-pick-approved
/label qe-approved

kuiwang02 · 2023-08-11T01:50:18Z

/hold

because I am doing pre-verifying. after that, I will cancel hold.

kuiwang02 · 2023-08-11T03:07:39Z

pre-verify pass.

/hold cancel

perdasilva · 2023-08-14T08:38:55Z

/cherry-pick release-4.10

openshift-cherrypick-robot · 2023-08-14T08:38:56Z

@perdasilva: once the present PR merges, I will cherry-pick it on top of release-4.10 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.10

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.

m1kola

/lgtm

perdasilva · 2023-08-14T10:26:53Z

/approve

tmshort

/lgtm
/approve

awgreene · 2023-08-14T13:38:40Z

/approve

perdasilva · 2023-08-15T12:59:59Z

/approve

openshift-ci · 2023-08-15T13:00:16Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awgreene, m1kola, perdasilva, tmshort

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~~ [awgreene,perdasilva,tmshort]

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

openshift-ci · 2023-08-15T15:54:06Z

@perdasilva: 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/test-infra repository. I understand the commands that are listed here.

openshift-ci-robot · 2023-08-15T15:58:46Z

@perdasilva: Jira Issue OCPBUGS-16075: All pull requests linked via external trackers have merged:

openshift/operator-framework-olm#536

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

In response to this:

Copy of #508:

This is an automated cherry-pick of #503

#508 was blocked by CI because of the global catalog changes we put in had a problem downstream. How they got in, I don't know.

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-cherrypick-robot · 2023-08-15T15:59:31Z

@perdasilva: #536 failed to apply on top of branch "release-4.10":

Applying: fix dynamic conversion webhook (#2912)
Using index info to reconstruct a base tree...
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	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
CONFLICT (content): Merge conflict in 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
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/apiservices.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
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/olm/apiservices.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/olm/apiservices.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 fix dynamic conversion webhook (#2912)
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.10

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.

tchughesiv and others added 3 commits July 12, 2023 03:04

fix dynamic conversion webhook (#2912)

7e10b92

Signed-off-by: Tommy Hughes <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 858c7cdb2f4cfe3d351225972aede54e3b114ce4 Signed-off-by: perdasilva <[email protected]>

ci: Add support for configuring the global catalog namespace (#2825)

43224c0

Signed-off-by: timflannagan <[email protected]> Upstream-commit: c652154fd7eeb72a23f78856b2cbade775efad41 Upstream-repository: operator-lifecycle-manager

Makefile: Explicitly override the global catalog namespace

60ae62f

Signed-off-by: timflannagan <[email protected]>

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 10, 2023

perdasilva mentioned this pull request Aug 10, 2023

[release-4.11] OCPBUGS-16075: fix dynamic conversion webhook #508

Closed

perdasilva changed the title ~~[WIP] Pr 508~~ [WIP] [release-4.11] OCPBUGS-16075: fix dynamic conversion webhook Aug 10, 2023

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Aug 10, 2023

perdasilva changed the title ~~[WIP] [release-4.11] OCPBUGS-16075: fix dynamic conversion webhook~~ [release-4.11] OCPBUGS-16075: fix dynamic conversion webhook Aug 10, 2023

openshift-ci bot requested a review from kuiwang02 August 10, 2023 15:56

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 10, 2023

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

openshift-ci bot assigned bandrade, emmajiafan, jianzhangbjz, KeenonLee, kuiwang02 and Xia-Zhao-rh Aug 10, 2023

openshift-ci bot added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. qe-approved Signifies that QE has signed off on this PR labels Aug 11, 2023

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 11, 2023

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 11, 2023

m1kola approved these changes Aug 14, 2023

View reviewed changes

openshift-ci bot assigned m1kola Aug 14, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 14, 2023

tmshort approved these changes Aug 14, 2023

View reviewed changes

openshift-ci bot assigned tmshort Aug 14, 2023

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 15, 2023

openshift-merge-robot merged commit c97e06c into openshift:release-4.11 Aug 15, 2023

perdasilva mentioned this pull request Aug 16, 2023

[release-4.10] OCPBUGS-17779: fix dynamic conversion webhook #546

Merged

[release-4.11] OCPBUGS-16075: fix dynamic conversion webhook #536

[release-4.11] OCPBUGS-16075: fix dynamic conversion webhook #536

Uh oh!

Conversation

perdasilva commented Aug 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

perdasilva commented Aug 10, 2023

Uh oh!

perdasilva commented Aug 10, 2023

Uh oh!

openshift-ci-robot commented Aug 10, 2023

Uh oh!

openshift-ci-robot commented Aug 10, 2023

Uh oh!

perdasilva commented Aug 10, 2023

Uh oh!

kuiwang02 commented Aug 11, 2023

Uh oh!

kuiwang02 commented Aug 11, 2023

Uh oh!

kuiwang02 commented Aug 11, 2023

Uh oh!

perdasilva commented Aug 14, 2023

Uh oh!

openshift-cherrypick-robot commented Aug 14, 2023

Uh oh!

m1kola left a comment

Choose a reason for hiding this comment

Uh oh!

perdasilva commented Aug 14, 2023

Uh oh!

tmshort left a comment

Choose a reason for hiding this comment

Uh oh!

awgreene commented Aug 14, 2023

Uh oh!

perdasilva commented Aug 15, 2023

Uh oh!

openshift-ci bot commented Aug 15, 2023

Uh oh!

openshift-ci bot commented Aug 15, 2023

Uh oh!

openshift-ci-robot commented Aug 15, 2023

Uh oh!

openshift-cherrypick-robot commented Aug 15, 2023

Uh oh!

Uh oh!

perdasilva commented Aug 10, 2023 •

edited

Loading