OPRUN-3368: block cluster upgrade when installed operators have a max ocp version set that is incompatible with the next minor release #64

gallettilance · 2024-08-06T16:25:07Z

DEMO

maxopenshiftversionDEMO.mp4

joelanford · 2024-09-03T18:13:13Z

pkg/controller/dynamicupgradeableconditionscontroller.go

+	OwnerKindKey                   = "olm.operatorframework.io/owner-kind"
+	OwnerNameKey                   = "olm.operatorframework.io/owner-name"
+	PackageNameKey                 = "olm.operatorframework.io/package-name"
+	BundleNameKey                  = "olm.operatorframework.io/bundle-name"
+	BundleVersionKey               = "olm.operatorframework.io/bundle-version"


Probably makes sense to define these in the o-c API.

will create a PR

@gallettilance I will recommend to create an upstream issue (in operator-controller) before creating a PR.

For anything not being moved to operator-controller (e.g. MaxOpenShiftVersionProperty), we should unexport it since we don't intend for it to be used outside this package.

pkg/controller/dynamicupgradeableconditionscontroller.go

joelanford · 2024-09-03T18:52:15Z

pkg/controller/dynamicupgradeableconditionscontroller.go

+				} else {
+					// Incompatible
+					name := rel.Labels[BundleNameKey]
+					incompatibleOperators = append(incompatibleOperators, name)


I know this would differ from OLMv0, but it might be nice to include the name of the ClusterExtension somehow in the error message, which would give users a breadcrumb to the object they need to change in order to resolve this condition.

agreed - let's create a new ticket to track that addition and I can create a follow up PR

pkg/controller/dynamicupgradeableconditionscontroller.go

cmd/cluster-olm-operator/main.go

gallettilance · 2024-09-11T14:56:16Z

/hold until openshift/library-go#1771 merges

internal/utils/utils.go

pkg/controller/incompatible_operator_controller.go

cmd/cluster-olm-operator/main.go

internal/utils/utils.go

pkg/controller/incompatible_operator_controller.go

joelanford · 2024-10-03T19:52:09Z

/lgtm
/approve

openshift-ci · 2024-10-03T19:52:51Z

[APPROVALNOTIFIER] This PR is APPROVED

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

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

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

openshift-bot · 2024-10-04T02:10:16Z

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-olm-operator
This PR has been included in build ose-cluster-olm-operator-container-v4.18.0-202410040142.p0.g2c36793.assembly.stream.el9.
All builds following this will include this PR.

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 6, 2024

openshift-ci bot requested review from grokspawn and m1kola August 6, 2024 16:26

gallettilance force-pushed the ocpmaxversion branch from fa30194 to e466bf7 Compare August 6, 2024 16:32

gallettilance force-pushed the ocpmaxversion branch 3 times, most recently from b662c6c to 7682012 Compare September 3, 2024 17:25

joelanford reviewed Sep 3, 2024

View reviewed changes