phoenix-oss/tenant-demo
1
0
Fork 0
generated from phoenix-oss/tenant-tpl
Code Issues 1 Pull requests 4 Projects Releases Packages Wiki Activity Actions

Clean up and name conflic resolve

Browse source 
Signed-off-by: maximilian.bartz <maximilian.bartz@phoenix-systems.ch>
This commit is contained in:
maximilian.bartz 2025-09-02 15:41:44 +02:00
parent 3ba56fe3d2
commit 583f604437
Signed by: maximilian.bartz
SSH key fingerprint: SHA256:1ka7Nkw8AVUOGlH5exj7gc/TpNrrKK44ZFzaXCynvnw
10 changed files with 8 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kustomization.yaml
View file

@ -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

2
ubuntu-vm-3/ks.yaml
View file

@ -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

50
ubuntu-vm-3/ubuntu/ubuntu-vm.yaml
View file

@ -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

4
ubuntu-vm-5/vm/pvc/ubuntu-datadisk.yaml → ubuntu-vm-3/vm/pvc/ubuntu-datadisk.yaml
View file

@ -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:

10
ubuntu-vm-5/vm/ubuntu/ubuntu-vm.yaml → ubuntu-vm-3/vm/ubuntu/ubuntu-vm.yaml
View file

@ -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:

18
ubuntu-vm-4-john/ks.yaml
View file

@ -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

48
ubuntu-vm-4-john/ubuntu/ubuntu-vm.yaml
View file

@ -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

18
ubuntu-vm-5/ks.yaml
View file

@ -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

18
ubuntu-vm-6/ks.yaml
View file

@ -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

50
ubuntu-vm-6/ubuntu/ubuntu-vm.yaml
View file

@ -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