From 766e20575b9bb31aff429df61c827e81f820dfb5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 5 Aug 2025 23:19:18 +0000 Subject: [PATCH 01/12] feat(docker-image)!: Update quay.io/containerdisks/ubuntu Docker tag to v24 --- firewall-s3/vm/ksd/vm/strongswan.yaml | 2 +- ubuntu-vm-1/ubuntu/ubuntu-vm.yaml | 2 +- ubuntu-vm-2/ubuntu/ubuntu-vm.yaml | 2 +- ubuntu-vm-3/ubuntu/ubuntu-vm.yaml | 2 +- ubuntu-vm-4-john/ubuntu/ubuntu-vm.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/firewall-s3/vm/ksd/vm/strongswan.yaml b/firewall-s3/vm/ksd/vm/strongswan.yaml index e346a59..8ef5371 100644 --- a/firewall-s3/vm/ksd/vm/strongswan.yaml +++ b/firewall-s3/vm/ksd/vm/strongswan.yaml @@ -57,7 +57,7 @@ spec: volumes: - name: containerdisk containerDisk: - image: quay.io/containerdisks/ubuntu:22.04 + image: quay.io/containerdisks/ubuntu:24.04 - name: cloudinitdisk cloudInitNoCloud: userData: | diff --git a/ubuntu-vm-1/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-1/ubuntu/ubuntu-vm.yaml index 31e1d2e..0591d23 100644 --- a/ubuntu-vm-1/ubuntu/ubuntu-vm.yaml +++ b/ubuntu-vm-1/ubuntu/ubuntu-vm.yaml @@ -33,7 +33,7 @@ spec: volumes: - name: containerdisk containerDisk: - image: quay.io/containerdisks/ubuntu:22.04 + image: quay.io/containerdisks/ubuntu:24.04 - name: cloudinitdisk cloudInitNoCloud: userData: | diff --git a/ubuntu-vm-2/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-2/ubuntu/ubuntu-vm.yaml index 78e909a..85e3a0d 100644 --- a/ubuntu-vm-2/ubuntu/ubuntu-vm.yaml +++ b/ubuntu-vm-2/ubuntu/ubuntu-vm.yaml @@ -33,7 +33,7 @@ spec: volumes: - name: containerdisk containerDisk: - image: quay.io/containerdisks/ubuntu:22.04 + image: quay.io/containerdisks/ubuntu:24.04 - name: cloudinitdisk cloudInitNoCloud: userData: | diff --git a/ubuntu-vm-3/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-3/ubuntu/ubuntu-vm.yaml index ae02fee..1d08b69 100644 --- a/ubuntu-vm-3/ubuntu/ubuntu-vm.yaml +++ b/ubuntu-vm-3/ubuntu/ubuntu-vm.yaml @@ -33,7 +33,7 @@ spec: volumes: - name: containerdisk containerDisk: - image: quay.io/containerdisks/ubuntu:22.04 + image: quay.io/containerdisks/ubuntu:24.04 - name: cloudinitdisk cloudInitNoCloud: userData: | diff --git a/ubuntu-vm-4-john/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-4-john/ubuntu/ubuntu-vm.yaml index a7448b3..46a95e5 100644 --- a/ubuntu-vm-4-john/ubuntu/ubuntu-vm.yaml +++ b/ubuntu-vm-4-john/ubuntu/ubuntu-vm.yaml @@ -33,7 +33,7 @@ spec: volumes: - name: containerdisk containerDisk: - image: quay.io/containerdisks/ubuntu:22.04 + image: quay.io/containerdisks/ubuntu:24.04 - name: cloudinitdisk cloudInitNoCloud: userData: | From c2228f4035911c38f52753d4b13d7803ece56246 Mon Sep 17 00:00:00 2001 From: "maximilian.bartz" Date: Wed, 6 Aug 2025 11:36:25 +0200 Subject: [PATCH 02/12] Datasource under investigation --- templates/windowsserver-rh/flavor/small.yaml | 8 ++++---- windows-vm-standard-dev/vm/server.yaml | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/windowsserver-rh/flavor/small.yaml b/templates/windowsserver-rh/flavor/small.yaml index 70bacca..6b5f91f 100644 --- a/templates/windowsserver-rh/flavor/small.yaml +++ b/templates/windowsserver-rh/flavor/small.yaml @@ -37,13 +37,13 @@ objects: spec: domain: cpu: - cores: 1 + cores: 2 sockets: 1 - threads: 1 + threads: 2 devices: disks: - disk: - bus: virtio + bus: scsi name: rootdisk interfaces: - masquerade: {} @@ -77,7 +77,7 @@ objects: spec: source: http: - url: http://nginx.demo.svc.cluster.local:8080/windows-server-2022-uefi-ns.qcow2 + url: http://nginx.demo.svc.cluster.local:80/windows-server-2022-uefi-ns.qcow2 pvc: accessModes: - ReadWriteOnce diff --git a/windows-vm-standard-dev/vm/server.yaml b/windows-vm-standard-dev/vm/server.yaml index 1b42bdc..65420d2 100644 --- a/windows-vm-standard-dev/vm/server.yaml +++ b/windows-vm-standard-dev/vm/server.yaml @@ -15,10 +15,10 @@ spec: resources: requests: storage: 80Gi - sourceRef: - kind: DataSource - name: win2k22 - namespace: kubevirt-os-images + #sourceRef: + # kind: DataSource + # name: win2k22 + # namespace: kubevirt-os-images runStrategy: Always template: metadata: @@ -51,10 +51,10 @@ spec: - port: 3389 disks: - disk: - bus: sata + bus: scsi name: rootdisk-dev - disk: - bus: sata + bus: scsi name: datadisk-dev # - disk: # bus: scsi From c745d61a2505b8bb2bfa4320011c562c03215c09 Mon Sep 17 00:00:00 2001 From: "maximilian.bartz" Date: Wed, 6 Aug 2025 11:44:10 +0200 Subject: [PATCH 03/12] reduce cpu request and limit --- windows-vm-standard-dev/vm/server.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows-vm-standard-dev/vm/server.yaml b/windows-vm-standard-dev/vm/server.yaml index 65420d2..b22c8ec 100644 --- a/windows-vm-standard-dev/vm/server.yaml +++ b/windows-vm-standard-dev/vm/server.yaml @@ -27,7 +27,7 @@ spec: spec: domain: cpu: - cores: 4 + cores: 2 memory: guest: 8Gi features: @@ -62,10 +62,10 @@ spec: resources: requests: memory: 8Gi - cpu: 4 + cpu: 2 limits: memory: 8Gi - cpu: 4 + cpu: 2 networks: - name: default pod: {} From 6386490401b7c848f201a53f7fcc8196e6bc68ef Mon Sep 17 00:00:00 2001 From: "maximilian.bartz" Date: Wed, 6 Aug 2025 13:31:19 +0200 Subject: [PATCH 04/12] update bus type for root disk --- windows-vm-standard-dev/vm/server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows-vm-standard-dev/vm/server.yaml b/windows-vm-standard-dev/vm/server.yaml index b22c8ec..18ac667 100644 --- a/windows-vm-standard-dev/vm/server.yaml +++ b/windows-vm-standard-dev/vm/server.yaml @@ -51,7 +51,7 @@ spec: - port: 3389 disks: - disk: - bus: scsi + bus: sata name: rootdisk-dev - disk: bus: scsi From 97b0f457d1269503f4c187e5daea738517180a13 Mon Sep 17 00:00:00 2001 From: "maximilian.bartz" Date: Fri, 8 Aug 2025 15:48:57 +0200 Subject: [PATCH 05/12] added lb for windows dev machine --- network/loadbalancers/windows-dev-lb.yaml | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 network/loadbalancers/windows-dev-lb.yaml diff --git a/network/loadbalancers/windows-dev-lb.yaml b/network/loadbalancers/windows-dev-lb.yaml new file mode 100644 index 0000000..5b1f064 --- /dev/null +++ b/network/loadbalancers/windows-dev-lb.yaml @@ -0,0 +1,29 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: windows-lb + namespace: ${TENANT_NAMESPACE} + labels: + app.kubernetes.io/component: windows-lb +spec: + type: LoadBalancer + ports: + - port: 8080 + name: http + targetPort: 8080 + protocol: TCP + - port: 443 + name: https + targetPort: 443 + protocol: TCP + - port: 65022 + name: ssh + targetPort: 22 + protocol: TCP + - port: 3389 + name: rdp + targetPort: 3389 + protocol: TCP + selector: + kubevirt.io/domain: windows-vm-standard-dev From d5c6595b36007d080498bc2675fa6adb7b75e095 Mon Sep 17 00:00:00 2001 From: "maximilian.bartz" Date: Fri, 8 Aug 2025 15:53:11 +0200 Subject: [PATCH 06/12] forgot to change label --- network/loadbalancers/windows-dev-lb.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/network/loadbalancers/windows-dev-lb.yaml b/network/loadbalancers/windows-dev-lb.yaml index 5b1f064..5922a1d 100644 --- a/network/loadbalancers/windows-dev-lb.yaml +++ b/network/loadbalancers/windows-dev-lb.yaml @@ -2,10 +2,10 @@ apiVersion: v1 kind: Service metadata: - name: windows-lb + name: windows-lb-dev namespace: ${TENANT_NAMESPACE} labels: - app.kubernetes.io/component: windows-lb + app.kubernetes.io/component: windows-lb-dev spec: type: LoadBalancer ports: From 89b9b917185347532cb0aee15e13b41c4efc37fa Mon Sep 17 00:00:00 2001 From: "maximilian.bartz" Date: Fri, 8 Aug 2025 15:59:43 +0200 Subject: [PATCH 07/12] moved john lb to network ks --- .../windows-lb.yaml => network/loadbalancers/windows-lb-john.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename windows-vm-standard-john/windows-lb.yaml => network/loadbalancers/windows-lb-john.yaml (100%) diff --git a/windows-vm-standard-john/windows-lb.yaml b/network/loadbalancers/windows-lb-john.yaml similarity index 100% rename from windows-vm-standard-john/windows-lb.yaml rename to network/loadbalancers/windows-lb-john.yaml From f09b344f191d320c5724bf25724340671e55d904 Mon Sep 17 00:00:00 2001 From: "maximilian.bartz" Date: Fri, 8 Aug 2025 16:02:28 +0200 Subject: [PATCH 08/12] test complete. removing LB to release IP --- kustomization.yaml | 1 - network/loadbalancers/windows-lb-john.yaml | 29 ---------------------- 2 files changed, 30 deletions(-) delete mode 100644 network/loadbalancers/windows-lb-john.yaml diff --git a/kustomization.yaml b/kustomization.yaml index 4ed98a0..6135f02 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -22,4 +22,3 @@ resources: - postgres/ks.yaml # - windows-vm-standard-john/ks-vm.yaml # - windows-vm-standard-john/ks-pvc.yaml -# - windows-vm-standard-john/windows-lb.yaml diff --git a/network/loadbalancers/windows-lb-john.yaml b/network/loadbalancers/windows-lb-john.yaml deleted file mode 100644 index e9ad9f8..0000000 --- a/network/loadbalancers/windows-lb-john.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: windows-lb-john - namespace: ${TENANT_NAMESPACE} - labels: - app.kubernetes.io/component: windows-lb-john -spec: - type: LoadBalancer - ports: - - port: 8080 - name: http - targetPort: 8080 - protocol: TCP - - port: 443 - name: https - targetPort: 443 - protocol: TCP - - port: 65022 - name: ssh - targetPort: 22 - protocol: TCP - - port: 3389 - name: rdp - targetPort: 3389 - protocol: TCP - selector: - kubevirt.io/domain: windows-vm-standard-john From a77c4f8bb4567077cdd0da7ce209b5249759ec6e Mon Sep 17 00:00:00 2001 From: "maximilian.bartz" Date: Thu, 14 Aug 2025 17:01:29 +0200 Subject: [PATCH 09/12] added vitabyte test --- kustomization.yaml | 1 + ubuntu-vm-5/ks.yaml | 18 +++++++++ ubuntu-vm-5/pvc/ubuntu-datadisk.yaml | 14 +++++++ ubuntu-vm-5/ubuntu/ubuntu-vm.yaml | 49 ++++++++++++++++++++++++ vars/demo/ubuntu-cloud-init.secrets.yaml | 23 +++++++++++ 5 files changed, 105 insertions(+) create mode 100644 ubuntu-vm-5/ks.yaml create mode 100644 ubuntu-vm-5/pvc/ubuntu-datadisk.yaml create mode 100644 ubuntu-vm-5/ubuntu/ubuntu-vm.yaml create mode 100644 vars/demo/ubuntu-cloud-init.secrets.yaml diff --git a/kustomization.yaml b/kustomization.yaml index 6135f02..4fe26e8 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -13,6 +13,7 @@ resources: - ubuntu-vm-2/ks.yaml - ubuntu-vm-3/ks.yaml - ubuntu-vm-4-john/ks.yaml + - ubuntu-vm-5/ks.yaml - container/ks-debug.yaml - templates/image-server/ks-nginx.yaml - templates/image-server/ks-pvc.yaml diff --git a/ubuntu-vm-5/ks.yaml b/ubuntu-vm-5/ks.yaml new file mode 100644 index 0000000..38d2fe4 --- /dev/null +++ b/ubuntu-vm-5/ks.yaml @@ -0,0 +1,18 @@ +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 + prune: true + sourceRef: + kind: GitRepository + name: tenant-repos + wait: false + interval: 30m + retryInterval: 1m + timeout: 5m diff --git a/ubuntu-vm-5/pvc/ubuntu-datadisk.yaml b/ubuntu-vm-5/pvc/ubuntu-datadisk.yaml new file mode 100644 index 0000000..d6ce155 --- /dev/null +++ b/ubuntu-vm-5/pvc/ubuntu-datadisk.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: ubuntu-datadisk-1 + namespace: ${TENANT_NAMESPACE} + labels: + app: ubuntu-vm-1 +spec: + volumeMode: Filesystem + accessModes: + - ReadWriteMany + resources: + requests: + storage: 50Gi \ No newline at end of file diff --git a/ubuntu-vm-5/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-5/ubuntu/ubuntu-vm.yaml new file mode 100644 index 0000000..a30a590 --- /dev/null +++ b/ubuntu-vm-5/ubuntu/ubuntu-vm.yaml @@ -0,0 +1,49 @@ +apiVersion: kubevirt.io/v1 +kind: VirtualMachine +metadata: + name: &name ubuntu-vm-1 + namespace: ${TENANT_NAMESPACE} +spec: + running: true + template: + metadata: + labels: + app: *name + kubevirt.io/domain: *name + spec: + hostname: ubuntu + subdomain: vitabyte + domain: + devices: + disks: + - disk: + bus: scsi + name: ubuntu-rootdisk + - 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 + containerDisk: + image: quay.io/containerdisks/ubuntu:22.04 + - name: ubuntu-datadisk + persistentVolumeClaim: + claimName: ubuntu-datadisk-1 + - name: cloudinit-disk + cloudInitNoCloud: + secretRef: + name: ubuntu-cloud-init \ No newline at end of file diff --git a/vars/demo/ubuntu-cloud-init.secrets.yaml b/vars/demo/ubuntu-cloud-init.secrets.yaml new file mode 100644 index 0000000..a6c8857 --- /dev/null +++ b/vars/demo/ubuntu-cloud-init.secrets.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Secret +metadata: + name: ubuntu-cloud-init +stringData: + userData: |- + #cloud-config + hostname: ubuntu + fqdn: ubuntu.vitabyte.basel.kvant.cloud + prefer_fqdn_over_hostname: false + users: + - name: vitabyte + ssh-authorized-keys: + - ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAHUMdz8TOsgNVavPkFkNoe6AtvTJi29t4ncS+EzX5gpG8LDsxLjTmUeFkTnyyP9Lw1y3JCo1dqF3HIzbaDRyc1MIgGinb6HoDAGzyTRAr/TzAPSlKeTVbGHVaLcneaLtuyKblgdGwl9VH2DWVZL+/s+IXVINubxxQjxHEVxRXJuOqnloQ== kubevirt@phoenix-systems.ch + sudo: ['ALL=(ALL) NOPASSWD:ALL'] + shell: /bin/bash + fs_setup: + - label: data + filesystem: ext4 + device: /dev/vdb + overwrite: false + mounts: + - [ /dev/vdb, /data, "ext4", "defaults,nofail", "0", "2" ] From 18efeeef184b89fe0d8efd9aadaeee6e99a0261d Mon Sep 17 00:00:00 2001 From: "maximilian.bartz" Date: Thu, 14 Aug 2025 17:07:21 +0200 Subject: [PATCH 10/12] test 2 --- ubuntu-vm-5/ks.yaml | 2 +- ubuntu-vm-5/{ => vm}/pvc/ubuntu-datadisk.yaml | 0 ubuntu-vm-5/{ => vm}/ubuntu/ubuntu-vm.yaml | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename ubuntu-vm-5/{ => vm}/pvc/ubuntu-datadisk.yaml (100%) rename ubuntu-vm-5/{ => vm}/ubuntu/ubuntu-vm.yaml (100%) diff --git a/ubuntu-vm-5/ks.yaml b/ubuntu-vm-5/ks.yaml index 38d2fe4..d540852 100644 --- a/ubuntu-vm-5/ks.yaml +++ b/ubuntu-vm-5/ks.yaml @@ -7,7 +7,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./ubuntu-vm-5 + path: ./ubuntu-vm-5/vm prune: true sourceRef: kind: GitRepository diff --git a/ubuntu-vm-5/pvc/ubuntu-datadisk.yaml b/ubuntu-vm-5/vm/pvc/ubuntu-datadisk.yaml similarity index 100% rename from ubuntu-vm-5/pvc/ubuntu-datadisk.yaml rename to ubuntu-vm-5/vm/pvc/ubuntu-datadisk.yaml diff --git a/ubuntu-vm-5/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-5/vm/ubuntu/ubuntu-vm.yaml similarity index 100% rename from ubuntu-vm-5/ubuntu/ubuntu-vm.yaml rename to ubuntu-vm-5/vm/ubuntu/ubuntu-vm.yaml From 3396f65ef92585d75698bd496fc2e157b79c0032 Mon Sep 17 00:00:00 2001 From: "maximilian.bartz" Date: Thu, 14 Aug 2025 17:12:57 +0200 Subject: [PATCH 11/12] test ubuntu simple --- kustomization.yaml | 1 + ubuntu-vm-6/ks.yaml | 18 +++++++++++ ubuntu-vm-6/ubuntu/ubuntu-vm.yaml | 50 +++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 ubuntu-vm-6/ks.yaml create mode 100644 ubuntu-vm-6/ubuntu/ubuntu-vm.yaml diff --git a/kustomization.yaml b/kustomization.yaml index 4fe26e8..4838871 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -14,6 +14,7 @@ resources: - ubuntu-vm-3/ks.yaml - ubuntu-vm-4-john/ks.yaml - ubuntu-vm-5/ks.yaml + - ubuntu-vm-6/ks.yaml - container/ks-debug.yaml - templates/image-server/ks-nginx.yaml - templates/image-server/ks-pvc.yaml diff --git a/ubuntu-vm-6/ks.yaml b/ubuntu-vm-6/ks.yaml new file mode 100644 index 0000000..d030e48 --- /dev/null +++ b/ubuntu-vm-6/ks.yaml @@ -0,0 +1,18 @@ +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 new file mode 100644 index 0000000..ae02fee --- /dev/null +++ b/ubuntu-vm-6/ubuntu/ubuntu-vm.yaml @@ -0,0 +1,50 @@ +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 From b6b9822f88ff04ed8d804dd3769ef02b5a4d3ef0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 14 Aug 2025 15:30:50 +0000 Subject: [PATCH 12/12] feat(docker-image)!: Update quay.io/containerdisks/ubuntu Docker tag to v24 --- firewall-s3/vm/ksd/vm/strongswan.yaml | 2 +- ubuntu-vm-1/ubuntu/ubuntu-vm.yaml | 2 +- ubuntu-vm-2/ubuntu/ubuntu-vm.yaml | 2 +- ubuntu-vm-3/ubuntu/ubuntu-vm.yaml | 2 +- ubuntu-vm-4-john/ubuntu/ubuntu-vm.yaml | 2 +- ubuntu-vm-5/vm/ubuntu/ubuntu-vm.yaml | 2 +- ubuntu-vm-6/ubuntu/ubuntu-vm.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/firewall-s3/vm/ksd/vm/strongswan.yaml b/firewall-s3/vm/ksd/vm/strongswan.yaml index e346a59..8ef5371 100644 --- a/firewall-s3/vm/ksd/vm/strongswan.yaml +++ b/firewall-s3/vm/ksd/vm/strongswan.yaml @@ -57,7 +57,7 @@ spec: volumes: - name: containerdisk containerDisk: - image: quay.io/containerdisks/ubuntu:22.04 + image: quay.io/containerdisks/ubuntu:24.04 - name: cloudinitdisk cloudInitNoCloud: userData: | diff --git a/ubuntu-vm-1/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-1/ubuntu/ubuntu-vm.yaml index 31e1d2e..0591d23 100644 --- a/ubuntu-vm-1/ubuntu/ubuntu-vm.yaml +++ b/ubuntu-vm-1/ubuntu/ubuntu-vm.yaml @@ -33,7 +33,7 @@ spec: volumes: - name: containerdisk containerDisk: - image: quay.io/containerdisks/ubuntu:22.04 + image: quay.io/containerdisks/ubuntu:24.04 - name: cloudinitdisk cloudInitNoCloud: userData: | diff --git a/ubuntu-vm-2/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-2/ubuntu/ubuntu-vm.yaml index 78e909a..85e3a0d 100644 --- a/ubuntu-vm-2/ubuntu/ubuntu-vm.yaml +++ b/ubuntu-vm-2/ubuntu/ubuntu-vm.yaml @@ -33,7 +33,7 @@ spec: volumes: - name: containerdisk containerDisk: - image: quay.io/containerdisks/ubuntu:22.04 + image: quay.io/containerdisks/ubuntu:24.04 - name: cloudinitdisk cloudInitNoCloud: userData: | diff --git a/ubuntu-vm-3/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-3/ubuntu/ubuntu-vm.yaml index ae02fee..1d08b69 100644 --- a/ubuntu-vm-3/ubuntu/ubuntu-vm.yaml +++ b/ubuntu-vm-3/ubuntu/ubuntu-vm.yaml @@ -33,7 +33,7 @@ spec: volumes: - name: containerdisk containerDisk: - image: quay.io/containerdisks/ubuntu:22.04 + image: quay.io/containerdisks/ubuntu:24.04 - name: cloudinitdisk cloudInitNoCloud: userData: | diff --git a/ubuntu-vm-4-john/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-4-john/ubuntu/ubuntu-vm.yaml index a7448b3..46a95e5 100644 --- a/ubuntu-vm-4-john/ubuntu/ubuntu-vm.yaml +++ b/ubuntu-vm-4-john/ubuntu/ubuntu-vm.yaml @@ -33,7 +33,7 @@ spec: volumes: - name: containerdisk containerDisk: - image: quay.io/containerdisks/ubuntu:22.04 + image: quay.io/containerdisks/ubuntu:24.04 - name: cloudinitdisk cloudInitNoCloud: userData: | diff --git a/ubuntu-vm-5/vm/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-5/vm/ubuntu/ubuntu-vm.yaml index a30a590..af49d0c 100644 --- a/ubuntu-vm-5/vm/ubuntu/ubuntu-vm.yaml +++ b/ubuntu-vm-5/vm/ubuntu/ubuntu-vm.yaml @@ -39,7 +39,7 @@ spec: volumes: - name: ubuntu-rootdisk containerDisk: - image: quay.io/containerdisks/ubuntu:22.04 + image: quay.io/containerdisks/ubuntu:24.04 - name: ubuntu-datadisk persistentVolumeClaim: claimName: ubuntu-datadisk-1 diff --git a/ubuntu-vm-6/ubuntu/ubuntu-vm.yaml b/ubuntu-vm-6/ubuntu/ubuntu-vm.yaml index ae02fee..1d08b69 100644 --- a/ubuntu-vm-6/ubuntu/ubuntu-vm.yaml +++ b/ubuntu-vm-6/ubuntu/ubuntu-vm.yaml @@ -33,7 +33,7 @@ spec: volumes: - name: containerdisk containerDisk: - image: quay.io/containerdisks/ubuntu:22.04 + image: quay.io/containerdisks/ubuntu:24.04 - name: cloudinitdisk cloudInitNoCloud: userData: |