From 9a4da4434125a74ed15c5420c91d87e96783e158 Mon Sep 17 00:00:00 2001 From: Bharath B Date: Mon, 30 Jun 2025 14:14:03 +0530 Subject: [PATCH 1/2] OAPE-232: Remove GCPLabelsTags featuregate checks and references --- pkg/operator/operator.go | 1 - pkg/operator/operator_test.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go index f3f444effe..95ffc58146 100644 --- 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 index 2fc3206698..c6e28b72e2 100644 --- a/pkg/operator/operator_test.go +++ b/pkg/operator/operator_test.go @@ -42,7 +42,6 @@ const ( var ( enabledFeatureGates = []openshiftv1.FeatureGateAttributes{ {Name: apifeatures.FeatureGateMachineAPIMigration}, - {Name: apifeatures.FeatureGateGCPLabelsTags}, {Name: apifeatures.FeatureGateAzureWorkloadIdentity}, {Name: apifeatures.FeatureGateVSphereMultiDisk}, {Name: apifeatures.FeatureGateVSphereHostVMGroupZonal}, @@ -50,7 +49,6 @@ var ( enabledFeatureMap = map[string]bool{ "MachineAPIMigration": true, - "GCPLabelsTags": true, "AzureWorkloadIdentity": true, "VSphereMultiDisk": true, "VSphereHostVMGroupZonal": true, From 48cf15da211bc33106f4d6f34b41e9c69d36af84 Mon Sep 17 00:00:00 2001 From: Bharath B Date: Mon, 30 Jun 2025 14:14:50 +0530 Subject: [PATCH 2/2] NO-JIRA: changes suggested by fmt tool --- test/e2e/vsphere/multi-nic.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/vsphere/multi-nic.go b/test/e2e/vsphere/multi-nic.go index de84942159..9cb6803de7 100644 --- 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) }