Merge pull request #1385 from bharath-b-rh/oape-232

openshift-merge-bot[bot] · web-flow · commit 86404b8d422b · 2025-07-04T15:29:01.000Z
OAPE-232: Remove GCPLabelsTags featuregate checks and references
diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -475,7 +475,6 @@ func (optr *Operator) maoConfigFromInfrastructure() (*OperatorConfig, error) {
 	// as args)
 	features := map[string]bool{
 		string(apifeatures.FeatureGateMachineAPIMigration):     featureGates.Enabled(apifeatures.FeatureGateMachineAPIMigration),
-		string(apifeatures.FeatureGateGCPLabelsTags):           featureGates.Enabled(apifeatures.FeatureGateGCPLabelsTags),
 		string(apifeatures.FeatureGateAzureWorkloadIdentity):   featureGates.Enabled(apifeatures.FeatureGateAzureWorkloadIdentity),
 		string(apifeatures.FeatureGateVSphereMultiDisk):        featureGates.Enabled(apifeatures.FeatureGateVSphereMultiDisk),
 		string(apifeatures.FeatureGateVSphereHostVMGroupZonal): featureGates.Enabled(apifeatures.FeatureGateVSphereHostVMGroupZonal),
diff --git a/pkg/operator/operator_test.go b/pkg/operator/operator_test.go
@@ -42,15 +42,13 @@ const (
 var (
 	enabledFeatureGates = []openshiftv1.FeatureGateAttributes{
 		{Name: apifeatures.FeatureGateMachineAPIMigration},
-		{Name: apifeatures.FeatureGateGCPLabelsTags},
 		{Name: apifeatures.FeatureGateAzureWorkloadIdentity},
 		{Name: apifeatures.FeatureGateVSphereMultiDisk},
 		{Name: apifeatures.FeatureGateVSphereHostVMGroupZonal},
 	}
 
 	enabledFeatureMap = map[string]bool{
 		"MachineAPIMigration":     true,
-		"GCPLabelsTags":           true,
 		"AzureWorkloadIdentity":   true,
 		"VSphereMultiDisk":        true,
 		"VSphereHostVMGroupZonal": true,
diff --git a/test/e2e/vsphere/multi-nic.go b/test/e2e/vsphere/multi-nic.go
@@ -212,7 +212,7 @@ var _ = Describe("[sig-cluster-lifecycle][OCPFeatureGate:VSphereMultiNetworks][p
 			}
 		}
 
-		for k, _ := range portGroups {
+		for k := range portGroups {
 			machinePortgroups = append(machinePortgroups, k)
 		}
 	})
@@ -264,7 +264,7 @@ var _ = Describe("[sig-cluster-lifecycle][OCPFeatureGate:VSphereMultiNetworks][p
 			}
 		}
 
-		for k, _ := range portGroups {
+		for k := range portGroups {
 			machinePortgroups = append(machinePortgroups, k)
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ var _ = Describe("[sig-cluster-lifecycle][OCPFeatureGate:VSphereMultiNetworks][p`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`
`215`		`- for k, _ := range portGroups {`
	`215`	`+ for k := range portGroups {`
`216`	`216`	`machinePortgroups = append(machinePortgroups, k)`
`217`	`217`	`}`
`218`	`218`	`})`
`@@ -264,7 +264,7 @@ var _ = Describe("[sig-cluster-lifecycle][OCPFeatureGate:VSphereMultiNetworks][p`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`
`267`		`- for k, _ := range portGroups {`
	`267`	`+ for k := range portGroups {`
`268`	`268`	`machinePortgroups = append(machinePortgroups, k)`
`269`	`269`	`}`
`270`	`270`