Surface dependent Operator upgradeable conditions #355

leelavg · 2023-12-08T14:27:50Z

odf-operator brings dependencies using OLM
this PR ensures odf-operator sets it's own operator condition based on upgradeability of it's dependents

[RHSTOR-5073]

openshift-ci · 2023-12-08T14:27:55Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

leelavg · 2023-12-08T14:28:01Z

~~- testing in progress~~

leelavg · 2023-12-11T06:59:30Z

Testing:

--- Initial condition
== No StorageSystem
# ko get condition odf-operator.v4.13.4-rhodf -ojsonpath='{.spec.conditions}'
[{"lastTransitionTime":"2023-12-11T06:27:33Z","message":"Operator is ready","reason":"Ready","status":"True","type":"Upgradeable"}]

== With StorageSytem
# ko get condition odf-operator.v4.13.4-rhodf -ojsonpath='{.spec.conditions}'
[{"lastTransitionTime":"2023-12-11T06:27:33Z","message":"No dependent reports not upgradeable status","reason":"Dependents","status":"True","type":"Upgradeable"}]

--- Tests
== dependent is not upgradeable
# ko get condition mcg-operator.v4.13.4-rhodf -ojsonpath='{"Conditions: "}{.spec.overrides}{"\n"}{"Conditions: "}{.spec.conditions}]'
Overrides: 
Conditions: [{"lastTransitionTime":"2023-12-11T04:05:22Z","message":"MSG","reason":"RSN","status":"False","type":"Upgradeable"}]]

== odf-operator is not upgradeable
# ko get condition odf-operator.v4.13.4-rhodf -ojsonpath='{.spec.conditions}'
[{"lastTransitionTime":"2023-12-11T06:31:42Z","message":"mcg-operator.v4.13.4-rhodf:MSG","reason":"RSN","status":"False","type":"Upgradeable"}]

-----

== dependent is upgradeable via overrides
# ko get condition mcg-operator.v4.13.4-rhodf -ojsonpath='{"Overrides: "}{.spec.overrides}{"\n"}{"Conditions: "}{.spec.conditions}]'
Overrides: [{"lastTransitionTime":"2023-12-11T04:06:22Z","message":"MSG","reason":"RSN","status":"True","type":"Upgradeable"}]
Conditions: [{"lastTransitionTime":"2023-12-11T04:05:22Z","message":"MSG","reason":"RSN","status":"False","type":"Upgradeable"}]]

== odf-operator is upgradeable
# ko get condition odf-operator.v4.13.4-rhodf -ojsonpath='{.spec.conditions}'
[{"lastTransitionTime":"2023-12-11T06:36:04Z","message":"No dependent reports not upgradeable status","reason":"Dependents","status":"True","type":"Upgradeable"}]

-----

== dependent is not upgradeable via overrides
# ko get condition mcg-operator.v4.13.4-rhodf -ojsonpath='{"Overrides: "}{.spec.overrides}{"\n"}{"Conditions: "}{.spec.conditions}]'
Overrides: [{"lastTransitionTime":"2023-12-11T04:06:22Z","message":"MSG","reason":"RSN","status":"False","type":"Upgradeable"}]
Conditions: [{"lastTransitionTime":"2023-12-11T04:05:22Z","message":"MSG","reason":"RSN","status":"True","type":"Upgradeable"}]]

== odf-operator is upgradeable
# ko get condition odf-operator.v4.13.4-rhodf -ojsonpath='{.spec.conditions}'
[{"lastTransitionTime":"2023-12-11T06:41:09Z","message":"mcg-operator.v4.13.4-rhodf:MSG","reason":"RSN","status":"False","type":"Upgradeable"}]

-----

== dependent override is removed
# ko get condition mcg-operator.v4.13.4-rhodf -ojsonpath='{"Overrides: "}{.spec.overrides}{"\n"}{"Conditions: "}{.spec.conditions}]'
Overrides: 
Conditions: [{"lastTransitionTime":"2023-12-11T04:05:22Z","message":"MSG","reason":"RSN","status":"True","type":"Upgradeable"}]]

== odf-operator is upgradeable
# ko get condition odf-operator.v4.13.4-rhodf -ojsonpath='{.spec.conditions}'
[{"lastTransitionTime":"2023-12-11T06:43:49Z","message":"No dependent reports not upgradeable status","reason":"Dependents","status":"True","type":"Upgradeable"}]

