Clean up and name conflic resolve

Signed-off-by: maximilian.bartz <maximilian.bartz@phoenix-systems.ch>

ubuntu-vm-3/ks.yaml

@@ -7,7 +7,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./ubuntu-vm-3/ubuntu
+  path: ./ubuntu-vm-3/vm
   prune: true
   sourceRef:
     kind: GitRepository

ubuntu-vm-3/ubuntu/ubuntu-vm.yaml

@@ -1,50 +0,0 @@
-apiVersion: kubevirt.io/v1
-kind: VirtualMachine
-metadata:
-  name: ubuntu-vm-3
-  namespace: ${TENANT_NAMESPACE}
-spec:
-  running: true
-  template:
-    metadata:
-      labels:
-        kubevirt.io/domain: ubuntu-vm-3
-    spec:
-      domain:
-        cpu:
-          cores: 2
-        devices:
-          disks:
-            - disk:
-                bus: virtio
-              name: containerdisk
-            - disk:
-                bus: virtio
-              name: cloudinitdisk
-        resources:
-          requests:
-            memory: 2Gi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2
-        memory:
-          guest: 2Gi
-      volumes:
-        - name: containerdisk
-          containerDisk:
-            image: quay.io/containerdisks/ubuntu:22.04
-        - name: cloudinitdisk
-          cloudInitNoCloud:
-            userData: |
-              #cloud-config
-              users:
-                - name: testuser
-                groups: [sudo]
-                sudo: "ALL=(ALL) NOPASSWD:ALL"
-                lock_passwd: false
-                passwd: "$6$oMZf5uou7t0.oAJ1$825Te06yt7JZwHSSj4MGQMjpd87LflANQpajCwIVPASkKZdOJo4L2bAEDDuK.jtu.fsRNc9bZAsYefmoqdN8O1"
-
-                chpasswd: 
-                expire: false
-                ssh_pwauth: true

ubuntu-vm-3/vm/pvc/ubuntu-datadisk.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: ubuntu-datadisk-3
+  namespace: ${TENANT_NAMESPACE}
+  labels:
+    app: ubuntu-vm-3
+spec:
+  volumeMode: Filesystem
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 50Gi

ubuntu-vm-3/vm/ubuntu/ubuntu-vm.yaml

@@ -0,0 +1,49 @@
+apiVersion: kubevirt.io/v1
+kind: VirtualMachine
+metadata:
+  name: &name ubuntu-vm-3
+  namespace: ${TENANT_NAMESPACE}
+spec:
+  running: true
+  template:
+    metadata:
+      labels:
+        app: *name
+        kubevirt.io/domain: *name
+    spec:
+      hostname: ubuntu
+      subdomain: test
+      domain:
+        devices:
+          disks:
+            - disk:
+                bus: scsi
+              name: ubuntu-rootdisk-3
+            - disk:
+                bus: scsi
+              name: ubuntu-datadisk
+            - disk:
+                bus: virtio
+              name: cloudinit-disk
+        cpu:
+          sockets: 1
+          cores: 2
+          threads: 1
+        resources:
+          requests:
+            cpu: 2     
+            memory: 2Gi
+          limits:
+            cpu: 2
+            memory: 2Gi
+      volumes:
+        - name: ubuntu-rootdisk-3
+          containerDisk:
+            image: quay.io/containerdisks/ubuntu:22.04
+        - name: ubuntu-datadisk
+          persistentVolumeClaim:
+            claimName: ubuntu-datadisk-3
+        - name: cloudinit-disk
+          cloudInitNoCloud:
+            secretRef:
+              name: ubuntu-cloud-init