diff --git a/README.md b/README.md index 753db67..5f29893 100644 --- a/README.md +++ b/README.md @@ -21,3 +21,4 @@ $ oc get all -n tenant-tpl ``` + Great big fire diff --git a/deployment/ubuntu-deployment/datadisk.yaml b/deployment/ubuntu-deployment/datadisk.yaml index e314c58..9381bc3 100644 --- a/deployment/ubuntu-deployment/datadisk.yaml +++ b/deployment/ubuntu-deployment/datadisk.yaml @@ -8,7 +8,7 @@ metadata: spec: volumeMode: Filesystem accessModes: [ "ReadWriteOnce" ] - storageClassName: ocs-storagecluster-ceph-rbd + storageClassName: ibm-spectrum-scale-fileset resources: requests: storage: 50Gi \ No newline at end of file diff --git a/deployment/ubuntu-deployment/pod.yaml b/deployment/ubuntu-deployment/pod.yaml index 96fb845..345c66f 100644 --- a/deployment/ubuntu-deployment/pod.yaml +++ b/deployment/ubuntu-deployment/pod.yaml @@ -19,7 +19,7 @@ spec: subdomain: pod securityContext: runAsNonRoot: true - fsGroup: 1002070000 + fsGroup: 1001070000 fsGroupChangePolicy: OnRootMismatch seccompProfile: type: RuntimeDefault diff --git a/kustomization.yaml b/kustomization.yaml index b4ef8ad..9b41353 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -12,10 +12,7 @@ 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/ubuntu-deployment/ks.yaml + - deployment/ks.yaml - container/ks-debug.yaml - templates/image-server/ks-nginx.yaml - templates/image-server/ks-pvc.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 diff --git a/windows-vm-standard-john/ks-pvc.yaml b/windows-vm-standard-john/ks-pvc.yaml deleted file mode 100644 index 68e3154..0000000 --- a/windows-vm-standard-john/ks-pvc.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: &app windows-pvc-john - namespace: ${TENANT_NAMESPACE} -spec: - commonMetadata: - labels: - app.kubernetes.io/name: *app - path: ./windows-vm-standard-john/pvc - prune: true - sourceRef: - kind: GitRepository - name: tenant-repos - wait: false - interval: 30m - retryInterval: 1m - timeout: 5m \ No newline at end of file diff --git a/windows-vm-standard-john/ks-vm.yaml b/windows-vm-standard-john/ks-vm.yaml deleted file mode 100644 index 4b8608c..0000000 --- a/windows-vm-standard-john/ks-vm.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: &app windows-vm-standard-john - namespace: ${TENANT_NAMESPACE} -spec: - commonMetadata: - labels: - app.kubernetes.io/name: *app - path: ./windows-vm-standard-john/vm - prune: true - sourceRef: - kind: GitRepository - name: tenant-repos - wait: false - interval: 30m - retryInterval: 1m - timeout: 5m \ No newline at end of file diff --git a/windows-vm-standard-john/pvc/datadisk.yaml b/windows-vm-standard-john/pvc/datadisk.yaml deleted file mode 100644 index 6c901ab..0000000 --- a/windows-vm-standard-john/pvc/datadisk.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: windows-vm-datadisk-john -spec: - storageClassName: ibm-spectrum-scale-fileset - volumeMode: Filesystem - accessModes: - - ReadWriteMany - resources: - requests: - storage: 200Gi diff --git a/windows-vm-standard-john/vm/server.yaml b/windows-vm-standard-john/vm/server.yaml deleted file mode 100644 index bf952a8..0000000 --- a/windows-vm-standard-john/vm/server.yaml +++ /dev/null @@ -1,82 +0,0 @@ -apiVersion: kubevirt.io/v1 -kind: VirtualMachine -metadata: - name: windows-vm-standard-john - namespace: ${TENANT_NAMESPACE} -spec: - dataVolumeTemplates: - - metadata: - name: windows-rootdisk-john - spec: - source: - http: - url: http://nginx.demo.svc.cluster.local:80/windows-server-2022-uefi-ns.qcow2 - storage: - resources: - requests: - storage: 80Gi -# sourceRef: -# kind: DataSource -# name: win2k22 -# namespace: openshift-virtualization-os-images - runStrategy: Always - template: - metadata: - labels: - kubevirt.io/domain: windows-vm-standard-john - spec: - domain: - cpu: - cores: 4 - memory: - guest: 8Gi - features: - acpi: {} - smm: - enabled: true - firmware: - bootloader: - efi: {} - devices: - rng: {} - networkInterfaceMultiqueue: true - interfaces: - - name: default - masquerade: {} - ports: - - port: 8080 - - port: 443 - - port: 22 - - port: 3389 - disks: - - disk: - bus: sata - name: rootdisk-john - - disk: - bus: sata - name: datadisk-john - # - disk: - # bus: scsi - # name: cloudinitdisk - resources: - requests: - memory: 8Gi - cpu: 4 - limits: - memory: 8Gi - cpu: 4 - networks: - - name: default - pod: {} - terminationGracePeriodSeconds: 180 - volumes: - - name: rootdisk-john - dataVolume: - name: windows-rootdisk-john - - name: datadisk-john - persistentVolumeClaim: - claimName: windows-vm-datadisk-john - #- name: cloudinitdisk - # cloudInitNoCloud: - # secretRef: - # name: windows-cloud-init diff --git a/windows-vm-standard/vm/server.yaml b/windows-vm-standard/vm/server.yaml index 8e381e4..e9041f1 100644 --- a/windows-vm-standard/vm/server.yaml +++ b/windows-vm-standard/vm/server.yaml @@ -10,15 +10,15 @@ spec: spec: source: http: - url: http://nginx.demo.svc.cluster.local:8080/windows-server-2022-uefi-ns.qcow2 + url: "https://glacier-1.kvant.cloud/ocp-virt-images/sources/windows-server-2022-uefi-ns.qcow2" storage: resources: requests: storage: 80Gi - sourceRef: - kind: DataSource - name: win2k22 - namespace: kubevirt-os-images + #sourceRef: + #kind: DataSource + #name: win2k22 + #namespace: openshift-virtualization-os-images runStrategy: Always template: metadata: @@ -38,10 +38,13 @@ spec: bootloader: efi: {} devices: + #gpus: + #- name: gpu01 + #deviceName: nvidia.com/gpu rng: {} networkInterfaceMultiqueue: true interfaces: - - name: default + - name: ingress masquerade: {} ports: - port: 8080 @@ -53,7 +56,7 @@ spec: bus: sata name: rootdisk - disk: - bus: sata + bus: scsi name: datadisk # - disk: # bus: scsi @@ -65,8 +68,9 @@ spec: limits: memory: 8Gi cpu: 4 + #nvidia.com/gpu: 1 networks: - - name: default + - name: ingress pod: {} terminationGracePeriodSeconds: 180 volumes: