Bug 1796078: Filter OLM operators by architecture #3887

benjaminapetersen · 2020-01-08T03:46:18Z

4.4 bug https://bugzilla.redhat.com/show_bug.cgi?id=1796078
4.3 clone https://bugzilla.redhat.com/show_bug.cgi?id=1796079
4.2 clone https://bugzilla.redhat.com/show_bug.cgi?id=1796080

https://issues.redhat.com/browse/CONSOLE-2004

Based on the following proposal: operator-framework/olm-book#29
OLM implementation coming here: operator-framework/operator-lifecycle-manager#1220

Gets the architecture & passes it to the front end via window.SERVER_FLAGS.clusterArchitecture
TODO: filter operators on OLM installation page based on architecture + annotation

The filtering portion of this may come as a separate PR, depending on complexity. We will need 4.3 & (likely) 4.2 backports.

Labels will look like the following:

labels:
    operatorframework.io/arch.<GOARCH>: supported
    operatorframework.io/os.<GOOS>: supported

specifically:

labels:
    operatorframework.io/os.windows: supported
    operatorframework.io/os.linux: supported

Furthermore, rules are as follows:

labels:
    # if no OS label, then treat it as if the following:
    operatorframework.io/os.linux: supported

labels:
    # if no arch label, treat it as the following:
    operatorframework.io/arch.amd64: supported

Simple Empty State if there are no operators that pass the filter:

/assign @spadgett @TheRealJon

pkg/server/server.go

frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-items.tsx

cmd/bridge/main.go

frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-items.tsx

benjaminapetersen · 2020-01-29T04:47:07Z

@spadgett @TheRealJon updated per feedback.

benjaminapetersen · 2020-01-29T04:47:26Z

/cherry-pick release-4.3
/cherry-pick release-4.2

openshift-cherrypick-robot · 2020-01-29T04:47:27Z

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

In response to this:

/cherry-pick release-4.3
/cherry-pick release-4.2

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.

frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-items.tsx

spadgett · 2020-02-19T18:19:23Z

@benjaminapetersen ping, do you mind rebasing?

spadgett · 2020-02-19T18:20:09Z

/bugzilla refresh

openshift-ci-robot · 2020-02-19T18:20:13Z

@spadgett: This pull request references Bugzilla bug 1796078, which is valid.

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.

spadgett · 2020-02-19T18:20:30Z

/cherry-pick release-4.4

openshift-cherrypick-robot · 2020-02-19T18:20:32Z

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

In response to this:

/cherry-pick release-4.4

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.

- Server side passing of GOOS and GOARCH via SERVER_FLAGS - Defaulting of Operators to: - operatorframework.io/arch.amd64 - operatorframework.io/os.linux - No filtering for off-cluster/dev mode

benjaminapetersen · 2020-03-03T15:44:06Z

/retest

FAILURE: Main vendor bundle is larger than the 2.5 MiB limit.
If you haven't added a new dependency, an import might have accidentally pulled an existing dependency into the main vendor bundle.
If adding a large dependency, consider lazy loading the component with AsyncComponent.

no change to vendor bundle.

benjaminapetersen · 2020-03-04T02:58:23Z

/retest


2020/03/03 15:53:01 waiting for importing pipeline:root ...
2020/03/03 15:58:01 could not resolve tag root in imagestream pipeline: timed out waiting for the condition
2020/03/03 15:58:01 No custom metadata found and prow metadata already exists. Not updating the metadata.
2020/03/03 15:58:02 Ran for 5m1s
2020/03/03 15:58:03 Submitted failure event to sentry (id=a644f704644840599f3bbdf07e33a588)
error: could not run steps: step [input:root] failed: timed out waiting for the condition

benjaminapetersen · 2020-03-04T16:30:05Z

/retest

 error: failed to load configuration: Response from configresolver == 503 (Service Unavailable)

jcaianirh · 2020-03-04T16:36:49Z

frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-items.tsx

@@ -332,10 +388,28 @@ export const OperatorHubTileView: React.FC<OperatorHubTileViewProps> = (props) =
    detailsItem &&
    `/k8s/ns/${detailsItem.subscription.metadata.namespace}/${SubscriptionModel.plural}/${detailsItem.subscription.metadata.name}?showDelete=true`;

