From 583f604437bacad7c3caf61356289da7cf4e54af Mon Sep 17 00:00:00 2001 From: "maximilian.bartz" Date: Tue, 2 Sep 2025 15:41:44 +0200 Subject: [PATCH] Clean up and name conflic resolve Signed-off-by: maximilian.bartz --- kustomization.yaml | 5 -- ubuntu-vm-3/ks.yaml | 2 +- ubuntu-vm-3/ubuntu/ubuntu-vm.yaml | 50 ------------------- .../vm/pvc/ubuntu-datadisk.yaml | 4 +- .../vm/ubuntu/ubuntu-vm.yaml | 10 ++-- ubuntu-vm-4-john/ks.yaml | 18 ------- ubuntu-vm-4-john/ubuntu/ubuntu-vm.yaml | 48 ------------------ ubuntu-vm-5/ks.yaml | 18 ------- ubuntu-vm-6/ks.yaml | 18 ------- ubuntu-vm-6/ubuntu/ubuntu-vm.yaml | 50 ------------------- 10 files changed, 8 insertions(+), 215 deletions(-) delete mode 100644 ubuntu-vm-3/ubuntu/ubuntu-vm.yaml rename {ubuntu-vm-5 => ubuntu-vm-3}/vm/pvc/ubuntu-datadisk.yaml (81%) rename {ubuntu-vm-5 => ubuntu-vm-3}/vm/ubuntu/ubuntu-vm.yaml (86%) delete mode 100644 ubuntu-vm-4-john/ks.yaml delete mode 100644 ubuntu-vm-4-john/ubuntu/ubuntu-vm.yaml delete mode 100644 ubuntu-vm-5/ks.yaml delete mode 100644 ubuntu-vm-6/ks.yaml delete mode 100644 ubuntu-vm-6/ubuntu/ubuntu-vm.yaml diff --git a/kustomization.yaml b/kustomization.yaml index 079b6a6..9b41353 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -12,9 +12,6 @@ resources: - ubuntu-vm-1/ks.yaml - ubuntu-vm-2/ks.yaml - ubuntu-vm-3/ks.yaml - - ubuntu-vm-4-john/ks.yaml - - ubuntu-vm-5/ks.yaml - - ubuntu-vm-6/ks.yaml - deployment/ks.yaml - container/ks-debug.yaml - templates/image-server/ks-nginx.yaml @@ -23,5 +20,3 @@ resources: - templates/windowsserver/ks-flavor.yaml - templates/windowsserver-rh/ks-flavor.yaml - postgres/ks.yaml -# - windows-vm-standard-john/ks-vm.yaml -# - windows-vm-standard-john/ks-pvc.yaml diff --git a/ubuntu-vm-3/ks.yaml b/ubuntu-vm-3/ks.yaml index 12912dc..248c295 100644 --- a/ubuntu-vm-3/ks.yaml +++ b/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 diff --git a/ubuntu-vm-3/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-3/ubuntu/ubuntu-vm.yaml deleted file mode 100644 index ae02fee..0000000 --- a/ubuntu-vm-3/ubuntu/ubuntu-vm.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/ubuntu-vm-5/vm/pvc/ubuntu-datadisk.yaml b/ubuntu-vm-3/vm/pvc/ubuntu-datadisk.yaml similarity index 81% rename from ubuntu-vm-5/vm/pvc/ubuntu-datadisk.yaml rename to ubuntu-vm-3/vm/pvc/ubuntu-datadisk.yaml index d6ce155..76aa597 100644 --- a/ubuntu-vm-5/vm/pvc/ubuntu-datadisk.yaml +++ b/ubuntu-vm-3/vm/pvc/ubuntu-datadisk.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: ubuntu-datadisk-1 + name: ubuntu-datadisk-3 namespace: ${TENANT_NAMESPACE} labels: - app: ubuntu-vm-1 + app: ubuntu-vm-3 spec: volumeMode: Filesystem accessModes: diff --git a/ubuntu-vm-5/vm/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-3/vm/ubuntu/ubuntu-vm.yaml similarity index 86% rename from ubuntu-vm-5/vm/ubuntu/ubuntu-vm.yaml rename to ubuntu-vm-3/vm/ubuntu/ubuntu-vm.yaml index a30a590..09a6912 100644 --- a/ubuntu-vm-5/vm/ubuntu/ubuntu-vm.yaml +++ b/ubuntu-vm-3/vm/ubuntu/ubuntu-vm.yaml @@ -1,7 +1,7 @@ apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: - name: &name ubuntu-vm-1 + name: &name ubuntu-vm-3 namespace: ${TENANT_NAMESPACE} spec: running: true @@ -12,13 +12,13 @@ spec: kubevirt.io/domain: *name spec: hostname: ubuntu - subdomain: vitabyte + subdomain: test domain: devices: disks: - disk: bus: scsi - name: ubuntu-rootdisk + name: ubuntu-rootdisk-3 - disk: bus: scsi name: ubuntu-datadisk @@ -37,12 +37,12 @@ spec: cpu: 2 memory: 2Gi volumes: - - name: ubuntu-rootdisk + - name: ubuntu-rootdisk-3 containerDisk: image: quay.io/containerdisks/ubuntu:22.04 - name: ubuntu-datadisk persistentVolumeClaim: - claimName: ubuntu-datadisk-1 + claimName: ubuntu-datadisk-3 - name: cloudinit-disk cloudInitNoCloud: secretRef: diff --git a/ubuntu-vm-4-john/ks.yaml b/ubuntu-vm-4-john/ks.yaml deleted file mode 100644 index f117b31..0000000 --- a/ubuntu-vm-4-john/ks.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: &app ubuntu-vm-4-john - namespace: ${TENANT_NAMESPACE} -spec: - commonMetadata: - labels: - app.kubernetes.io/name: *app - path: ./ubuntu-vm-4-john/ubuntu - prune: true - sourceRef: - kind: GitRepository - name: tenant-repos - wait: false - interval: 30m - retryInterval: 1m - timeout: 5m diff --git a/ubuntu-vm-4-john/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-4-john/ubuntu/ubuntu-vm.yaml deleted file mode 100644 index a7448b3..0000000 --- a/ubuntu-vm-4-john/ubuntu/ubuntu-vm.yaml +++ /dev/null @@ -1,48 +0,0 @@ -apiVersion: kubevirt.io/v1 -kind: VirtualMachine -metadata: - name: ubuntu-vm-4-john - namespace: kubevirt-vms -spec: - running: true - template: - metadata: - labels: - kubevirt.io/domain: ubuntu-vm-4-john - 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 - hostname: ubuntu-vm-2 - ssh_pwauth: True - users: - - name: ubuntu - ssh-authorized-keys: - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPqlhZW/pPLK8zENt3o6tgl0QVinhGAF1sHvajqq3UvI ubuntu - sudo: ['ALL=(ALL) NOPASSWD:ALL'] - shell: /bin/bash \ No newline at end of file diff --git a/ubuntu-vm-5/ks.yaml b/ubuntu-vm-5/ks.yaml deleted file mode 100644 index d540852..0000000 --- a/ubuntu-vm-5/ks.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: &app ubuntu-vm-5 - namespace: ${TENANT_NAMESPACE} -spec: - commonMetadata: - labels: - app.kubernetes.io/name: *app - path: ./ubuntu-vm-5/vm - prune: true - sourceRef: - kind: GitRepository - name: tenant-repos - wait: false - interval: 30m - retryInterval: 1m - timeout: 5m diff --git a/ubuntu-vm-6/ks.yaml b/ubuntu-vm-6/ks.yaml deleted file mode 100644 index d030e48..0000000 --- a/ubuntu-vm-6/ks.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: &app ubuntu-vm-6 - namespace: ${TENANT_NAMESPACE} -spec: - commonMetadata: - labels: - app.kubernetes.io/name: *app - path: ./ubuntu-vm-3/ubuntu - prune: true - sourceRef: - kind: GitRepository - name: tenant-repos - wait: false - interval: 30m - retryInterval: 1m - timeout: 5m diff --git a/ubuntu-vm-6/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-6/ubuntu/ubuntu-vm.yaml deleted file mode 100644 index ae02fee..0000000 --- a/ubuntu-vm-6/ubuntu/ubuntu-vm.yaml +++ /dev/null @@ -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 \ No newline at end of file