leelavg · 2023-12-11T09:21:36Z

/rerun-required

controllers/storagesystem_controller.go

main.go

leelavg · 2023-12-12T06:00:17Z

retested

== dependent is not upgradeable
# ko patch condition mcg-operator.v4.15.0-84.stable --type merge -p '{"spec": {"conditions": [{"lastTransitionTime":"2023-12-12T04:06:22Z","message":"MSG","reason":"RSN","status":"False","type":"Upgradeable"}]}}'
operatorcondition.operators.coreos.com/mcg-operator.v4.15.0-84.stable patched

# ko get condition mcg-operator.v4.15.0-84.stable -ojsonpath='{"Overrides: "}{.spec.overrides}{"\n"}{"Conditions: "}{.spec.conditions}'
Overrides: 
Conditions: [{"lastTransitionTime":"2023-12-12T04:06:22Z","message":"MSG","reason":"RSN","status":"False","type":"Upgradeable"}]

== odf-operator is not upgradeable
# ko get condition odf-operator.v4.15.0-84.stable -ojsonpath='{.spec.conditions}'
[{"lastTransitionTime":"2023-12-12T05:20:35Z","message":"mcg-operator.v4.15.0-84.stable:MSG","reason":"RSN","status":"False","type":"Upgradeable"}]

=====

== dependent is upgradeable via overrides
# ko patch condition mcg-operator.v4.15.0-84.stable --type merge -p '{"spec": {"overrides": [{"lastTransitionTime":"2023-12-12T04:06:22Z","message":"MSG","reason":"RSN","status":"True","type":"Upgradeable"}]}}'
operatorcondition.operators.coreos.com/mcg-operator.v4.15.0-84.stable patched

# ko get condition mcg-operator.v4.15.0-84.stable -ojsonpath='{"Overrides: "}{.spec.overrides}{"\n"}{"Conditions: "}{.spec.conditions}]'
Overrides: [{"lastTransitionTime":"2023-12-12T04:06:22Z","message":"MSG","reason":"RSN","status":"True","type":"Upgradeable"}]
Conditions: [{"lastTransitionTime":"2023-12-12T04:05:22Z","message":"MSG","reason":"RSN","status":"False","type":"Upgradeable"}]]

== odf-operator is upgradeable
# ko get condition odf-operator.v4.15.0-84.stable -ojsonpath='{.spec.conditions}'
[{"lastTransitionTime":"2023-12-12T05:22:32Z","message":"No dependent reports not upgradeable status","reason":"Dependents","status":"True","type":"Upgradeable"}]

=====

== dependent is not upgradeable via overrides
# ko patch condition mcg-operator.v4.15.0-84.stable --type merge -p '{"spec": {"overrides": [{"lastTransitionTime":"2023-12-12T04:06:22Z","message":"MSG","reason":"RSN","status":"False","type":"Upgradeable"}]}}'
operatorcondition.operators.coreos.com/mcg-operator.v4.15.0-84.stable patched

# ko patch condition mcg-operator.v4.15.0-84.stable --type merge -p '{"spec": {"conditions": [{"lastTransitionTime":"2023-12-12T04:06:22Z","message":"MSG","reason":"RSN","status":"True","type":"Upgradeable"}]}}'
operatorcondition.operators.coreos.com/mcg-operator.v4.15.0-84.stable patched

# ko get condition mcg-operator.v4.15.0-84.stable -ojsonpath='{"Overrides: "}{.spec.overrides}{"\n"}{"Conditions: "}{.spec.conditions}]'
Overrides: [{"lastTransitionTime":"2023-12-12T04:06:22Z","message":"MSG","reason":"RSN","status":"False","type":"Upgradeable"}]
Conditions: [{"lastTransitionTime":"2023-12-12T04:06:22Z","message":"MSG","reason":"RSN","status":"True","type":"Upgradeable"}]]

== odf-operator is upgradeable
# ko get condition odf-operator.v4.15.0-84.stable -ojsonpath='{.spec.conditions}'
[{"lastTransitionTime":"2023-12-12T05:26:01Z","message":"mcg-operator.v4.15.0-84.stable:MSG","reason":"RSN","status":"False","type":"Upgradeable"}]

=====

