Bug 1829735: fix(operator): map top-level csv phase to component conditions #1732

njhale · 2020-08-20T19:21:20Z

Description of the change:

Map the top-level status of a CSV to a single status condition of an Operator component reference. A corollary is that a CSV component reference will only have the latest phase recorded as a condition.

Motivation for the change:

The CSV status condition type doesn't match component status conditions, resulting in a bad projection:

- lastTransitionTime: "2020-04-30T07:05:13Z"
  lastUpdateTime: "2020-04-30T07:05:13Z"
  message: all requirements found, attempting install
  reason: AllRequirementsMet
  status: ""
  type: ""

Additionally, CSV conditions are effectively a log of past phases rather than a summary of the current status - mapping 1:1 produces noisy Operator resources.

- replace jsonpath with jq package for copying component conditions - map top-level CSV status to a single component condition

openshift-ci-robot · 2020-08-20T19:21:24Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: njhale

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

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

openshift-ci-robot · 2020-08-20T19:21:24Z

@njhale: This pull request references Bugzilla bug 1829735, which is invalid:

expected the bug to target the "4.6.0" release, but it targets "4.7.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:

Bug 1829735: fix(operator): map top-level csv phase to component conditions

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.

njhale · 2020-08-20T19:22:55Z

/bugzilla refresh

openshift-ci-robot · 2020-08-20T19:23:02Z

