[release-4.7] Bug 1989780: installplans: retry crd updates on conflicts #2314

joelanford · 2021-08-04T12:37:56Z

Manual cherry pick of #2293

Signed-off-by: Joe Lanford <[email protected]>

openshift-ci · 2021-08-04T12:38:01Z

@joelanford: This pull request references Bugzilla bug 1989780, which is invalid:

expected dependent Bugzilla bug 1989779 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST instead
expected dependent Bugzilla bug 1923111 to target a release in 4.8.0, 4.8.z, but it targets "4.9.0" 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.

In response to this:

[release-4.7] Bug 1989780: installplans: retry crd updates on conflicts

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.

joelanford · 2021-08-04T12:39:36Z

/bugzilla refresh

openshift-ci · 2021-08-04T12:39:39Z

@joelanford: This pull request references Bugzilla bug 1989780, which is invalid:

expected dependent Bugzilla bug 1989779 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST 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.

In response to this:

/bugzilla refresh

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.

joelanford · 2021-08-04T12:40:52Z

/cherry-pick release-4.6

openshift-cherrypick-robot · 2021-08-04T12:40:53Z

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

In response to this:

/cherry-pick release-4.6

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.

joelanford · 2021-08-11T20:55:42Z

/bugzilla refresh

openshift-ci · 2021-08-11T20:55:52Z

@joelanford: This pull request references Bugzilla bug 1989780, 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 ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1989779 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 1989779 targets the "4.8.z" release, which is one of the valid target releases: 4.8.0, 4.8.z
bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

/bugzilla refresh

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 · 2021-08-11T20:55:53Z

@openshift-ci[bot]: GitHub didn't allow me to request PR reviews from the following users: jianzhangbjz.

Note that only operator-framework members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

@joelanford: This pull request references Bugzilla bug 1989780, 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 ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

dependent bug Bugzilla bug 1989779 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))

dependent Bugzilla bug 1989779 targets the "4.8.z" release, which is one of the valid target releases: 4.8.0, 4.8.z

bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

/bugzilla refresh

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.

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.

joelanford · 2021-08-11T20:56:07Z

/retest

timflannagan · 2021-08-12T14:35:31Z

/lgtm

kevinrizza · 2021-08-17T20:31:19Z

/approve

openshift-ci · 2021-08-17T20:31:22Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: joelanford, kevinrizza

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

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

timflannagan · 2021-08-17T20:42:41Z

/bugzilla refresh

openshift-ci · 2021-08-17T20:42:49Z

@timflannagan: This pull request references Bugzilla bug 1989780, which is valid. The bug has been moved to the POST state.

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 ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1989779 is in the state CLOSED (ERRATA), which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 1989779 targets the "4.8.z" release, which is one of the valid target releases: 4.8.0, 4.8.z
bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

/bugzilla refresh

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 · 2021-08-17T20:42:50Z

@openshift-ci[bot]: GitHub didn't allow me to request PR reviews from the following users: jianzhangbjz.

Note that only operator-framework members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

@timflannagan: This pull request references Bugzilla bug 1989780, which is valid. The bug has been moved to the POST state.

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 ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

dependent bug Bugzilla bug 1989779 is in the state CLOSED (ERRATA), which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))

dependent Bugzilla bug 1989779 targets the "4.8.z" release, which is one of the valid target releases: 4.8.0, 4.8.z

bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

/bugzilla refresh

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.

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.

bandrade · 2021-09-08T07:01:43Z

/lgtm
/label qe-approved

kubectl exec catalog-operator-7f656b6d67-mcd82  -n olm -- olm --version                                                                                                                                                             
OLM version: 0.17.0
git commit: 5eb1fa6ad6ecfbf1263a145e54e5bd181a078097

