Merge pull request #2149 from laozc/template-update

k8s-ci-robot · web-flow · commit 7b26b7ac030c · 2023-08-03T07:34:23.000-07:00
🌱 Add powerOffMode to templates
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}'

Original file line number	Diff line number	Diff line change
`@@ -259,6 +259,7 @@ func newVSphereMachineTemplate(templateName string) infrav1.VSphereMachineTempla`
`259`	`259`	`func defaultVirtualMachineSpec() infrav1.VSphereMachineSpec {`
`260`	`260`	`return infrav1.VSphereMachineSpec{`
`261`	`261`	`VirtualMachineCloneSpec: defaultVirtualMachineCloneSpec(),`
	`262`	`+ PowerOffMode: infrav1.VirtualMachinePowerOpModeHard,`
`262`	`263`	`}`
`263`	`264`	`}`
`264`	`265`
`@@ -311,6 +312,7 @@ func newNodeIPAMVSphereMachineTemplate(templateName string) infrav1.VSphereMachi`
`311`	`312`	`func nodeIPAMVirtualMachineSpec() infrav1.VSphereMachineSpec {`
`312`	`313`	`return infrav1.VSphereMachineSpec{`
`313`	`314`	`VirtualMachineCloneSpec: nodeIPAMVirtualMachineCloneSpec(),`
	`315`	`+ PowerOffMode: infrav1.VirtualMachinePowerOpModeHard,`
`314`	`316`	`}`
`315`	`317`	`}`
`316`	`318`