Merge pull request openshift#2210 from openshift/revert-2209-OCM_9094…

…_multi_arch_enabled Revert "OCM-9094 | feat: support multi-arch-enabled parameter"
vivekgupta87 · Jun 28, 2024 · 1e7cd7b · 1e7cd7b
2 parents 4028b95 + 0b38e21
commit 1e7cd7b
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 41 deletions.
diff --git a/cmd/create/cluster/cmd.go b/cmd/create/cluster/cmd.go
@@ -217,9 +217,6 @@ var args struct {
 
 	// Control Plane machine pool attributes
 	additionalControlPlaneSecurityGroupIds []string
-
-	// Multi arch enabled
-	multiArchEnabled bool
 }
 
 var autoscalerArgs *clusterautoscaler.AutoscalerArgs
@@ -842,14 +839,6 @@ func initFlags(cmd *cobra.Command) {
 			listInputMessage,
 	)
 
-	flags.BoolVar(
-		&args.multiArchEnabled,
-		"multi-arch-enabled",
-		false,
-		"Enable workers in arm64 architecture for Hosted Control Plane clusters.",
-	)
-	flags.MarkHidden("multi-arch-enabled")
-
 	interactive.AddModeFlag(cmd)
 	interactive.AddFlag(flags)
 	output.AddFlag(cmd)
@@ -1204,14 +1193,6 @@ func run(cmd *cobra.Command, _ []string) {
 		}
 	}
 
-	multiArchEnabled := args.multiArchEnabled
-	if multiArchEnabled {
-		if !isHostedCP {
-			r.Reporter.Errorf("Workers in arm64 architecture are only supported for a Hosted Control Plane cluster.")
-			os.Exit(1)
-		}
-	}
-
 	etcdEncryptionKmsARN := args.etcdEncryptionKmsARN
 
 	if etcdEncryptionKmsARN != "" && !isHostedCP {
@@ -3156,7 +3137,6 @@ func run(cmd *cobra.Command, _ []string) {
 		AdditionalInfraSecurityGroupIds:        additionalInfraSecurityGroupIds,
 		AdditionalControlPlaneSecurityGroupIds: additionalControlPlaneSecurityGroupIds,
 		AdditionalAllowedPrincipals:            additionalAllowedPrincipals,
-		MultiArchEnabled:                       multiArchEnabled,
 	}
 
 	if httpTokens != "" {
@@ -3958,10 +3938,6 @@ func buildCommand(spec ocm.Spec, operatorRolesPrefix string,
 			strings.Join(spec.AdditionalAllowedPrincipals, ","))
 	}
 
-	if spec.MultiArchEnabled {
-		command += " --multi-arch-enabled"
-	}
-
 	for _, p := range properties {
 		command += fmt.Sprintf(" --properties \"%s\"", p)
 	}

diff --git a/cmd/describe/cluster/cmd.go b/cmd/describe/cluster/cmd.go
@@ -489,8 +489,6 @@ func run(cmd *cobra.Command, argv []string) {
 				"Additional Principals:      %s\n", str,
 				strings.Join(cluster.AWS().AdditionalAllowedPrincipals(), ","))
 		}
-		str = fmt.Sprintf("%s"+
-			"Multi Architecture Workers: %s\n", str, getMultiArchEnabledStatus(cluster))
 	}
 
 	if cluster.Status().State() == cmv1.ClusterStateError {
@@ -841,14 +839,6 @@ func getExternalAuthConfigStatus(cluster *cmv1.Cluster) string {
 	return externalAuthConfigStatus
 }
 
-func getMultiArchEnabledStatus(cluster *cmv1.Cluster) string {
-	multiArchEnabledStatus := DisabledOutput
-	if cluster.MultiArchEnabled() {
-		multiArchEnabledStatus = EnabledOutput
-	}
-	return multiArchEnabledStatus
-}
-
 func getRolePolicyBindings(roleARN string, rolePolicyDetails map[string][]aws.PolicyDetail,
 	prefix string) (string, error) {
 	roleName, err := aws.GetResourceIdFromARN(roleARN)

diff --git a/pkg/ocm/clusters.go b/pkg/ocm/clusters.go
@@ -174,9 +174,6 @@ type Spec struct {
 
 	// Control Plane Machine Pool attributes
 	AdditionalControlPlaneSecurityGroupIds []string
-
-	// Workers with arm64 architecture
-	MultiArchEnabled bool
 }
 
 // Volume represents a volume property for a disk
@@ -1068,10 +1065,6 @@ func (c *Client) createClusterSpec(config Spec) (*cmv1.Cluster, error) {
 		clusterBuilder.Autoscaler(BuildClusterAutoscaler(config.AutoscalerConfig))
 	}
 
-	if config.MultiArchEnabled {
-		clusterBuilder.MultiArchEnabled(config.MultiArchEnabled)
-	}
-
 	clusterSpec, err := clusterBuilder.Build()
 	if err != nil {
 		return nil, fmt.Errorf("Failed to create description of cluster: %v", err)