removed old method and added new test vm

kustomization.yaml

@@ -6,6 +6,8 @@ resources:
   - network/ks-lb.yaml
   - windows-vm-standard/ks-vm.yaml
   - windows-vm-standard/ks-pvc.yaml
+  - windows-vm-standard-dev/ks-vm.yaml
+  - windows-vm-standard-dev/ks-pvc.yaml
   - ubuntu-vm-1/ks.yaml
   - ubuntu-vm-2/ks.yaml
   - windows-vm-1/ks.yaml

windows-vm-1/windows/windows.yaml

@@ -1,67 +0,0 @@
-apiVersion: kubevirt.io/v1
-kind: VirtualMachine
-metadata:
-  name: windows-server-2022-basic
-  namespace: ${TENANT_NAMESPACE}
-spec:
-  running: true
-  template:
-    metadata:
-      annotations:
-        vm.kubevirt.io/os: win2k22
-        vm.kubevirt.io/workload: server
-      labels:
-        kubevirt.io/domain: windows-server-2022-basic
-        kubevirt.io/size: small
-    spec:
-      domain:
-        cpu:
-          cores: 1
-          sockets: 1
-          threads: 1
-        devices:
-          disks:
-            - disk:
-                bus: virtio
-              name: rootdisk
-          interfaces:
-            - masquerade: {}
-              model: virtio
-              name: default
-          networkInterfaceMultiqueue: true
-          rng: {}
-        features:
-          acpi: {}
-          smm:
-            enabled: true
-        firmware:
-          bootloader:
-            efi: {}
-        memory:
-          guest: 4Gi
-      hostname: windows-server-2022-basic
-      networks:
-        - name: default
-          pod: {}
-      terminationGracePeriodSeconds: 180
-      volumes:
-        - name: rootdisk
-          dataVolume:
-            name: windows-server-2022-basic-dv
----
-apiVersion: cdi.kubevirt.io/v1beta1
-kind: DataVolume
-metadata:
-  name: windows-server-2022-basic-dv
-  namespace: ${TENANT_NAMESPACE}
-spec:
-  source:
-    http:
-      url: http://nginx.demo.svc.cluster.local:8080/windows-server-2022-uefi-ns.qcow2
-  pvc:
-    accessModes:
-      - ReadWriteOnce
-    resources:
-      requests:
-        storage: 120Gi
-    storageClassName: ibm-spectrum-scale-fileset

windows-vm-standard-dev/ks-pvc.yaml

@@ -1,13 +1,13 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: &app windows-vm-1
+  name: &app windows-pvc-dev
   namespace: ${TENANT_NAMESPACE}
 spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./windows-vm-1/windows
+  path: ./windows-vm-standard-dev/pvc
   prune: true
   sourceRef:
     kind: GitRepository
@@ -15,4 +15,4 @@ spec:
   wait: false
   interval: 30m
   retryInterval: 1m
-  timeout: 5m
+  timeout: 5m

windows-vm-standard-dev/ks-vm.yaml

@@ -0,0 +1,18 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: &app windows-vm-standard-dev
+  namespace: ${TENANT_NAMESPACE}
+spec:
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
+  path: ./windows-vm-standard-dev/vm
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: tenant-repos
+  wait: false
+  interval: 30m
+  retryInterval: 1m
+  timeout: 5m

windows-vm-standard-dev/pvc/datadisk.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: windows-vm-datadisk-dev
+spec:
+  storageClassName: ibm-spectrum-scale-fileset
+  volumeMode: Filesystem
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 200Gi

windows-vm-standard-dev/vm/server.yaml

@@ -0,0 +1,120 @@
+apiVersion: kubevirt.io/v1
+kind: VirtualMachine
+metadata:
+  name: windows-vm-standard-dev
+  namespace: ${TENANT_NAMESPACE}
+spec:
+  dataVolumeTemplates:
+    - apiVersion: cdi.kubevirt.io/v1beta1
+      kind: DataVolume
+      metadata:
+        creationTimestamp: null
+        name: windows-rootdisk-dev
+      spec:
+        source:
+          http:
+            url: 'http://nginx.demo.svc.cluster.local:8080/windows-server-2022-uefi-ns.qcow2'
+        storage:
+          resources:
+            requests:
+              storage: 60Gi
+  running: true
+  template:
+    metadata:
+      annotations:
+        vm.kubevirt.io/flavor: medium
+        vm.kubevirt.io/os: windows2k22
+        vm.kubevirt.io/workload: server
+      creationTimestamp: null
+      labels:
+        kubevirt.io/domain: windows-vm-standard-dev
+        kubevirt.io/size: medium
+    spec:
+      architecture: amd64
+      domain:
+        clock:
+          timer:
+            hpet:
+              present: false
+            hyperv: {}
+            pit:
+              tickPolicy: delay
+            rtc:
+              tickPolicy: catchup
+          utc: {}
+        cpu:
+          cores: 2
+          sockets: 1
+          threads: 2
+        devices:
+          disks:
+            - disk:
+                bus: sata
+              name: rootdisk-dev
+            - cdrom:
+                bus: sata
+              name: windows-drivers-disk
+            - disk:
+                bus: sata
+              name: datadisk-dev
+          inputs:
+            - bus: usb
+              name: tablet
+              type: tablet
+          networkInterfaceMultiqueue: true    
+          interfaces:
+            - name: default
+              masquerade: {}
+              ports:
+              - port: 8080
+              - port: 443
+              - port: 22
+              - port: 3389
+          tpm: {}
+        features:
+          acpi: {}
+          apic: {}
+          hyperv:
+            reenlightenment: {}
+            ipi: {}
+            synic: {}
+            synictimer:
+              direct: {}
+            spinlocks:
+              spinlocks: 8191
+            reset: {}
+            relaxed: {}
+            vpindex: {}
+            runtime: {}
+            tlbflush: {}
+            frequencies: {}
+            vapic: {}
+          smm: {}
+        firmware:
+          bootloader:
+            efi:
+              secureBoot: true
+        machine:
+          type: pc-q35-rhel9.2.0
+        memory:
+          guest: 4Gi
+        resources: {}
+      networks:
+        - name: default
+          pod: {}
+      terminationGracePeriodSeconds: 3600
+      volumes:
+        - name: rootdisk-dev
+          dataVolume:
+            name: windows-rootdisk-dev
+        - name: datadisk-dev
+          persistentVolumeClaim:
+            claimName: windows-vm-datadisk-dev
+        #- name: cloudinitdisk
+        #  cloudInitNoCloud:
+        #    secretRef:
+        #      name: windows-cloud-init
+        - containerDisk:
+            image: 'registry.redhat.io/container-native-virtualization/virtio-win-rhel9@sha256:841b89fee12860d1073310ce91a04a61f7bdeb1a8bda68204345b45aa45e6023'
+          name: windows-drivers-disk
+

windows-vm-standard/vm/server.yaml

@@ -38,7 +38,6 @@ spec:
           networkInterfaceMultiqueue: true
           interfaces:
             - name: default
-              model: virtio
               masquerade: {}
               ports:
               - port: 8080
@@ -47,10 +46,10 @@ spec:
               - port: 3389
           disks:
             - disk:
-                bus: virtio
+                bus: sata
               name: rootdisk
             - disk:
-                bus: virtio
+                bus: sata
               name: datadisk
            # - disk:
            #     bus: scsi