From 26f7d79130d15ccddba2fcd53a316ff3ae7f695d Mon Sep 17 00:00:00 2001 From: Ivan Mikheykin Date: Fri, 22 Mar 2024 11:22:14 +0300 Subject: [PATCH] chore: format YAMLs Signed-off-by: Ivan Mikheykin --- crds/virtualmachine.yaml | 52 +++++++++---------- crds/virtualmachinecpumodel.yaml | 36 +++---------- .../e2e/testdata/vm/vm_label_annotation.yaml | 2 +- 3 files changed, 35 insertions(+), 55 deletions(-) diff --git a/crds/virtualmachine.yaml b/crds/virtualmachine.yaml index 3f49791e8..81ceb599f 100644 --- a/crds/virtualmachine.yaml +++ b/crds/virtualmachine.yaml @@ -69,7 +69,7 @@ spec: type: string description: | Secret name. - required: [ "name" ] + required: ["name"] userData: description: | Inline cloud-init userdata script. @@ -85,31 +85,31 @@ spec: Secret name. required: ["name"] oneOf: - - properties: - type: - enum: [ "SysprepSecret" ] - required: [ "sysprepSecretRef" ] - not: - anyOf: - - required: [ "userData" ] - - required: [ "userDataSecretRef" ] - - properties: - type: - enum: ["UserData"] - required: ["userData"] - not: - anyOf: - - required: [ "sysprepSecretRef" ] - - required: [ "userDataSecretRef" ] - - properties: - type: - enum: ["UserDataSecret"] - userDataSecretRef: {} - required: ["userDataSecretRef"] - not: - anyOf: - - required: [ "sysprepSecretRef" ] - - required: [ "userData" ] + - properties: + type: + enum: ["SysprepSecret"] + required: ["sysprepSecretRef"] + not: + anyOf: + - required: ["userData"] + - required: ["userDataSecretRef"] + - properties: + type: + enum: ["UserData"] + required: ["userData"] + not: + anyOf: + - required: ["sysprepSecretRef"] + - required: ["userDataSecretRef"] + - properties: + type: + enum: ["UserDataSecret"] + userDataSecretRef: {} + required: ["userDataSecretRef"] + not: + anyOf: + - required: ["sysprepSecretRef"] + - required: ["userData"] runPolicy: type: string enum: diff --git a/crds/virtualmachinecpumodel.yaml b/crds/virtualmachinecpumodel.yaml index 1a39775e3..97780f2ca 100644 --- a/crds/virtualmachinecpumodel.yaml +++ b/crds/virtualmachinecpumodel.yaml @@ -43,9 +43,9 @@ spec: * Model - CPU model. A CPU model is a named and previously defined set of supported processor instructions. * Features - the required set of supported instructions for the processor. enum: - - 'Host' - - 'Model' - - 'Features' + - "Host" + - "Model" + - "Features" model: type: string description: | @@ -55,11 +55,7 @@ spec: type: array description: | Required instructions for the CPU as a list More information about features [here](https://libvirt.org/formatdomain.html#cpu-model-and-topology) - example: [ - "mmx", - "vmx", - "sse2" - ] + example: ["mmx", "vmx", "sse2"] items: type: string status: @@ -73,13 +69,7 @@ spec: * InProgress - the resource is in the process of being created. * Ready - the resource has been created successfully. * Failed - an error occurred during the resource creation process. - enum: - [ - "Pending", - "InProgress", - "Ready", - "Failed", - ] + enum: ["Pending", "InProgress", "Ready", "Failed"] features: type: object description: | @@ -90,21 +80,14 @@ spec: type: array description: | A list of CPU features for this model. - example: [ - "mmx", - "vmx", - "sse2" - ] + example: ["mmx", "vmx", "sse2"] items: type: string notEnabledCommon: type: array description: | A list of unused processor features additionally available for a given group of nodes. - example: [ - "ssse3", - "vme", - ] + example: ["ssse3", "vme"] items: type: string nodes: @@ -112,10 +95,7 @@ spec: description: | List of nodes supporting this CPU model. Not shown for `type=Host`. - example: [ - "node-1", - "node-2", - ] + example: ["node-1", "node-2"] items: type: string additionalPrinterColumns: diff --git a/tests/e2e/testdata/vm/vm_label_annotation.yaml b/tests/e2e/testdata/vm/vm_label_annotation.yaml index 10c87f49e..6fbdb9796 100644 --- a/tests/e2e/testdata/vm/vm_label_annotation.yaml +++ b/tests/e2e/testdata/vm/vm_label_annotation.yaml @@ -16,4 +16,4 @@ spec: blockDevices: - type: VirtualMachineImage virtualMachineImage: - name: test-vm-image \ No newline at end of file + name: test-vm-image