controller: revert back to using the old user data secret name

pkg/controller/remotemachineset/awsactuator.go

@@ -175,7 +175,7 @@ func (a *AWSActuator) GenerateMachineSets(cd *hivev1.ClusterDeployment, pool *hi
 		subnets,
 		computePool,
 		pool.Spec.Name,
-		workerUserData(clusterVersion),
+		workerUserDataName,
 		userTags,
 	)
 	if err != nil {

pkg/controller/remotemachineset/azureactuator.go

@@ -55,10 +55,6 @@ func (a *AzureActuator) GenerateMachineSets(cd *hivev1.ClusterDeployment, pool *
 	if pool.Spec.Platform.Azure == nil {
 		return nil, false, errors.New("MachinePool is not for Azure")
 	}
-	clusterVersion, err := getClusterVersion(cd)
-	if err != nil {
-		return nil, false, fmt.Errorf("Unable to get cluster version: %v", err)
-	}
 
 	ic := &installertypes.InstallConfig{
 		Platform: installertypes.Platform{
@@ -97,7 +93,7 @@ func (a *AzureActuator) GenerateMachineSets(cd *hivev1.ClusterDeployment, pool *
 		computePool,
 		imageID,
 		workerRole,
-		workerUserData(clusterVersion),
+		workerUserDataName,
 	)
 	return installerMachineSets, err == nil, errors.Wrap(err, "failed to generate machinesets")
 }

pkg/controller/remotemachineset/gcpactuator.go

@@ -116,17 +116,16 @@ func (a *GCPActuator) GenerateMachineSets(cd *hivev1.ClusterDeployment, pool *hi
 	if pool.Spec.Platform.GCP == nil {
 		return nil, false, errors.New("MachinePool is not for GCP")
 	}
-	clusterVersion, err := getClusterVersion(cd)
-	if err != nil {
-		return nil, false, fmt.Errorf("Unable to get cluster version: %v", err)
-	}
 
 	leases := &hivev1.MachinePoolNameLeaseList{}
-	err = a.client.List(context.TODO(), leases, client.InNamespace(pool.Namespace),
+	if err := a.client.List(
+		context.TODO(),
+		leases,
+		client.InNamespace(pool.Namespace),
 		client.MatchingLabels(map[string]string{
 			constants.ClusterDeploymentNameLabel: cd.Name,
-		}))
-	if err != nil {
+		}),
+	); err != nil {
 		logger.WithError(err).Log(controllerutils.LogLevel(err), "error fetching machinepoolleases")
 		return nil, false, err
 	}
@@ -196,7 +195,7 @@ func (a *GCPActuator) GenerateMachineSets(cd *hivev1.ClusterDeployment, pool *hi
 		computePool,
 		a.imageID,
 		workerRole,
-		workerUserData(clusterVersion),
+		workerUserDataName,
 	)
 	return installerMachineSets, err == nil, errors.Wrap(err, "failed to generate machinesets")
 }

pkg/controller/remotemachineset/openstackactuator.go

@@ -58,10 +58,6 @@ func (a *OpenStackActuator) GenerateMachineSets(cd *hivev1.ClusterDeployment, po
 	if pool.Spec.Platform.OpenStack == nil {
 		return nil, false, errors.New("MachinePool is not for OpenStack")
 	}
-	clusterVersion, err := getClusterVersion(cd)
-	if err != nil {
-		return nil, false, fmt.Errorf("Unable to get cluster version: %v", err)
-	}
 
 	computePool := baseMachinePool(pool)
 	computePool.Platform.OpenStack = &installertypesosp.MachinePool{
@@ -92,7 +88,7 @@ func (a *OpenStackActuator) GenerateMachineSets(cd *hivev1.ClusterDeployment, po
 		computePool,
 		a.osImage,
 		workerRole,
-		workerUserData(clusterVersion),
+		workerUserDataName,
 	)
 	if err != nil {
 		return nil, false, errors.Wrap(err, "failed to generate machinesets")

pkg/controller/remotemachineset/ovirt.go

@@ -58,10 +58,6 @@ func (a *OvirtActuator) GenerateMachineSets(cd *hivev1.ClusterDeployment, pool *
 	if pool.Spec.Platform.Ovirt == nil {
 		return nil, false, errors.New("MachinePool is not for oVirt")
 	}
-	clusterVersion, err := getClusterVersion(cd)
-	if err != nil {
-		return nil, false, fmt.Errorf("Unable to get cluster version: %v", err)
-	}
 
 	computePool := baseMachinePool(pool)
 
@@ -96,7 +92,7 @@ func (a *OvirtActuator) GenerateMachineSets(cd *hivev1.ClusterDeployment, pool *
 		computePool,
 		a.osImage,
 		workerRole,
-		workerUserData(clusterVersion),
+		workerUserDataName,
 	)
 	if err != nil {
 		return nil, false, errors.Wrap(err, "failed to generate machinesets")

pkg/controller/remotemachineset/secrets.go

@@ -1,32 +1,6 @@
 package remotemachineset
 
-import (
-	"github.com/blang/semver/v4"
-)
-
 const (
-	// legacyWorkerUserDataName is the name of a secret in the cluster used for obtaining user data from MCO prior to 4.6.
-	legacyWorkerUserDataName = "worker-user-data"
-
-	// workerUserDataName is the name of a secret in the cluster used for obtaining user data from MCO after 4.6.
-	workerUserDataName = "worker-user-data-managed"
+	// workerUserDataName is the name of a secret in the cluster used for obtaining user data from MCO.
+	workerUserDataName = "worker-user-data"
 )
-
-var (
-	versionsUsingLegacyWorkerUserDataName = semver.MustParseRange("<4.6.0")
-)
-
-func workerUserData(version string) string {
-	finalizedVersion, err := semver.FinalizeVersion(version)
-	if err != nil {
-		return workerUserDataName
-	}
-	parsedVersion, err := semver.ParseTolerant(finalizedVersion)
-	if err != nil {
-		return workerUserDataName
-	}
-	if versionsUsingLegacyWorkerUserDataName(parsedVersion) {
-		return legacyWorkerUserDataName
-	}
-	return workerUserDataName
-}

pkg/controller/remotemachineset/vsphereactuator.go

@@ -58,10 +58,6 @@ func (a *VSphereActuator) GenerateMachineSets(cd *hivev1.ClusterDeployment, pool
 	if pool.Spec.Platform.VSphere == nil {
 		return nil, false, errors.New("MachinePool is not for VSphere")
 	}
-	clusterVersion, err := getClusterVersion(cd)
-	if err != nil {
-		return nil, false, fmt.Errorf("Unable to get cluster version: %v", err)
-	}
 
 	computePool := baseMachinePool(pool)
 	computePool.Platform.VSphere = &installertypesvsphere.MachinePool{
@@ -95,7 +91,7 @@ func (a *VSphereActuator) GenerateMachineSets(cd *hivev1.ClusterDeployment, pool
 		computePool,
 		a.osImage,
 		workerRole,
-		workerUserData(clusterVersion),
+		workerUserDataName,
 	)
 	if err != nil {
 		return nil, false, errors.Wrap(err, "failed to generate machinesets")