From ad61a31f8b730d18614b4fb866c512209eba27d9 Mon Sep 17 00:00:00 2001 From: Zhongcheng Lao Date: Thu, 3 Aug 2023 15:44:12 +0800 Subject: [PATCH] Add powerOffMode to templates --- packaging/flavorgen/flavors/generators.go | 2 ++ templates/cluster-template-external-loadbalancer.yaml | 2 ++ templates/cluster-template-ignition.yaml | 1 + templates/cluster-template-node-ipam.yaml | 2 ++ templates/cluster-template.yaml | 2 ++ templates/clusterclass-template.yaml | 2 ++ 6 files changed, 11 insertions(+) diff --git a/packaging/flavorgen/flavors/generators.go b/packaging/flavorgen/flavors/generators.go index 9d3e159860..20e20fd595 100644 --- a/packaging/flavorgen/flavors/generators.go +++ b/packaging/flavorgen/flavors/generators.go @@ -259,6 +259,7 @@ func newVSphereMachineTemplate(templateName string) infrav1.VSphereMachineTempla func defaultVirtualMachineSpec() infrav1.VSphereMachineSpec { return infrav1.VSphereMachineSpec{ VirtualMachineCloneSpec: defaultVirtualMachineCloneSpec(), + PowerOffMode: infrav1.VirtualMachinePowerOpModeHard, } } @@ -311,6 +312,7 @@ func newNodeIPAMVSphereMachineTemplate(templateName string) infrav1.VSphereMachi func nodeIPAMVirtualMachineSpec() infrav1.VSphereMachineSpec { return infrav1.VSphereMachineSpec{ VirtualMachineCloneSpec: nodeIPAMVirtualMachineCloneSpec(), + PowerOffMode: infrav1.VirtualMachinePowerOpModeHard, } } diff --git a/templates/cluster-template-external-loadbalancer.yaml b/templates/cluster-template-external-loadbalancer.yaml index 8252a0d5b6..675e0c9687 100644 --- a/templates/cluster-template-external-loadbalancer.yaml +++ b/templates/cluster-template-external-loadbalancer.yaml @@ -55,6 +55,7 @@ spec: networkName: '${VSPHERE_NETWORK}' numCPUs: 2 os: Linux + powerOffMode: hard resourcePool: '${VSPHERE_RESOURCE_POOL}' server: '${VSPHERE_SERVER}' storagePolicyName: '${VSPHERE_STORAGE_POLICY}' @@ -81,6 +82,7 @@ spec: networkName: '${VSPHERE_NETWORK}' numCPUs: 2 os: Linux + powerOffMode: hard resourcePool: '${VSPHERE_RESOURCE_POOL}' server: '${VSPHERE_SERVER}' storagePolicyName: '${VSPHERE_STORAGE_POLICY}' diff --git a/templates/cluster-template-ignition.yaml b/templates/cluster-template-ignition.yaml index 5ed2e32150..49da310908 100644 --- a/templates/cluster-template-ignition.yaml +++ b/templates/cluster-template-ignition.yaml @@ -55,6 +55,7 @@ spec: networkName: '${VSPHERE_NETWORK}' numCPUs: 2 os: Linux + powerOffMode: hard resourcePool: '${VSPHERE_RESOURCE_POOL}' server: '${VSPHERE_SERVER}' storagePolicyName: '${VSPHERE_STORAGE_POLICY}' diff --git a/templates/cluster-template-node-ipam.yaml b/templates/cluster-template-node-ipam.yaml index ac0901f058..3c441fc1cd 100644 --- a/templates/cluster-template-node-ipam.yaml +++ b/templates/cluster-template-node-ipam.yaml @@ -60,6 +60,7 @@ spec: networkName: '${VSPHERE_NETWORK}' numCPUs: 2 os: Linux + powerOffMode: hard resourcePool: '${VSPHERE_RESOURCE_POOL}' server: '${VSPHERE_SERVER}' storagePolicyName: '${VSPHERE_STORAGE_POLICY}' @@ -91,6 +92,7 @@ spec: networkName: '${VSPHERE_NETWORK}' numCPUs: 2 os: Linux + powerOffMode: hard resourcePool: '${VSPHERE_RESOURCE_POOL}' server: '${VSPHERE_SERVER}' storagePolicyName: '${VSPHERE_STORAGE_POLICY}' diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml index 0048c12797..d8fdad6e8e 100644 --- a/templates/cluster-template.yaml +++ b/templates/cluster-template.yaml @@ -55,6 +55,7 @@ spec: networkName: '${VSPHERE_NETWORK}' numCPUs: 2 os: Linux + powerOffMode: hard resourcePool: '${VSPHERE_RESOURCE_POOL}' server: '${VSPHERE_SERVER}' storagePolicyName: '${VSPHERE_STORAGE_POLICY}' @@ -81,6 +82,7 @@ spec: networkName: '${VSPHERE_NETWORK}' numCPUs: 2 os: Linux + powerOffMode: hard resourcePool: '${VSPHERE_RESOURCE_POOL}' server: '${VSPHERE_SERVER}' storagePolicyName: '${VSPHERE_STORAGE_POLICY}' diff --git a/templates/clusterclass-template.yaml b/templates/clusterclass-template.yaml index d5714dfca9..d2711cdd76 100644 --- a/templates/clusterclass-template.yaml +++ b/templates/clusterclass-template.yaml @@ -178,6 +178,7 @@ spec: networkName: '${VSPHERE_NETWORK}' numCPUs: 2 os: Linux + powerOffMode: hard resourcePool: '${VSPHERE_RESOURCE_POOL}' server: '${VSPHERE_SERVER}' storagePolicyName: '${VSPHERE_STORAGE_POLICY}' @@ -204,6 +205,7 @@ spec: networkName: '${VSPHERE_NETWORK}' numCPUs: 2 os: Linux + powerOffMode: hard resourcePool: '${VSPHERE_RESOURCE_POOL}' server: '${VSPHERE_SERVER}' storagePolicyName: '${VSPHERE_STORAGE_POLICY}'