Added new node-labels cmd flag

Author: vr4manta

cmd/vsphere-cloud-controller-manager/main.go

@@ -30,9 +30,11 @@ import (
 	"syscall"
 	"time"
 
+	apivalidation "k8s.io/apimachinery/pkg/util/validation"
 	cloudprovider "k8s.io/cloud-provider"
 	"k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphere"
 	"k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphere/loadbalancer"
+	voptions "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphere/options"
 	"k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual"
 	pvconfig "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/config"
 	"k8s.io/cloud-provider/app"
@@ -98,6 +100,8 @@ func main() {
 		globalflag.Register(namedFlagSets.FlagSet("generic"), "is-legacy-paravirtual")
 	}
 
+	voptions.AddFlags(namedFlagSets.FlagSet("cloud-node-controller"))
+
 	for _, f := range namedFlagSets.FlagSets {
 		fs.AddFlagSet(f)
 	}
@@ -158,6 +162,14 @@ func main() {
 		verflag.PrintAndExitIfRequested()
 		cliflag.PrintFlags(cmd.Flags())
 
+		// Validate --node-labels keys follow Kubernetes label key formatting
+		for key := range vsphere.AdditionalLabels {
+			errList := apivalidation.IsQualifiedName(key)
+			if len(errList) > 0 {
+				klog.Fatalf("invalid --node-labels key %q: %s", key, strings.Join(errList, "; "))
+			}
+		}
+
 		c, err := ccmOptions.Config(app.ControllerNames(app.DefaultInitFuncConstructors), app.ControllersDisabledByDefault.List(), names.CCMControllerAliases(), app.AllWebhooks, app.DisabledByDefaultWebhooks)
 		if err != nil {
 			// explicitly ignore the error by Fprintf, exiting anyway

pkg/cloudprovider/vsphere/options/flags.go

@@ -0,0 +1,26 @@
+/*
+Copyright 2025 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package options
+
+import (
+	"github.com/spf13/pflag"
+	"k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphere"
+)
+
+// AddFlags add the additional flags for the controller
+func AddFlags(fs *pflag.FlagSet) {
+	fs.StringToStringVar(&vsphere.AdditionalLabels, "node-labels", nil,
+		"Additional labels to add to vSphere nodes during registration.  Each key must follow kubernetes label format.\n"+
+			"Example: --node-labels=node.foo.bar=vsphere,foo.bar/mapi=")
+}