diff --git a/capt/Taskfile.yaml b/capt/Taskfile.yaml index fd6cbbf..254019f 100644 --- a/capt/Taskfile.yaml +++ b/capt/Taskfile.yaml @@ -19,7 +19,7 @@ tasks: create-playground: silent: true summary: | - Create the CAPT playground. Use the .playground file to define things like cluster size and Kubernetes version. + Create the CAPT playground. Use the config.yaml file to define things like cluster size and Kubernetes version. cmds: - task: system-deps-warnings - task: validate-binaries diff --git a/capt/config.yaml b/capt/config.yaml index f8f131b..2714588 100644 --- a/capt/config.yaml +++ b/capt/config.yaml @@ -9,7 +9,7 @@ counts: versions: capt: v0.6.1 chart: 0.6.1 - kube: v1.28.9 + kube: v1.29.4 os: 20.04 kubevip: 0.8.7 capt: diff --git a/capt/tasks/Taskfile-create.yaml b/capt/tasks/Taskfile-create.yaml index 032be51..ef954f5 100644 --- a/capt/tasks/Taskfile-create.yaml +++ b/capt/tasks/Taskfile-create.yaml @@ -21,6 +21,7 @@ tasks: - task: bmc-secret - task: vms - task: vbmc:start-vbmcs + - task: default-storage-pool - task: apply-bmc-secret - task: apply-bmc-machines - task: apply-hardware @@ -240,3 +241,12 @@ tasks: - echo "Workload cluster kubeconfig saved to {{.OUTPUT_DIR}}/{{.CLUSTER_NAME}}.kubeconfig." status: - echo ; [ -f {{.OUTPUT_DIR}}/{{.CLUSTER_NAME}}.kubeconfig ] + + default-storage-pool: + summary: | + Create the default storage pool for the redfish emulator to work properly. + cmds: + - virsh --connect qemu:///system pool-define-as --name default --type dir --target /tmp/iso + - virsh --connect qemu:///system pool-start --build default + status: + - virsh --connect qemu:///system pool-info default diff --git a/capt/tasks/Taskfile-delete.yaml b/capt/tasks/Taskfile-delete.yaml index f6d22de..4699003 100644 --- a/capt/tasks/Taskfile-delete.yaml +++ b/capt/tasks/Taskfile-delete.yaml @@ -9,6 +9,7 @@ tasks: - task: vbmc-container - task: vbmc-generated-files - task: vms + - task: default-storage-pool - task: output-dir kind-cluster: @@ -38,6 +39,16 @@ tasks: status: - got=$(virsh --connect qemu:///system list --all --name | grep -ce "{{.VM_BASE_NAME}}*" || :); [[ "$got" == "0" ]] + default-storage-pool: + summary: | + Delete the default storage pool. + cmds: + - for vol in $(virsh --connect qemu:///system -q vol-list default | xargs | cut -d " " -f1,3,5,7,9); do virsh --connect qemu:///system vol-delete --pool default $vol; done + - virsh --connect qemu:///system pool-destroy default || true + - virsh --connect qemu:///system pool-undefine default + status: + - (! virsh --connect qemu:///system pool-info default ) + vbmc-container: summary: | Delete the Virtual BMC container.