Skip to content

Move yaml tempalte to models dir #1842

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 3 commits into from
Jun 29, 2019
Merged

Move yaml tempalte to models dir #1842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bef2876
Move yaml tempalte to models dir
yaacov Jun 27, 2019
ed4e7f5
typo
yaacov Jun 27, 2019
e0a8d6f
rename template files
yaacov Jun 28, 2019
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
0 ...nd/packages/kubevirt-plugin/src/models.ts → ...kages/kubevirt-plugin/src/models/index.ts
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions frontend/packages/kubevirt-plugin/src/models/templates/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from './vm-template-yaml';
export * from './vm-yaml';
48 changes: 4 additions & 44 deletions ...ges/kubevirt-plugin/src/yaml-templates.ts → .../src/models/templates/vm-template-yaml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,10 @@
import { Map as ImmutableMap } from 'immutable';

import { TemplateModel } from '@console/internal/models';
import { VirtualMachineModel } from './models';

export const yamlTemplates = ImmutableMap()
.setIn(
[VirtualMachineModel, 'default'],
`
apiVersion: ${VirtualMachineModel.apiGroup}/${VirtualMachineModel.apiVersion}
kind: ${VirtualMachineModel.kind}
metadata:
name: example
spec:
running: false
template:
spec:
domain:
devices:
disks:
- name: containerdisk
disk:
bus: virtio
- name: cloudinitdisk
disk:
bus: virtio
interfaces:
- name: default
bridge: {}
resources:
requests:
memory: 64M
networks:
- name: default
pod: {}
volumes:
- name: containerdisk
containerDisk:
image: kubevirt/cirros-registry-disk-demo
- name: cloudinitdisk
cloudInitNoCloud:
userDataBase64: SGkuXG4=
`,
)
.setIn(
[TemplateModel, 'vm-template'],
`
export const VMTemplateYAMLTemplates = ImmutableMap().setIn(
['vm-template'],
`
apiVersion: ${TemplateModel.apiGroup}/${TemplateModel.apiVersion}
kind: ${TemplateModel.kind}
metadata:
Expand Down Expand Up @@ -113,4 +73,4 @@ parameters:
description: Amount of cores
value: '4'
`,
);
);
42 changes: 42 additions & 0 deletions frontend/packages/kubevirt-plugin/src/models/templates/vm-yaml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { Map as ImmutableMap } from 'immutable';

import { VirtualMachineModel } from '..';

export const VirtualMachineYAMLTemplates = ImmutableMap().setIn(
['default'],
`
apiVersion: ${VirtualMachineModel.apiGroup}/${VirtualMachineModel.apiVersion}
kind: ${VirtualMachineModel.kind}
metadata:
name: example
spec:
running: false
template:
spec:
domain:
devices:
disks:
- name: containerdisk
disk:
bus: virtio
- name: cloudinitdisk
disk:
bus: virtio
interfaces:
- name: default
bridge: {}
resources:
requests:
memory: 64M
networks:
- name: default
pod: {}
volumes:
- name: containerdisk
containerDisk:
image: kubevirt/cirros-registry-disk-demo
- name: cloudinitdisk
cloudInitNoCloud:
userDataBase64: SGkuXG4=
`,
);
6 changes: 3 additions & 3 deletions frontend/packages/kubevirt-plugin/src/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
import { TemplateModel } from '@console/internal/models';

import * as models from './models';
import { yamlTemplates } from './yaml-templates';
import { VMTemplateYAMLTemplates, VirtualMachineYAMLTemplates } from './models/templates';

import './style.scss';

Expand Down Expand Up @@ -82,14 +82,14 @@ const plugin: Plugin<ConsumedExtensions> = [
type: 'YAMLTemplate',
properties: {
model: models.VirtualMachineModel,
template: yamlTemplates.getIn([models.VirtualMachineModel, 'default']),
template: VirtualMachineYAMLTemplates.getIn(['default']),
},
},
{
type: 'YAMLTemplate',
properties: {
model: TemplateModel,
template: yamlTemplates.getIn([TemplateModel, 'vm-template']),
template: VMTemplateYAMLTemplates.getIn(['vm-template']),
templateName: 'vm-template',
},
},
Expand Down