Install operator into a namespace (e.g 3scale from OperatorHub. This will install CRDs onto the cluster

kubectl get csv -n olm           
NAME                  DISPLAY          VERSION   REPLACES              PHASE
etcdoperator.v0.9.4   etcd             0.9.4     etcdoperator.v0.9.2   Succeeded
packageserver         Package Server   0.17.0                          Succeeded

Run some script that constantly updates the CRDs of the installed operator to mimic some event updating the CRD

 while true; do        
    kubectl patch crd etcdclusters.etcd.database.coreos.com  --type=json -p='[{"op" : "add", "path" : "/metadata/labels/test", "value": "test"}]'
    kubectl patch crd etcdclusters.etcd.database.coreos.com --type=json -p='[{"op" : "remove", "path" : "/metadata/labels/test"}]'
done

customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
The request is invalid
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched

The requests fail when an Operator is being installed

Install the same operator into a different namespace

kubectl get csv --all-namespaces 
NAMESPACE   NAME                  DISPLAY          VERSION   REPLACES              PHASE
etcd-1      etcdoperator.v0.9.4   etcd             0.9.4     etcdoperator.v0.9.2   Succeeded
etcd        etcdoperator.v0.9.4   etcd             0.9.4     etcdoperator.v0.9.2   Succeeded
olm         etcdoperator.v0.9.4   etcd             0.9.4     etcdoperator.v0.9.2   Succeeded
olm         packageserver         Package Server   0.17.0                          Succeeded

Inspect for failed install plan

kubectl get ip --all-namespaces                            
NAMESPACE   NAME            CSV                   APPROVAL    APPROVED
etcd-1      install-shkw9   etcdoperator.v0.9.4   Automatic   true
etcd        install-mbkfl   etcdoperator.v0.9.4   Automatic   true
olm         install-lkfh5   etcdoperator.v0.9.4   Automatic   true

openshift-ci · 2021-09-08T07:01:44Z

@bandrade: changing LGTM is restricted to collaborators

In response to this:

/lgtm
/label qe-approved

kubectl exec catalog-operator-7f656b6d67-mcd82 -n olm -- olm --version 130 ↵
OLM version: 0.17.0
git commit: 5eb1fa6

Install operator into a namespace (e.g 3scale from OperatorHub. This will install CRDs onto the cluster

kubectl get csv -n olm           
NAME                  DISPLAY          VERSION   REPLACES              PHASE
etcdoperator.v0.9.4   etcd             0.9.4     etcdoperator.v0.9.2   Succeeded
packageserver         Package Server   0.17.0                          Succeeded

Run some script that constantly updates the CRDs of the installed operator to mimic some event updating the CRD

while true; do        
   kubectl patch crd etcdclusters.etcd.database.coreos.com  --type=json -p='[{"op" : "add", "path" : "/metadata/labels/test", "value": "test"}]'
   kubectl patch crd etcdclusters.etcd.database.coreos.com --type=json -p='[{"op" : "remove", "path" : "/metadata/labels/test"}]'
done

customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
The request is invalid
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched
customresourcedefinition.apiextensions.k8s.io/etcdclusters.etcd.database.coreos.com patched

The requests fail when an Operator is being installed

Install the same operator into a different namespace

kubectl get csv --all-namespaces 
NAMESPACE   NAME                  DISPLAY          VERSION   REPLACES              PHASE
etcd-1      etcdoperator.v0.9.4   etcd             0.9.4     etcdoperator.v0.9.2   Succeeded
etcd        etcdoperator.v0.9.4   etcd             0.9.4     etcdoperator.v0.9.2   Succeeded
olm         etcdoperator.v0.9.4   etcd             0.9.4     etcdoperator.v0.9.2   Succeeded
olm         packageserver         Package Server   0.17.0                          Succeeded

Inspect for failed install plan

kubectl get ip --all-namespaces                            
NAMESPACE   NAME            CSV                   APPROVAL    APPROVED
etcd-1      install-shkw9   etcdoperator.v0.9.4   Automatic   true
etcd        install-mbkfl   etcdoperator.v0.9.4   Automatic   true
olm         install-lkfh5   etcdoperator.v0.9.4   Automatic   true

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.

mfojtik · 2021-09-09T13:26:19Z

[patch-manager] 🚀 Approved for z-stream by score: 0.50

adding cherry-pick approved

timflannagan · 2021-09-09T13:39:49Z

#2351

timflannagan · 2021-09-09T13:54:52Z

/retest

openshift-bot · 2021-09-09T16:52:54Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-09-09T17:44:56Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-09-09T18:10:54Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-09-09T19:28:54Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-09-09T19:41:56Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-09-09T20:07:54Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-09-09T21:51:54Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-09-09T22:45:04Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2021-09-09T23:06:20Z

@joelanford: All pull requests linked via external trackers have merged:

operator-framework/operator-lifecycle-manager#2314

Bugzilla bug 1989780 has been moved to the MODIFIED state.

In response to this:

[release-4.7] Bug 1989780: installplans: retry crd updates on conflicts

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 · 2021-09-09T23:06:59Z

@joelanford: #2314 failed to apply on top of branch "release-4.6":

Applying: installplans: retry crd updates on conflicts (#2293)
Using index info to reconstruct a base tree...
M	pkg/controller/install/webhook.go
M	pkg/controller/operators/catalog/step.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/operators/catalog/step.go
CONFLICT (content): Merge conflict in pkg/controller/operators/catalog/step.go
Auto-merging pkg/controller/install/webhook.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 installplans: retry crd updates on conflicts (#2293)
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.6

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.

installplans: retry crd updates on conflicts (operator-framework#2293)

0cb81f7

Signed-off-by: Joe Lanford <[email protected]>

openshift-ci bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Aug 4, 2021

openshift-ci bot requested review from benluddy and timflannagan August 4, 2021 12:38

openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Aug 11, 2021

openshift-ci bot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Aug 11, 2021

openshift-ci bot assigned timflannagan Aug 12, 2021

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

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

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Sep 8, 2021

kevinrizza added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 9, 2021

openshift-merge-robot merged commit ebe8450 into operator-framework:release-4.7 Sep 9, 2021

[release-4.7] Bug 1989780: installplans: retry crd updates on conflicts #2314

[release-4.7] Bug 1989780: installplans: retry crd updates on conflicts #2314

Uh oh!

Conversation

joelanford commented Aug 4, 2021

Uh oh!

openshift-ci bot commented Aug 4, 2021

Uh oh!

joelanford commented Aug 4, 2021

Uh oh!

openshift-ci bot commented Aug 4, 2021

Uh oh!

joelanford commented Aug 4, 2021

Uh oh!

openshift-cherrypick-robot commented Aug 4, 2021

Uh oh!

joelanford commented Aug 11, 2021

Uh oh!

openshift-ci bot commented Aug 11, 2021

Uh oh!

openshift-ci bot commented Aug 11, 2021

Uh oh!

joelanford commented Aug 11, 2021

Uh oh!

timflannagan commented Aug 12, 2021

Uh oh!

kevinrizza commented Aug 17, 2021

Uh oh!

openshift-ci bot commented Aug 17, 2021

Uh oh!

timflannagan commented Aug 17, 2021

Uh oh!

openshift-ci bot commented Aug 17, 2021

Uh oh!

openshift-ci bot commented Aug 17, 2021

Uh oh!

bandrade commented Sep 8, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Sep 8, 2021

Uh oh!

mfojtik commented Sep 9, 2021

Uh oh!

timflannagan commented Sep 9, 2021

Uh oh!

timflannagan commented Sep 9, 2021

Uh oh!

openshift-bot commented Sep 9, 2021

Uh oh!

openshift-bot commented Sep 9, 2021

Uh oh!

openshift-bot commented Sep 9, 2021

Uh oh!

openshift-bot commented Sep 9, 2021

Uh oh!

openshift-bot commented Sep 9, 2021

Uh oh!

openshift-bot commented Sep 9, 2021

Uh oh!

openshift-bot commented Sep 9, 2021

Uh oh!

openshift-bot commented Sep 9, 2021

Uh oh!

openshift-ci bot commented Sep 9, 2021

Uh oh!

openshift-cherrypick-robot commented Sep 9, 2021

Uh oh!

Uh oh!

bandrade commented Sep 8, 2021 •

edited

Loading