Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-4.18] OCPBUGS-50648: add support for "OpenShift Virtualization Engine" valid subscription filter on OperatorHub #14761

Open
wants to merge 1 commit into
base: release-4.18
Choose a base branch
from
Open

[release-4.18] OCPBUGS-50648: add support for "OpenShift Virtualization Engine" valid subscription filter on OperatorHub #14761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions frontend/packages/operator-lifecycle-manager/src/components/operator-hub/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export enum InfrastructureFeature {

export enum ValidSubscriptionValue {
OpenShiftKubernetesEngine = 'OpenShift Kubernetes Engine',
OpenShiftVirtualizationEngine = 'OpenShift Virtualization Engine',
OpenShiftContainerPlatform = 'OpenShift Container Platform',
OpenShiftPlatformPlus = 'OpenShift Platform Plus',
RequiresSeparateSubscription = 'Requires separate subscription',
Expand Down
1 change: 1 addition & 0 deletions ...nd/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-items.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ const infraFeaturesSort = (infrastructure) => {
const validSubscriptionSort = (validSubscription) => {
switch (validSubscription.value) {
case ValidSubscriptionValue.OpenShiftKubernetesEngine:
case ValidSubscriptionValue.OpenShiftVirtualizationEngine:
return 0;
case ValidSubscriptionValue.OpenShiftContainerPlatform:
return 1;
Expand Down
12 changes: 10 additions & 2 deletions ...ackages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-utils.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,14 @@ describe('getValidSubscription', () => {
const [subscriptions, filters] = getValidSubscription({
[OLMAnnotation.ValidSubscription]: `["${ValidSubscriptionValue.OpenShiftKubernetesEngine}"]`,
});
expect(subscriptions).toEqual([ValidSubscriptionValue.OpenShiftKubernetesEngine]);
expect(filters).toEqual([ValidSubscriptionValue.OpenShiftKubernetesEngine]);
expect(subscriptions).toEqual([
ValidSubscriptionValue.OpenShiftKubernetesEngine,
ValidSubscriptionValue.OpenShiftVirtualizationEngine,
]);
expect(filters).toEqual([
ValidSubscriptionValue.OpenShiftKubernetesEngine,
ValidSubscriptionValue.OpenShiftVirtualizationEngine,
]);
});
it(`parses ${ValidSubscriptionValue.OpenShiftPlatformPlus}`, () => {
const [subscriptions, filters] = getValidSubscription({
Expand All @@ -407,13 +413,15 @@ describe('getValidSubscription', () => {
expect(subscriptions).toEqual([
ValidSubscriptionValue.OpenShiftContainerPlatform,
ValidSubscriptionValue.OpenShiftKubernetesEngine,
ValidSubscriptionValue.OpenShiftVirtualizationEngine,
ValidSubscriptionValue.OpenShiftPlatformPlus,
'foo',
'bar',
]);
expect(filters).toEqual([
ValidSubscriptionValue.OpenShiftContainerPlatform,
ValidSubscriptionValue.OpenShiftKubernetesEngine,
ValidSubscriptionValue.OpenShiftVirtualizationEngine,
ValidSubscriptionValue.OpenShiftPlatformPlus,
ValidSubscriptionValue.RequiresSeparateSubscription,
]);
Expand Down
50 changes: 35 additions & 15 deletions ...end/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,27 +144,47 @@ const parseValidSubscriptionAnnotation: AnnotationParser<string[]> = (annotation
...options,
}) ?? [];

export const getValidSubscription: AnnotationParser<[string[], ValidSubscriptionValue[]]> = (
export const getValidSubscription: AnnotationParser<[string[], string[]]> = (
annotations,
options,
) => {
const validSubscription = parseValidSubscriptionAnnotation(annotations, options);
const validSubscriptionFilters = validSubscription.reduce<ValidSubscriptionValue[]>(
(acc, value) => {
const filterValue =
{
[ValidSubscriptionValue.OpenShiftContainerPlatform]:
ValidSubscriptionValue.OpenShiftContainerPlatform,
[ValidSubscriptionValue.OpenShiftKubernetesEngine]:
const validSubscriptionMap = parseValidSubscriptionAnnotation(annotations, options).reduce<{
[key: string]: string[];
}>((acc, value) => {
switch (value) {
case ValidSubscriptionValue.OpenShiftContainerPlatform:
case ValidSubscriptionValue.OpenShiftPlatformPlus:
return {
...acc,
[value]: [value],
};
case ValidSubscriptionValue.OpenShiftKubernetesEngine:
case ValidSubscriptionValue.OpenShiftVirtualizationEngine:
return {
...acc,
[ValidSubscriptionValue.OpenShiftKubernetesEngine]: [
ValidSubscriptionValue.OpenShiftKubernetesEngine,
[ValidSubscriptionValue.OpenShiftPlatformPlus]:
ValidSubscriptionValue.OpenShiftPlatformPlus,
}[value] ?? ValidSubscriptionValue.RequiresSeparateSubscription;
return acc.includes(filterValue) ? acc : [...acc, filterValue];
},
],
[ValidSubscriptionValue.OpenShiftVirtualizationEngine]: [
ValidSubscriptionValue.OpenShiftVirtualizationEngine,
],
};
default:
return {
...acc,
[ValidSubscriptionValue.RequiresSeparateSubscription]: [
...(acc?.[ValidSubscriptionValue.RequiresSeparateSubscription] ?? []),
value,
],
};
}
}, {});

const validSubscriptions = Object.values(validSubscriptionMap).reduce(
(acc, subscriptions) => [...acc, ...subscriptions],
[],
);
return [validSubscription, validSubscriptionFilters];
return [validSubscriptions, Object.keys(validSubscriptionMap)];
};

const parseInfrastructureFeaturesAnnotation: AnnotationParser<string[]> = (annotations, options) =>
Expand Down