flavorgen: remove thumbprint from vSphereMachineTemplate for easier rotation

Author: chrischdi

packaging/flavorgen/flavors/generators.go

@@ -369,8 +369,6 @@ func defaultVirtualMachineCloneSpec() infrav1.VirtualMachineCloneSpec {
 		DiskGiB:           env.DefaultDiskGiB,
 		MemoryMiB:         env.DefaultMemoryMiB,
 		Template:          env.VSphereTemplateVar,
-		Server:            env.VSphereServerVar,
-		Thumbprint:        env.VSphereThumbprint,
 		ResourcePool:      env.VSphereResourcePoolVar,
 		Datastore:         env.VSphereDatastoreVar,
 		StoragePolicyName: env.VSphereStoragePolicyVar,
@@ -432,8 +430,6 @@ func nodeIPAMVirtualMachineCloneSpec() infrav1.VirtualMachineCloneSpec {
 		DiskGiB:           env.DefaultDiskGiB,
 		MemoryMiB:         env.DefaultMemoryMiB,
 		Template:          env.VSphereTemplateVar,
-		Server:            env.VSphereServerVar,
-		Thumbprint:        env.VSphereThumbprint,
 		ResourcePool:      env.VSphereResourcePoolVar,
 		Datastore:         env.VSphereDatastoreVar,
 		StoragePolicyName: env.VSphereStoragePolicyVar,

templates/cluster-template-external-loadbalancer.yaml

@@ -56,10 +56,8 @@ spec:
       os: Linux
       powerOffMode: trySoft
       resourcePool: '${VSPHERE_RESOURCE_POOL}'
-      server: '${VSPHERE_SERVER}'
       storagePolicyName: '${VSPHERE_STORAGE_POLICY}'
       template: '${VSPHERE_TEMPLATE}'
-      thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: VSphereMachineTemplate
@@ -83,10 +81,8 @@ spec:
       os: Linux
       powerOffMode: trySoft
       resourcePool: '${VSPHERE_RESOURCE_POOL}'
-      server: '${VSPHERE_SERVER}'
       storagePolicyName: '${VSPHERE_STORAGE_POLICY}'
       template: '${VSPHERE_TEMPLATE}'
-      thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1beta1
 kind: KubeadmControlPlane

templates/cluster-template-ignition.yaml

@@ -56,10 +56,8 @@ spec:
       os: Linux
       powerOffMode: trySoft
       resourcePool: '${VSPHERE_RESOURCE_POOL}'
-      server: '${VSPHERE_SERVER}'
       storagePolicyName: '${VSPHERE_STORAGE_POLICY}'
       template: '${VSPHERE_TEMPLATE}'
-      thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1beta1
 kind: KubeadmControlPlane

templates/cluster-template-node-ipam.yaml

@@ -61,10 +61,8 @@ spec:
       os: Linux
       powerOffMode: trySoft
       resourcePool: '${VSPHERE_RESOURCE_POOL}'
-      server: '${VSPHERE_SERVER}'
       storagePolicyName: '${VSPHERE_STORAGE_POLICY}'
       template: '${VSPHERE_TEMPLATE}'
-      thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: VSphereMachineTemplate
@@ -93,10 +91,8 @@ spec:
       os: Linux
       powerOffMode: trySoft
       resourcePool: '${VSPHERE_RESOURCE_POOL}'
-      server: '${VSPHERE_SERVER}'
       storagePolicyName: '${VSPHERE_STORAGE_POLICY}'
       template: '${VSPHERE_TEMPLATE}'
-      thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1beta1
 kind: KubeadmControlPlane

templates/cluster-template.yaml

@@ -56,10 +56,8 @@ spec:
       os: Linux
       powerOffMode: trySoft
       resourcePool: '${VSPHERE_RESOURCE_POOL}'
-      server: '${VSPHERE_SERVER}'
       storagePolicyName: '${VSPHERE_STORAGE_POLICY}'
       template: '${VSPHERE_TEMPLATE}'
-      thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: VSphereMachineTemplate
@@ -83,10 +81,8 @@ spec:
       os: Linux
       powerOffMode: trySoft
       resourcePool: '${VSPHERE_RESOURCE_POOL}'
-      server: '${VSPHERE_SERVER}'
       storagePolicyName: '${VSPHERE_STORAGE_POLICY}'
       template: '${VSPHERE_TEMPLATE}'
-      thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1beta1
 kind: KubeadmControlPlane

templates/clusterclass-template.yaml

@@ -282,10 +282,8 @@ spec:
       os: Linux
       powerOffMode: trySoft
       resourcePool: '${VSPHERE_RESOURCE_POOL}'
-      server: '${VSPHERE_SERVER}'
       storagePolicyName: '${VSPHERE_STORAGE_POLICY}'
       template: '${VSPHERE_TEMPLATE}'
-      thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: VSphereMachineTemplate
@@ -309,10 +307,8 @@ spec:
       os: Linux
       powerOffMode: trySoft
       resourcePool: '${VSPHERE_RESOURCE_POOL}'
-      server: '${VSPHERE_SERVER}'
       storagePolicyName: '${VSPHERE_STORAGE_POLICY}'
       template: '${VSPHERE_TEMPLATE}'
-      thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1beta1
 kind: KubeadmControlPlaneTemplate