== dependent override is removed
# ko patch condition mcg-operator.v4.15.0-84.stable --type merge -p '{"spec": {"overrides": null}}'
operatorcondition.operators.coreos.com/mcg-operator.v4.15.0-84.stable patched

# ko get condition mcg-operator.v4.15.0-84.stable -ojsonpath='{"Overrides: "}{.spec.overrides}{"\n"}{"Conditions: "}{.spec.conditions}]'
Overrides: 
Conditions: [{"lastTransitionTime":"2023-12-12T04:06:22Z","message":"MSG","reason":"RSN","status":"True","type":"Upgradeable"}]]

== odf-operator is upgradeable
# ko get condition odf-operator.v4.15.0-84.stable -ojsonpath='{.spec.conditions}'
[{"lastTransitionTime":"2023-12-12T05:27:58Z","message":"No dependent reports not upgradeable status","reason":"Dependents","status":"True","type":"Upgradeable"}]

leelavg · 2023-12-14T04:47:00Z

/hold

leelavg · 2023-12-14T07:00:23Z

/unhold
all good!

main.go

controllers/subscription_controller.go

leelavg · 2023-12-19T10:02:58Z

/hold
testing in progress

leelavg · 2023-12-19T11:44:14Z

/unhold
below extra scenario along w/ #355 (comment) cases are tested

== one operator is upgradeable via overide and another isn't

# ko patch condition mcg-operator.v4.15.0-89.stable --type merge -p '{"spec": {"overrides": [{"lastTransitionTime":"2023-12-19T04:06:22Z","message":"MSG","reason":"RSN","status":"True","type":"Upgradeable"}]}}'

# ko patch condition mcg-operator.v4.15.0-89.stable --type merge -p '{"spec": {"conditions": [{"lastTransitionTime":"2023-12-19T04:06:22Z","message":"MSG","reason":"RSN","status":"False","type":"Upgradeable"}]}}'

# ko patch condition odf-csi-addons-operator.v4.15.0-89.stable --type merge -p '{"spec": {"overrides": [{"lastTransitionTime":"2023-12-19T04:06:22Z","message":"MSG","reason":"RSN","status":"False","type":"Upgradeable"}]}}'

# ko patch condition odf-csi-addons-operator.v4.15.0-89.stable --type merge -p '{"spec": {"conditions": [{"lastTransitionTime":"2023-12-19T04:06:22Z","message":"MSG","reason":"RSN","status":"True","type":"Upgradeable"}]}}'

# ko get condition mcg-operator.v4.15.0-89.stable -ojsonpath='{"Overrides: "}{.spec.overrides}{"\n"}{"Conditions: "}{.spec.conditions}]'
Overrides: [{"lastTransitionTime":"2023-12-19T04:06:22Z","message":"MSG","reason":"RSN","status":"True","type":"Upgradeable"}]
Conditions: [{"lastTransitionTime":"2023-12-19T04:06:22Z","message":"MSG","reason":"RSN","status":"False","type":"Upgradeable"}]]

# ko get condition odf-csi-addons-operator.v4.15.0-89.stable -ojsonpath='{"Overrides: "}{.spec.overrides}{"\n"}{"Conditions: "}{.spec.conditions}]'
Overrides: [{"lastTransitionTime":"2023-12-19T04:06:22Z","message":"MSG","reason":"RSN","status":"False","type":"Upgradeable"}]
Conditions: [{"lastTransitionTime":"2023-12-19T04:06:22Z","message":"MSG","reason":"RSN","status":"True","type":"Upgradeable"}]]

== odf-operator is not upgradeable due to odf-csi-addons override
# ko get condition odf-operator.v4.15.0-89.stable -ojsonpath='{.spec.conditions}'
[{"lastTransitionTime":"2023-12-19T11:23:04Z","message":"odf-csi-addons-operator.v4.15.0-89.stable:MSG","reason":"RSN","status":"False","type":"Upgradeable"}]

# ko patch condition mcg-operator.v4.15.0-89.stable --type merge -p '{"spec": {"overrides": null}}'
operatorcondition.operators.coreos.com/mcg-operator.v4.15.0-89.stable patched

== odf-operator is not upgradeable due to mcg conditions
# ko get condition odf-operator.v4.15.0-89.stable -ojsonpath='{.spec.conditions}'
[{"lastTransitionTime":"2023-12-19T11:23:04Z","message":"mcg-operator.v4.15.0-89.stable:MSG","reason":"RSN","status":"False","type":"Upgradeable"}]

