[WIP] SPLAT-2297: Added new cmd flag to launch of vSphere CCM

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/golangci/golangci-lint v1.62.2
 	github.com/onsi/ginkgo/v2 v2.22.2
 	github.com/onsi/gomega v1.36.2
-	github.com/openshift/api v0.0.0-20250128061932-d2791f98ff08
+	github.com/openshift/api v0.0.0-20250620092249-a8cbc218cd2c
 	github.com/openshift/client-go v0.0.0-20250125113824-8e1f0b8fa9a7
 	github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20250122171707-86066d47a264
 	github.com/openshift/library-go v0.0.0-20250127111945-0f76e23726cd

go.sum

@@ -374,8 +374,8 @@ github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU
 github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
 github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
 github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
-github.com/openshift/api v0.0.0-20250128061932-d2791f98ff08 h1:GtCVszgqW3rmgyO8eWX/0UbfTirBNRTK9jFfZ/3Y9hQ=
-github.com/openshift/api v0.0.0-20250128061932-d2791f98ff08/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw=
+github.com/openshift/api v0.0.0-20250620092249-a8cbc218cd2c h1:0Np840IRyzpvHLWxcE1AZ8sttVZe+a3Y6QBS3Ge+umA=
+github.com/openshift/api v0.0.0-20250620092249-a8cbc218cd2c/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw=
 github.com/openshift/client-go v0.0.0-20250125113824-8e1f0b8fa9a7 h1:4iliLcvr1P9EUMZgIaSNEKNQQzBn+L6PSequlFOuB6Q=
 github.com/openshift/client-go v0.0.0-20250125113824-8e1f0b8fa9a7/go.mod h1:2tcufBE4Cu6RNgDCxcUJepa530kGo5GFVfR9BSnndhI=
 github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20250122171707-86066d47a264 h1:KoJiId8Ynajf/ZFodvmayFkDODIL7Vow3LmgR5+oVRg=

pkg/cloud/vsphere/assets/cloud-controller-manager-deployment.yaml

@@ -68,6 +68,8 @@ spec:
               value: {{ .globalCredsSecretName }}
             - name: ENABLE_ALPHA_DUAL_STACK
               value: "true"
+            - name: ADDITIONAL_NODE_LABELS
+              value: {{ .additionalLabels }}
           resources:
             requests:
               cpu: 200m
@@ -99,7 +101,8 @@ spec:
                 --leader-elect-retry-period=26s \
                 --leader-elect-resource-namespace=openshift-cloud-controller-manager \
                 --feature-gates={{ .featureGates }} \
-                --use-service-account-credentials=true
+                --use-service-account-credentials=true \
+                --node-labels=$(ADDITIONAL_NODE_LABELS)
           terminationMessagePolicy: FallbackToLogsOnError
           volumeMounts:
             - name: host-etc-kube

pkg/cloud/vsphere/vsphere.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"github.com/asaskevich/govalidator"
+	"github.com/openshift/api/features"
 	appsv1 "k8s.io/api/apps/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -18,6 +19,8 @@ const (
 
 	// see manifests/0000_26_cloud-controller-manager-operator_16_credentialsrequest-vsphere.yaml
 	globalCredsSecretName = "vsphere-cloud-credentials"
+
+	vSpherePlatformTypeLabel = "node.openshift.io/platform-type=vsphere"
 )
 
 var (
@@ -45,6 +48,7 @@ var templateValuesValidationMap = map[string]interface{}{
 	"globalCredsSecretName":      "required,type(string)",
 	"cloudproviderName":          "required,type(string)",
 	"featureGates":               "type(string)",
+	"additionalLabels":           "type(string)",
 }
 
 type vsphereAssets struct {
@@ -57,13 +61,20 @@ func (assets *vsphereAssets) GetRenderedResources() []client.Object {
 }
 
 func getTemplateValues(images *imagesReference, operatorConfig config.OperatorConfig) (common.TemplateValues, error) {
+	additionalLabels := ""
+
+	// We are only going to set the new platform-type node labels if the featuregate is enabled.
+	if operatorConfig.OCPFeatureGates.Enabled(features.FeatureGateVSphereMixedNodeEnv) {
+		additionalLabels = vSpherePlatformTypeLabel
+	}
 	values := common.TemplateValues{
 		"images":                     images,
 		"infrastructureName":         operatorConfig.InfrastructureName,
 		"globalCredsSecretNamespace": operatorConfig.ManagedNamespace,
 		"globalCredsSecretName":      globalCredsSecretName,
 		"cloudproviderName":          operatorConfig.GetPlatformNameString(),
 		"featureGates":               operatorConfig.FeatureGates,
+		"additionalLabels":           additionalLabels,
 	}
 	_, err := govalidator.ValidateMap(values, templateValuesValidationMap)
 	if err != nil {

pkg/cloud/vsphere/vsphere_test.go

@@ -41,6 +41,17 @@ func TestResourcesRenderingSmoke(t *testing.T) {
 				PlatformStatus:     &configv1.PlatformStatus{Type: configv1.VSpherePlatformType},
 				InfrastructureName: "infra",
 			},
+		}, {
+			name: "FeatureGate FeatureGateVSphereMixedNodeEnv=true results in node-labels generated without error",
+			config: config.OperatorConfig{
+				ManagedNamespace: "my-cool-namespace",
+				ImagesReference: config.ImagesReference{
+					CloudControllerManagerVSphere: "CloudControllerManagerVsphere",
+				},
+				PlatformStatus:     &configv1.PlatformStatus{Type: configv1.VSpherePlatformType},
+				InfrastructureName: "infra",
+				FeatureGates:       "FeatureGateVSphereMixedNodeEnv=true",
+			},
 		},
 	}
 

pkg/config/config.go

@@ -40,6 +40,7 @@ type OperatorConfig struct {
 	PlatformStatus     *configv1.PlatformStatus
 	ClusterProxy       *configv1.Proxy
 	FeatureGates       string
+	OCPFeatureGates    featuregates.FeatureGate
 }
 
 func (cfg *OperatorConfig) GetPlatformNameString() string {
@@ -97,11 +98,14 @@ func ComposeConfig(infrastructure *configv1.Infrastructure, clusterProxy *config
 		klog.Errorf("Unable to get upstream feature gates: %s", err)
 		return OperatorConfig{}, fmt.Errorf("unable to get upstream feature gates: %w", err)
 	}
+
+	var features featuregates.FeatureGate
 	if featureGateAccessor != nil {
-		features, _ := featureGateAccessor.CurrentFeatureGates()
+		features, _ = featureGateAccessor.CurrentFeatureGates()
 		enabled, _ := util.GetEnabledDisabledFeatures(features, upstreamGates)
 		featureGatesString = util.BuildFeatureGateString(enabled, nil)
 	}
+	fmt.Printf("Generated feature gates string: %s\n", featureGatesString)
 
 	config := OperatorConfig{
 		PlatformStatus:     infrastructure.Status.PlatformStatus.DeepCopy(),
@@ -111,6 +115,7 @@ func ComposeConfig(infrastructure *configv1.Infrastructure, clusterProxy *config
 		InfrastructureName: infrastructure.Status.InfrastructureName,
 		IsSingleReplica:    infrastructure.Status.ControlPlaneTopology == configv1.SingleReplicaTopologyMode,
 		FeatureGates:       featureGatesString,
+		OCPFeatureGates:    features,
 	}
 
 	return config, nil