+  if (_.isEmpty(filteredItems)) {
+    return (
+      <>


Don't need fragment here since you're returning a single top level component.

Also good, will make a note for a follow.

jcaianirh

@benjaminapetersen small nit on EmptyState return. lgtm otherwise.

TheRealJon

/lgtm

Just one minor performance nit.

TheRealJon · 2020-03-04T16:44:22Z

frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-items.tsx

@@ -233,12 +287,14 @@ export const OperatorHubTileView: React.FC<OperatorHubTileViewProps> = (props) =
  const [detailsItem, setDetailsItem] = React.useState(null);
  const [showDetails, setShowDetails] = React.useState(false);

+  const filteredItems = filterByArchAndOS(props.items);


nit: this should probably be memoized so that it doesn't get recalculated on every render.

Nice, that would be a good optimization. I'll make a note for a follow.

jcaianirh · 2020-03-04T16:54:19Z

/lgtm

benjaminapetersen · 2020-03-04T16:54:47Z

+1 thx for the review! Would be good to get for 4.4.

openshift-ci-robot · 2020-03-04T16:54:48Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: benjaminapetersen, jcaianirh, TheRealJon

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

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-03-04T19:42:51Z

@benjaminapetersen: All pull requests linked via external trackers have merged. Bugzilla bug 1796078 has been moved to the MODIFIED state.

In response to this:

Bug 1796078: Filter OLM operators by architecture

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-03-04T19:43:01Z

@benjaminapetersen: #3887 failed to apply on top of branch "release-4.3":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	cmd/bridge/main.go
M	frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-items.tsx
M	frontend/public/declarations.d.ts
M	pkg/server/server.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/server/server.go
CONFLICT (content): Merge conflict in pkg/server/server.go
Auto-merging frontend/public/declarations.d.ts
Auto-merging frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-items.tsx
CONFLICT (content): Merge conflict in frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-items.tsx
Auto-merging cmd/bridge/main.go
Patch failed at 0001 Support OS and Arch filtering of Operators in OperatorHub

In response to this:

/cherry-pick release-4.3
/cherry-pick release-4.2

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-03-04T19:43:09Z

@spadgett: new pull request created: #4630

In response to this:

/cherry-pick release-4.4

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 added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 8, 2020

benjaminapetersen commented Jan 8, 2020

View reviewed changes

pkg/server/server.go Outdated Show resolved Hide resolved

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 8, 2020

benjaminapetersen changed the title ~~Filter OLM operators by architecture~~ [WIP] Filter OLM operators by architecture Jan 8, 2020

openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 8, 2020

openshift-ci-robot requested review from jhadvig and rhamilto January 8, 2020 03:46

openshift-ci-robot added component/backend Related to backend component/core Related to console core functionality labels Jan 8, 2020

benjaminapetersen force-pushed the JIRA/console-2004/olm/filter-by-architecture branch from 6188e2c to bcc84f6 Compare January 21, 2020 03:03

benjaminapetersen force-pushed the JIRA/console-2004/olm/filter-by-architecture branch from 850ac94 to eff3eee Compare January 24, 2020 05:36

openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 24, 2020

benjaminapetersen changed the title ~~[WIP] Filter OLM operators by architecture~~ Filter OLM operators by architecture Jan 24, 2020

openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 24, 2020

benjaminapetersen commented Jan 24, 2020

View reviewed changes

frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-items.tsx Outdated Show resolved Hide resolved

benjaminapetersen assigned spadgett Jan 24, 2020

TheRealJon reviewed Jan 24, 2020

View reviewed changes

frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-items.tsx Outdated Show resolved Hide resolved

spadgett reviewed Jan 28, 2020

View reviewed changes

benjaminapetersen force-pushed the JIRA/console-2004/olm/filter-by-architecture branch 3 times, most recently from 1caf3f3 to af9940e Compare January 29, 2020 04:45

spadgett reviewed Jan 29, 2020

View reviewed changes

frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-items.tsx Outdated Show resolved Hide resolved

benjaminapetersen changed the title ~~Filter OLM operators by architecture~~ Bug 1796078: Filter OLM operators by architecture Jan 29, 2020

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 10, 2020

spadgett modified the milestones: v4.4, v4.5 Feb 19, 2020

Support OS and Arch filtering of Operators in OperatorHub

e9adf08

- Server side passing of GOOS and GOARCH via SERVER_FLAGS - Defaulting of Operators to: - operatorframework.io/arch.amd64 - operatorframework.io/os.linux - No filtering for off-cluster/dev mode

benjaminapetersen force-pushed the JIRA/console-2004/olm/filter-by-architecture branch from 6bb1a88 to e9adf08 Compare March 3, 2020 02:52

openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 3, 2020

jcaianirh reviewed Mar 4, 2020

View reviewed changes

jcaianirh approved these changes Mar 4, 2020

View reviewed changes

TheRealJon approved these changes Mar 4, 2020

View reviewed changes

openshift-ci-robot assigned TheRealJon Mar 4, 2020

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

openshift-ci-robot assigned jcaianirh Mar 4, 2020

openshift-merge-robot merged commit de3233c into openshift:master Mar 4, 2020

openshift-cherrypick-robot mentioned this pull request Mar 4, 2020

[release-4.4] Bug 1804851: Filter OLM operators by architecture #4630

Merged

benjaminapetersen deleted the JIRA/console-2004/olm/filter-by-architecture branch March 19, 2020 03:00

benjaminapetersen mentioned this pull request Apr 6, 2020

[release-4.3] Bug 1796079: Backport OLM filter by OS and ARCH #4928

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1796078: Filter OLM operators by architecture #3887

Bug 1796078: Filter OLM operators by architecture #3887

benjaminapetersen commented Jan 8, 2020 •

edited

benjaminapetersen commented Jan 29, 2020

benjaminapetersen commented Jan 29, 2020

openshift-cherrypick-robot commented Jan 29, 2020

spadgett commented Feb 19, 2020

spadgett commented Feb 19, 2020

openshift-ci-robot commented Feb 19, 2020

spadgett commented Feb 19, 2020

openshift-cherrypick-robot commented Feb 19, 2020

benjaminapetersen commented Mar 3, 2020

benjaminapetersen commented Mar 4, 2020

benjaminapetersen commented Mar 4, 2020

jcaianirh Mar 4, 2020

benjaminapetersen Mar 4, 2020

jcaianirh left a comment

TheRealJon left a comment

TheRealJon Mar 4, 2020

benjaminapetersen Mar 4, 2020

jcaianirh commented Mar 4, 2020

benjaminapetersen commented Mar 4, 2020

openshift-ci-robot commented Mar 4, 2020

openshift-ci-robot commented Mar 4, 2020

openshift-cherrypick-robot commented Mar 4, 2020

openshift-cherrypick-robot commented Mar 4, 2020

Bug 1796078: Filter OLM operators by architecture #3887

Bug 1796078: Filter OLM operators by architecture #3887

Conversation

benjaminapetersen commented Jan 8, 2020 • edited

benjaminapetersen commented Jan 29, 2020

benjaminapetersen commented Jan 29, 2020

openshift-cherrypick-robot commented Jan 29, 2020

spadgett commented Feb 19, 2020

spadgett commented Feb 19, 2020

openshift-ci-robot commented Feb 19, 2020

spadgett commented Feb 19, 2020

openshift-cherrypick-robot commented Feb 19, 2020

benjaminapetersen commented Mar 3, 2020

benjaminapetersen commented Mar 4, 2020

benjaminapetersen commented Mar 4, 2020

jcaianirh Mar 4, 2020

Choose a reason for hiding this comment

benjaminapetersen Mar 4, 2020

Choose a reason for hiding this comment

jcaianirh left a comment

Choose a reason for hiding this comment

TheRealJon left a comment

Choose a reason for hiding this comment

TheRealJon Mar 4, 2020

Choose a reason for hiding this comment

benjaminapetersen Mar 4, 2020

Choose a reason for hiding this comment

jcaianirh commented Mar 4, 2020

benjaminapetersen commented Mar 4, 2020

openshift-ci-robot commented Mar 4, 2020

openshift-ci-robot commented Mar 4, 2020

openshift-cherrypick-robot commented Mar 4, 2020

openshift-cherrypick-robot commented Mar 4, 2020

benjaminapetersen commented Jan 8, 2020 •

edited