controllers/subscription_controller.go

Signed-off-by: Leela Venkaiah G <lgangava@ibm.com>

- odf-operator brings dependencies using OLM - this PR ensures odf-operator sets it's own operator condition based on upgradeability of it's dependents. Signed-off-by: Leela Venkaiah G <lgangava@ibm.com>

Signed-off-by: Leela Venkaiah G <lgangava@ibm.com>

openshift-ci · 2023-12-19T13:53:38Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iamniting, leelavg

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

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

iamniting · 2023-12-19T16:27:38Z

/test odf-operator-e2e-aws

iamniting · 2023-12-20T03:45:37Z

/cherry-pick release-4.15

iamniting · 2023-12-20T03:45:43Z

/cherry-pick release-4.14

openshift-cherrypick-robot · 2023-12-20T03:46:20Z

@iamniting: new pull request created: #358

In response to this:

/cherry-pick release-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 kubernetes/test-infra repository.

openshift-cherrypick-robot · 2023-12-20T03:46:23Z

@iamniting: #355 failed to apply on top of branch "release-4.14":

Applying: godeps: go mod tidy and vendor
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in 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 godeps: go mod tidy and vendor
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/test-infra repository.

iamniting · 2024-07-25T12:30:22Z

/cherry-pick release-4.13

openshift-cherrypick-robot · 2024-07-25T12:31:06Z

@iamniting: #355 failed to apply on top of branch "release-4.13":

Applying: godeps: go mod tidy and vendor
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/github.com/operator-framework/api/pkg/operators/v1alpha1/catalogsource_types.go
M	vendor/github.com/operator-framework/api/pkg/operators/v1alpha1/subscription_types.go
M	vendor/github.com/operator-framework/api/pkg/operators/v1alpha1/zz_generated.deepcopy.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/github.com/operator-framework/api/pkg/operators/v1alpha1/zz_generated.deepcopy.go
Auto-merging vendor/github.com/operator-framework/api/pkg/operators/v1alpha1/subscription_types.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/api/pkg/operators/v1alpha1/subscription_types.go
Auto-merging vendor/github.com/operator-framework/api/pkg/operators/v1alpha1/catalogsource_types.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in 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 godeps: go mod tidy and vendor
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.13

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-ci bot added the do-not-merge/work-in-progress label Dec 8, 2023

df-build-team requested a review from a team December 8, 2023 18:59

leelavg force-pushed the 5073-upgrade branch 4 times, most recently from 4f1bed4 to 45b9d6d Compare December 11, 2023 06:55

leelavg marked this pull request as ready for review December 11, 2023 06:56

openshift-ci bot removed the do-not-merge/work-in-progress label Dec 11, 2023

iamniting requested changes Dec 11, 2023

View reviewed changes

controllers/storagesystem_controller.go Outdated Show resolved Hide resolved

main.go Outdated Show resolved Hide resolved

main.go Outdated Show resolved Hide resolved

openshift-ci bot assigned iamniting Dec 11, 2023

leelavg force-pushed the 5073-upgrade branch from 45b9d6d to a8b4ae9 Compare December 12, 2023 05:59

leelavg requested a review from iamniting December 12, 2023 06:00

openshift-ci bot added the do-not-merge/hold label Dec 14, 2023

openshift-ci bot removed the do-not-merge/hold label Dec 14, 2023

leelavg force-pushed the 5073-upgrade branch from a8b4ae9 to 6055ef8 Compare December 15, 2023 04:41

iamniting requested changes Dec 19, 2023

View reviewed changes

main.go Outdated Show resolved Hide resolved

controllers/subscription_controller.go Show resolved Hide resolved

openshift-merge-robot added the needs-rebase label Dec 19, 2023

leelavg force-pushed the 5073-upgrade branch from 6055ef8 to f506745 Compare December 19, 2023 10:02

openshift-merge-robot removed the needs-rebase label Dec 19, 2023

openshift-ci bot added the do-not-merge/hold label Dec 19, 2023

leelavg force-pushed the 5073-upgrade branch from f506745 to d62bf3c Compare December 19, 2023 11:40

openshift-ci bot removed the do-not-merge/hold label Dec 19, 2023

