Skip to content

NO-ISSUE: Match operator lifecycle versions by major.minor only #16698

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

Open
joelanford wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −4
Open

NO-ISSUE: Match operator lifecycle versions by major.minor only #16698

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
10 changes: 10 additions & 0 deletions ...es/operator-lifecycle-manager/src/components/__tests__/operator-lifecycle-status.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ describe('getClusterCompatibility', () => {
expect(getClusterCompatibility(lifecycle, '2.0.1', '4.17.0')).toBe('compatible');
expect(getClusterCompatibility(lifecycle, '2.0.1', '4.14.0')).toBe('incompatible');
});

it('returns no data for an invalid operator version', () => {
expect(getClusterCompatibility(lifecycle, 'latest', '4.15.0')).toBe('no-data');
});
});

describe('getSupportPhase', () => {
Expand Down Expand Up @@ -183,6 +187,12 @@ describe('getSupportPhase', () => {
expect(getSupportPhase(noPhases, '1.0')).toEqual({ status: SupportPhaseStatus.NoData });
});

it('returns no data for an invalid operator version', () => {
expect(getSupportPhase(lifecycle, 'latest', new Date('2024-03-15'))).toEqual({
status: SupportPhaseStatus.NoData,
});
});

it('matches operator version by minor version when exact match fails', () => {
const result = getSupportPhase(lifecycle, '1.0.5', new Date('2024-03-15'));
expect(result).toEqual({
Expand Down
9 changes: 5 additions & 4 deletions frontend/packages/operator-lifecycle-manager/src/components/operator-lifecycle-status.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,11 @@ const findVersionEntry = (
if (!operatorVersion) {
return versions[0];
}
return (
versions.find((v) => v.name === operatorVersion) ??
versions.find((v) => parseMinorVersion(v.name) === parseMinorVersion(operatorVersion))
);
const minor = parseMinorVersion(operatorVersion);
if (minor === undefined) {
return undefined;
}
return versions.find((v) => parseMinorVersion(v.name) === minor);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
};

export type CompatibilityResult = 'compatible' | 'incompatible' | 'no-data';
Expand Down