Merge pull request #3375 from chrischdi/pr-remove-thumbprint-vspheremachinetemplate

🌱 flavorgen: remove thumbprint from vSphereMachineTemplate for easier rotation

Author: k8s-ci-robot

packaging/flavorgen/flavors/generators.go

@@ -370,7 +370,6 @@ func defaultVirtualMachineCloneSpec() infrav1.VirtualMachineCloneSpec {
 		MemoryMiB:         env.DefaultMemoryMiB,
 		Template:          env.VSphereTemplateVar,
 		Server:            env.VSphereServerVar,
-		Thumbprint:        env.VSphereThumbprint,
 		ResourcePool:      env.VSphereResourcePoolVar,
 		Datastore:         env.VSphereDatastoreVar,
 		StoragePolicyName: env.VSphereStoragePolicyVar,
@@ -433,7 +432,6 @@ func nodeIPAMVirtualMachineCloneSpec() infrav1.VirtualMachineCloneSpec {
 		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

@@ -59,7 +59,6 @@ spec:
       server: '${VSPHERE_SERVER}'
       storagePolicyName: '${VSPHERE_STORAGE_POLICY}'
       template: '${VSPHERE_TEMPLATE}'
-      thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: VSphereMachineTemplate
@@ -86,7 +85,6 @@ spec:
       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

@@ -59,7 +59,6 @@ spec:
       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

@@ -64,7 +64,6 @@ spec:
       server: '${VSPHERE_SERVER}'
       storagePolicyName: '${VSPHERE_STORAGE_POLICY}'
       template: '${VSPHERE_TEMPLATE}'
-      thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: VSphereMachineTemplate
@@ -96,7 +95,6 @@ spec:
       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

@@ -59,7 +59,6 @@ spec:
       server: '${VSPHERE_SERVER}'
       storagePolicyName: '${VSPHERE_STORAGE_POLICY}'
       template: '${VSPHERE_TEMPLATE}'
-      thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: VSphereMachineTemplate
@@ -86,7 +85,6 @@ spec:
       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

@@ -285,7 +285,6 @@ spec:
       server: '${VSPHERE_SERVER}'
       storagePolicyName: '${VSPHERE_STORAGE_POLICY}'
       template: '${VSPHERE_TEMPLATE}'
-      thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: VSphereMachineTemplate
@@ -312,7 +311,6 @@ spec:
       server: '${VSPHERE_SERVER}'
       storagePolicyName: '${VSPHERE_STORAGE_POLICY}'
       template: '${VSPHERE_TEMPLATE}'
-      thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1beta1
 kind: KubeadmControlPlaneTemplate