leelavg requested a review from iamniting December 19, 2023 11:44

iamniting requested changes Dec 19, 2023

View reviewed changes

controllers/subscription_controller.go Outdated Show resolved Hide resolved

controllers/subscription_controller.go Outdated Show resolved Hide resolved

controllers/subscription_controller.go Outdated Show resolved Hide resolved

godeps: go mod tidy and vendor

783603b

Signed-off-by: Leela Venkaiah G <lgangava@ibm.com>

leelavg force-pushed the 5073-upgrade branch 2 times, most recently from 69d0df5 to 81148ce Compare December 19, 2023 13:26

leelavg added 2 commits December 19, 2023 19:14

controllers: surface dependent operator upgradeable conditions

15fc2eb

- odf-operator brings dependencies using OLM - this PR ensures odf-operator sets it's own operator condition based on upgradeability of it's dependents. Signed-off-by: Leela Venkaiah G <lgangava@ibm.com>

bundle: update role to work with operatorconditions

ff22e7c

Signed-off-by: Leela Venkaiah G <lgangava@ibm.com>

leelavg force-pushed the 5073-upgrade branch from 81148ce to ff22e7c Compare December 19, 2023 13:45

iamniting approved these changes Dec 19, 2023

View reviewed changes

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

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

iamniting changed the title ~~[RHSTOR-5073] Surface dependent Operator upgradeable conditions~~ Surface dependent Operator upgradeable conditions Dec 19, 2023

openshift-merge-bot bot merged commit af060a2 into red-hat-storage:main Dec 19, 2023
18 checks passed

openshift-cherrypick-robot mentioned this pull request Dec 20, 2023

Bug 2255310:[release-4.15] Surface dependent Operator upgradeable conditions #358

Merged

This was referenced Dec 20, 2023

Bug 2255315:[release-4.14] Surface dependent Operator upgradeable conditions #359

Closed

[fusion-hci-4.14] Surface dependent Operator upgradeable conditions #360

Merged

iamniting mentioned this pull request Jul 25, 2024

Bug 2256903:[release-4.13] Surface dependent Operator upgradeable conditions #460

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Surface dependent Operator upgradeable conditions #355

Surface dependent Operator upgradeable conditions #355

leelavg commented Dec 8, 2023 •

edited by iamniting

Loading

openshift-ci bot commented Dec 8, 2023

leelavg commented Dec 8, 2023 •

edited

Loading

leelavg commented Dec 11, 2023

leelavg commented Dec 11, 2023

leelavg commented Dec 12, 2023

leelavg commented Dec 14, 2023

leelavg commented Dec 14, 2023

leelavg commented Dec 19, 2023

leelavg commented Dec 19, 2023 •

edited

Loading

openshift-ci bot commented Dec 19, 2023

iamniting commented Dec 19, 2023

iamniting commented Dec 20, 2023

iamniting commented Dec 20, 2023

openshift-cherrypick-robot commented Dec 20, 2023

openshift-cherrypick-robot commented Dec 20, 2023

iamniting commented Jul 25, 2024

openshift-cherrypick-robot commented Jul 25, 2024

Surface dependent Operator upgradeable conditions #355

Surface dependent Operator upgradeable conditions #355

Conversation

leelavg commented Dec 8, 2023 • edited by iamniting Loading

openshift-ci bot commented Dec 8, 2023

leelavg commented Dec 8, 2023 • edited Loading

leelavg commented Dec 11, 2023

leelavg commented Dec 11, 2023

leelavg commented Dec 12, 2023

leelavg commented Dec 14, 2023

leelavg commented Dec 14, 2023

leelavg commented Dec 19, 2023

leelavg commented Dec 19, 2023 • edited Loading

openshift-ci bot commented Dec 19, 2023

iamniting commented Dec 19, 2023

iamniting commented Dec 20, 2023

iamniting commented Dec 20, 2023

openshift-cherrypick-robot commented Dec 20, 2023

openshift-cherrypick-robot commented Dec 20, 2023

iamniting commented Jul 25, 2024

openshift-cherrypick-robot commented Jul 25, 2024

leelavg commented Dec 8, 2023 •

edited by iamniting

Loading

leelavg commented Dec 8, 2023 •

edited

Loading

leelavg commented Dec 19, 2023 •

edited

Loading