@njhale: This pull request references Bugzilla bug 1829735, 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.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.6.0) matches configured target release for branch (4.6.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

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.

njhale · 2020-08-20T19:34:09Z

/retest

njhale · 2020-08-21T17:27:12Z

/retest

njhale · 2020-08-21T17:27:38Z

/cherry-pick release-4.5

openshift-cherrypick-robot · 2020-08-21T17:27:39Z

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

In response to this:

/cherry-pick release-4.5

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.

njhale · 2020-08-24T13:02:25Z

/retest

njhale · 2020-08-27T17:08:38Z

/retest

njhale · 2020-09-08T13:13:13Z

/retest

njhale · 2020-09-08T20:11:21Z

/retest

exdx

/lgtm
gojq looks like a very handy library to have in OLM

exdx · 2020-09-08T20:52:54Z

pkg/controller/operators/decorators/operator.go

+
+ var out interface{}
+ for {
+ v, ok := iter.Next()


if the query returns no results, so ok is false here and we break -- is there an issue passing a blank interface{} into the Decode call below? Should we check its length?

openshift-bot · 2020-09-08T23:41:55Z

/retest

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

openshift-bot · 2020-09-09T03:23:14Z

/retest

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

openshift-bot · 2020-09-09T06:50:56Z

/retest

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

openshift-bot · 2020-09-09T10:18:59Z

/retest

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

openshift-bot · 2020-09-09T10:32:05Z

/retest

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

openshift-bot · 2020-09-09T14:26:00Z

/retest

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

njhale · 2020-09-09T14:31:58Z

/hold

njhale · 2020-09-10T01:56:39Z

operator-framework/operator-registry#437 has merged and should rectify the test timeouts.

/retest

njhale · 2020-09-10T13:46:37Z

/hold cancel
/retest

openshift-bot · 2020-09-10T17:30:38Z

/retest

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

openshift-bot · 2020-09-10T18:59:44Z

/retest

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

openshift-bot · 2020-09-10T19:53:38Z

/retest

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

openshift-bot · 2020-09-10T21:50:38Z

/retest

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

njhale · 2020-09-10T22:44:00Z

/retest

openshift-bot · 2020-09-10T22:55:53Z

/retest

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

openshift-bot · 2020-09-10T23:34:36Z

/retest

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

openshift-bot · 2020-09-10T23:47:36Z

/retest

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

openshift-bot · 2020-09-11T00:14:00Z

/retest

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

openshift-bot · 2020-09-11T03:02:39Z

/retest

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

openshift-bot · 2020-09-11T12:34:40Z

/retest

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

openshift-bot · 2020-09-11T12:47:55Z

/retest

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

openshift-bot · 2020-09-11T16:02:30Z

/retest

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

openshift-bot · 2020-09-11T17:20:29Z

/retest

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

openshift-bot · 2020-09-11T20:48:32Z

/retest

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

openshift-bot · 2020-09-12T00:16:39Z

/retest

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

openshift-bot · 2020-09-12T01:48:06Z

/retest

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

openshift-ci-robot · 2020-09-12T06:00:45Z

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

operator-framework/operator-lifecycle-manager#1732

Bugzilla bug 1829735 has been moved to the MODIFIED state.

In response to this:

Bug 1829735: fix(operator): map top-level csv phase to component conditions

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 · 2020-09-12T06:00:45Z

@njhale: #1732 failed to apply on top of branch "release-4.5":

Applying: fix(operator): map top-level csv phase to component conditions
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	pkg/controller/operators/decorators/operator.go
M	pkg/controller/operators/decorators/operator_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/operators/decorators/operator_test.go
CONFLICT (content): Merge conflict in pkg/controller/operators/decorators/operator_test.go
Auto-merging pkg/controller/operators/decorators/operator.go
CONFLICT (content): Merge conflict in pkg/controller/operators/decorators/operator.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
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(operator): map top-level csv phase to component conditions
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.5

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.

njhale added 2 commits August 20, 2020 15:15

fix(operator): map top-level csv phase to component conditions

5dbe884

- replace jsonpath with jq package for copying component conditions - map top-level CSV status to a single component condition

chore(modules): update vendor

3ed98b0

openshift-ci-robot added the bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. label Aug 20, 2020

openshift-ci-robot requested review from ecordell and exdx August 20, 2020 19:21

openshift-ci-robot added bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 20, 2020

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

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

exdx reviewed Sep 8, 2020

View reviewed changes

openshift-ci-robot assigned exdx Sep 8, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 8, 2020

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 9, 2020

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 10, 2020

openshift-merge-robot merged commit c0a2879 into operator-framework:master Sep 12, 2020

njhale deleted the fix-op-csv-cond branch July 23, 2021 02:45

Bug 1829735: fix(operator): map top-level csv phase to component conditions #1732

Bug 1829735: fix(operator): map top-level csv phase to component conditions #1732

Conversation

njhale commented Aug 20, 2020

openshift-ci-robot commented Aug 20, 2020

openshift-ci-robot commented Aug 20, 2020

njhale commented Aug 20, 2020

openshift-ci-robot commented Aug 20, 2020

njhale commented Aug 20, 2020

njhale commented Aug 21, 2020

njhale commented Aug 21, 2020

openshift-cherrypick-robot commented Aug 21, 2020

njhale commented Aug 24, 2020

njhale commented Aug 27, 2020

njhale commented Sep 8, 2020

njhale commented Sep 8, 2020

exdx left a comment

Choose a reason for hiding this comment

exdx Sep 8, 2020 • edited Loading

Choose a reason for hiding this comment

openshift-bot commented Sep 8, 2020

openshift-bot commented Sep 9, 2020

openshift-bot commented Sep 9, 2020

openshift-bot commented Sep 9, 2020

openshift-bot commented Sep 9, 2020

openshift-bot commented Sep 9, 2020

njhale commented Sep 9, 2020

njhale commented Sep 10, 2020

njhale commented Sep 10, 2020

openshift-bot commented Sep 10, 2020

openshift-bot commented Sep 10, 2020

openshift-bot commented Sep 10, 2020

openshift-bot commented Sep 10, 2020

njhale commented Sep 10, 2020

openshift-bot commented Sep 10, 2020

openshift-bot commented Sep 10, 2020

openshift-bot commented Sep 10, 2020

openshift-bot commented Sep 11, 2020

openshift-bot commented Sep 11, 2020

openshift-bot commented Sep 11, 2020

openshift-bot commented Sep 11, 2020

openshift-bot commented Sep 11, 2020

openshift-bot commented Sep 11, 2020

openshift-bot commented Sep 11, 2020

openshift-bot commented Sep 12, 2020

openshift-bot commented Sep 12, 2020

openshift-ci-robot commented Sep 12, 2020

openshift-cherrypick-robot commented Sep 12, 2020

exdx Sep 8, 2020 •

edited

Loading