Getting the encrypt image workflow to begin working while fixing up some build errors

This commit is contained in:
Cody Jackson 2024-09-27 11:37:47 -07:00 committed by Francesco Torchia
parent 8b6dbc1789
commit fd39fdf173
No known key found for this signature in database
GPG Key ID: E6D011B7415D4393
5 changed files with 8 additions and 14 deletions

View File

@ -83,10 +83,12 @@ export default {
}
if (image && cryptoOperation) {
const imageObject = JSON.parse(image);
this.value.spec.securityParameters = {
cryptoOperation,
sourceImageName: image.metadata.name,
sourceImageNamespace: image.metadata.namespace
sourceImageName: imageObject.metadata.name,
sourceImageNamespace: imageObject.metadata.namespace
}
}
@ -95,7 +97,7 @@ export default {
}
return {
selectedImage: image || null,
selectedImage: null,
images: [],
url: this.value.spec.url,
files: [],

View File

@ -3,14 +3,11 @@ import { _EDIT } from '@shell/config/query-params';
import { allHash } from '@shell/utils/promise';
import LabeledSelect from '@shell/components/form/LabeledSelect';
import Banner from '@components/Banner/Banner.vue';
import CompatibilityMatrix from '../CompatibilityMatrix';
import DeviceList from './DeviceList';
import remove from 'lodash/remove';
import { set } from '@shell/utils/object';
import { HCI } from '../../../types';
import DeviceList from './DeviceList';
import CompatibilityMatrix from './CompatibilityMatrix';
import CompatibilityMatrix from '../CompatibilityMatrix';
export default {
name: 'VirtualMachinePCIDevices',

View File

@ -15,11 +15,8 @@ import Labels from '@shell/components/form/Labels';
import NodeScheduling from '@shell/components/form/NodeScheduling';
import PodAffinity from '@shell/components/form/PodAffinity';
import AccessCredentials from './VirtualMachineAccessCredentials';
import PciDevices from './VirtualMachinePciDevices/index';
import VGpuDevices from './VirtualMachineVGpuDevices/index';
import UsbDevices from './VirtualMachineUSBDevices/index';
import RestartVMDialog from '../../dialog/RestartVMDialog';
import KeyValue from '@shell/components/form/KeyValue';
import { clear } from '@shell/utils/array';
@ -35,7 +32,6 @@ import { parseVolumeClaimTemplates } from '@pkg/utils/vm';
import VM_MIXIN from '../../mixins/harvester-vm';
import { HCI } from '../../types';
import RestartVMDialog from '../../dialog/RestartVMDialog';
import VirtualMachineVGpuDevices from './VirtualMachineVGpuDevices/index';
import PciDevices from './VirtualMachinePciDevices/index';
import AccessCredentials from './VirtualMachineAccessCredentials';
import CloudConfig from './VirtualMachineCloudConfig';

View File

@ -1,5 +1,4 @@
import { clone } from '@shell/utils/object';
import Secret from '@shell/models/secret';
import { HCI } from '../../types';
import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../../config/harvester';
import Secret from '@shell/models/secret';

View File

@ -88,7 +88,7 @@ export default class HciVmImage extends HarvesterResource {
name: `${ HARVESTER_PRODUCT }-c-cluster-resource-create`,
params: { resource: HCI.IMAGE },
query: {
image: this,
image: JSON.stringify({metadata: { name: this.metadata.name, namespace: this.metadata.namespace }}),
fromPage: HCI.IMAGE,
sourceType: 'clone',
cryptoOperation: 'encrypt'
@ -103,7 +103,7 @@ export default class HciVmImage extends HarvesterResource {
name: `${ HARVESTER_PRODUCT }-c-cluster-resource-create`,
params: { resource: HCI.IMAGE },
query: {
image: this,
image: JSON.stringify({metadata: { name: this.metadata.name, namespace: this.metadata.namespace }}),
fromPage: HCI.IMAGE,
sourceType: 'clone',
cryptoOperation: 'decrypt'