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

Jump to bottom

remove hard coded model versions from kubevirt #9349

Merged
merged 1 commit into from
Jul 14, 2021
Merged

remove hard coded model versions from kubevirt #9349

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
50 changes: 35 additions & 15 deletions frontend/packages/kubevirt-plugin/console-extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,7 @@
{
"type": "console.page/route",
"properties": {
"path": [
"/k8s/ns/:ns/virtualmachines/:name",
"/k8s/ns/:ns/kubevirt.io~v1~VirtualMachine/:name",
"/k8s/ns/:ns/kubevirt.io~v1alpha3~VirtualMachine/:name"
],
"path": ["/k8s/ns/:ns/virtualmachines/:name"],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this for backwards compatibility?
All links in the app should be using the qualified reference

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its only for backwards, there is no link that is using this url in the app.
some tests however need this url

"component": {
"$codeRef": "VirtualMachinesDetailsPage.VirtualMachinesDetailsPage"
}
Expand All @@ -248,14 +244,38 @@
"required": ["KUBEVIRT"]
}
},
{
"type": "console.page/resource/details",
"properties": {
"model": {
"group": "kubevirt.io",
"kind": "VirtualMachine"
},
"component": { "$codeRef": "VirtualMachinesDetailsPage.VirtualMachinesDetailsPage" }
},
"flags": {
"required": ["KUBEVIRT"]
}
},
{
"type": "console.page/route",
"properties": {
"path": [
"/k8s/ns/:ns/virtualmachineinstances/:name",
"/k8s/ns/:ns/kubevirt.io~v1~VirtualMachineInstance/:name",
"/k8s/ns/:ns/kubevirt.io~v1alpha3~VirtualMachineInstance/:name"
],
"path": ["/k8s/ns/:ns/virtualmachineinstances/:name"],
"component": {
"$codeRef": "VirtualMachinesInstanceDetailsPage.VirtualMachinesInstanceDetailsPage"
}
},
"flags": {
"required": ["KUBEVIRT"]
}
},
{
"type": "console.page/resource/details",
"properties": {
"model": {
"group": "kubevirt.io",
"kind": "VirtualMachineInstance"
},
"component": {
"$codeRef": "VirtualMachinesInstanceDetailsPage.VirtualMachinesInstanceDetailsPage"
}
Expand Down Expand Up @@ -328,12 +348,12 @@
}
},
{
"type": "console.page/route",
"type": "console.page/resource/details",
"properties": {
"path": [
"/k8s/ns/:ns/virtualmachinesnapshots/:name",
"/k8s/ns/:ns/snapshot.kubevirt.io~v1alpha1~VirtualMachineSnapshot/:name"
],
"model": {
"group": "snapshot.kubevirt.io",
"kind": "VirtualMachineSnapshot"
},
"component": {
"$codeRef": "SnapshotDetailsPage.SnapshotDetailsPage"
}
Expand Down
5 changes: 3 additions & 2 deletions frontend/packages/kubevirt-plugin/src/components/vm-snapshots/vm-snapshot-details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
Timestamp,
} from '@console/internal/components/utils';
import { VM_DETAIL_SNAPSHOTS } from '../../constants';
import { VirtualMachineSnapshotModel } from '../../models';
import { VirtualMachineModel, VirtualMachineSnapshotModel } from '../../models';
import { kubevirtReferenceForModel } from '../../models/kubevirtReferenceForModel';
import { getName } from '../../selectors';
import {
Expand Down Expand Up @@ -114,6 +114,7 @@ export const SnapshotDetailsPage: React.FC<SnapshotDetailsPageProps> = ({ match,

const breadcrumbsForSnapshots = (snapshot) => {
const vmName = getVmSnapshotVmName(snapshot);
const vmReference = kubevirtReferenceForModel(VirtualMachineModel);
const vmNamespace = namespace || 'default';
return [
{
Expand All @@ -126,7 +127,7 @@ export const SnapshotDetailsPage: React.FC<SnapshotDetailsPageProps> = ({ match,
},
{
name: `${vmName} Snapshots`,
path: `/k8s/ns/${vmNamespace}/virtualmachines/${vmName}/${VM_DETAIL_SNAPSHOTS}`,
path: `/k8s/ns/${vmNamespace}/${vmReference}/${vmName}/${VM_DETAIL_SNAPSHOTS}`,
},
{
name: `${snapshotName} Details`,
Expand Down
37 changes: 11 additions & 26 deletions frontend/packages/kubevirt-plugin/src/models/kubevirtReferenceForModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,18 @@
import * as _ from 'lodash';
import { modelFor, referenceForGroupVersionKind } from '@console/internal/module/k8s';
import {
apiVersionForModel,
modelForGroupKind,
referenceForModel,
} from '@console/internal/module/k8s';
import { K8sKind } from '@console/internal/module/k8s/types';

const VERSIONS = ['v1', 'v1alpha3', 'v1beta1', 'v1alpha1'];

export const getKubevirtModelAvailableVersion = (model: K8sKind): string =>
_.uniq([model.apiVersion, ...VERSIONS]).find(
(v) => !!modelFor(referenceForGroupVersionKind(model.apiGroup)(v)(model.kind)),
);

export const kubevirtReferenceForModel = (model: K8sKind): string => {
const version = getKubevirtModelAvailableVersion(model);

if (version) {
return referenceForGroupVersionKind(model.apiGroup)(version)(model.kind);
}

return model.kind;
};

export const getKubevirtAvailableModel = (model: K8sKind): K8sKind => {
const version = getKubevirtModelAvailableVersion(model);
modelForGroupKind(model.apiGroup, model.kind)?.apiVersion || model.apiVersion;

if (version) {
return modelFor(referenceForGroupVersionKind(model.apiGroup)(version)(model.kind));
}
export const kubevirtReferenceForModel = (model: K8sKind): string =>
referenceForModel(modelForGroupKind(model.apiGroup, model.kind) || model);

return model;
};
export const getKubevirtAvailableModel = (model: K8sKind): K8sKind =>
modelForGroupKind(model.apiGroup, model.kind) || model;

export const getKubevirtModelAvailableAPIVersion = (model: K8sKind): string =>
`${model.apiGroup}/${getKubevirtModelAvailableVersion(model) || model.apiVersion}`;
apiVersionForModel(modelForGroupKind(model.apiGroup, model.kind) || model);