Skip to content

Bug 1867238: utilize channels from ClusterVersion when available #6283

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

Merged
openshift-merge-robot merged 1 commit into from
Aug 11, 2020
Merged

Bug 1867238: utilize channels from ClusterVersion when available #6283

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
4 changes: 3 additions & 1 deletion frontend/public/components/cluster-settings/cluster-settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,9 @@ const calculatePercentage = (numerator: number, denominator: number): number =>
Math.round((numerator / denominator) * 100);

export const CurrentChannel: React.FC<CurrentChannelProps> = ({ cv, clusterVersionIsEditable }) => {
// TODO: use a more informative empty state label
const label = cv.spec.channel || '-';
// TODO: do not show #current-channel-update-link when no channels are present in CV (e.g., a nightly build)
return clusterVersionIsEditable ? (
<Button
type="button"
Expand Down Expand Up @@ -524,7 +526,7 @@ export const UpdatesGraph: React.FC<UpdatesGraphProps> = ({ cv }) => {
const secondNewestVersion = availableUpdates[1]?.version;
const currentChannel = cv.spec.channel;
const currentPrefix = splitClusterVersionChannel(currentChannel)?.prefix;
const similarChannels = getSimilarClusterVersionChannels(currentPrefix);
const similarChannels = getSimilarClusterVersionChannels(cv, currentPrefix);
const newerChannel = getNewerClusterVersionChannel(similarChannels, currentChannel);

return (
Expand Down
5 changes: 4 additions & 1 deletion frontend/public/components/modals/cluster-channel-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ class ClusterChannelModal extends PromiseComponent<

render() {
const { cv } = this.props;
const availableChannels = getAvailableClusterChannels();
const availableChannels = getAvailableClusterChannels(cv).reduce((o, val) => {
o[val] = val;
return o;
}, {});
return (
<form
onSubmit={this._submit}
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/notification-drawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ const getUpdateNotificationEntries = (
const updateData: ClusterUpdate[] = getSortedUpdates(cv);
const currentChannel = cv?.spec?.channel;
const currentPrefix = splitClusterVersionChannel(currentChannel)?.prefix;
const similarChannels = getSimilarClusterVersionChannels(currentPrefix);
const similarChannels = getSimilarClusterVersionChannels(cv, currentPrefix);
const newerChannel = getNewerClusterVersionChannel(similarChannels, currentChannel);
const newerChannelVersion = splitClusterVersionChannel(newerChannel)?.version;
const entries = [];
Expand Down
14 changes: 7 additions & 7 deletions frontend/public/module/k8s/cluster-settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ export const getSortedUpdates = (cv: ClusterVersionKind): ClusterUpdate[] => {
}
};

export const getAvailableClusterChannels = () => ({
'stable-4.6': 'stable-4.6',
'fast-4.6': 'fast-4.6',
'candidate-4.6': 'candidate-4.6',
});
export const getAvailableClusterChannels = (cv) => {
// temporarily fall back to hard-coded values when `cv.status.desired.channels` are not present
// TODO: remove fall back values once `cv.status.desired.channels` are widespread
return cv?.status?.desired?.channels || ['stable-4.6', 'fast-4.6', 'candidate-4.6'];
};

export const getDesiredClusterVersion = (cv: ClusterVersionKind): string => {
return _.get(cv, 'status.desired.version');
Expand All @@ -56,8 +56,8 @@ export const splitClusterVersionChannel = (channel: string) => {
return parsed ? { prefix: parsed[1], version: parsed[2] } : null;
};

export const getSimilarClusterVersionChannels = (currentPrefix) => {
return _.keys(getAvailableClusterChannels()).filter((channel: string) => {
export const getSimilarClusterVersionChannels = (cv, currentPrefix) => {
return getAvailableClusterChannels(cv).filter((channel: string) => {
return currentPrefix && splitClusterVersionChannel(channel)?.prefix === currentPrefix;
});
};
Expand Down