Skip to content

Commit e95f5d2

Browse files
committed
Add a second disk dedicated for storage
Signed-off-by: JenTing Hsiao <[email protected]>
1 parent d050af0 commit e95f5d2

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

.werft/vm/manifests.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@ type VirtualMachineManifestArguments = {
1717
vmName: string;
1818
namespace: string;
1919
claimName: string;
20+
storageClaimName: string;
2021
userDataSecretName: string;
2122
};
2223

2324
export function VirtualMachineManifest({
2425
vmName,
2526
namespace,
2627
claimName,
28+
storageClaimName,
2729
userDataSecretName,
2830
}: VirtualMachineManifestArguments) {
2931
return `
@@ -33,7 +35,7 @@ kind: VirtualMachine
3335
metadata:
3436
namespace: ${namespace}
3537
annotations:
36-
harvesterhci.io/volumeClaimTemplates: '[{"metadata":{"name":"${claimName}","annotations":{"harvesterhci.io/imageId":"default/image-swrlp"}},"spec":{"accessModes":["ReadWriteMany"],"resources":{"requests":{"storage":"200Gi"}},"volumeMode":"Block","storageClassName":"longhorn-image-swrlp-onereplica"}}]'
38+
harvesterhci.io/volumeClaimTemplates: '[{"metadata":{"name":"${claimName}","annotations":{"harvesterhci.io/imageId":"default/image-swrlp"}},"spec":{"accessModes":["ReadWriteMany"],"resources":{"requests":{"storage":"200Gi"}},"volumeMode":"Block","storageClassName":"longhorn-image-swrlp-onereplica"}},{"metadata":{"name":"${storageClaimName}"},"spec":{"accessModes":["ReadWriteMany"],"resources":{"requests":{"storage":"30Gi"}},"volumeMode":"Block","storageClassName":"longhorn"}}]'
3739
network.harvesterhci.io/ips: "[]"
3840
labels:
3941
harvesterhci.io/creator: harvester
@@ -74,6 +76,9 @@ spec:
7476
bootOrder: 1
7577
disk:
7678
bus: scsi
79+
- name: storage
80+
disk:
81+
bus: virtio
7782
- name: cloudinitdisk
7883
disk:
7984
bus: virtio
@@ -89,6 +94,9 @@ spec:
8994
- name: system
9095
persistentVolumeClaim:
9196
claimName: ${claimName}
97+
- name: storage
98+
persistentVolumeClaim:
99+
claimName: ${storageClaimName}
92100
- name: cloudinitdisk
93101
cloudInitNoCloud:
94102
networkDataSecretRef:

.werft/vm/vm.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ export function startVM(options: { name: string }) {
5555
namespace,
5656
vmName: options.name,
5757
claimName: `${options.name}-${Date.now()}`,
58-
userDataSecretName
58+
storageClaimName: `${options.name}-storage-${Date.now()}`,
59+
userDataSecretName,
5960
}),
6061
{ validate: false }
6162
)
@@ -96,9 +97,10 @@ export function deleteVM(options: { name: string }) {
9697
namespace,
9798
vmName: options.name,
9899
claimName: `${options.name}-${Date.now()}`,
99-
userDataSecretName
100-
})
101-
)
100+
storageClaimName: `${options.name}-storage-${Date.now()}`,
101+
userDataSecretName,
102+
}),
103+
);
102104

103105
kubectlDeleteManifest(
104106
Manifests.NamespaceManifest({

0 commit comments

Comments
 (0)