Merge pull request #90734 from cici37/ports

Move CloudControllerManagerPort to k8s.io/cloud_provider

cmd/cloud-controller-manager/app/options/BUILD

@@ -18,7 +18,6 @@ go_library(
         "//cmd/controller-manager/app/options:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/features:go_default_library",
-        "//pkg/master/ports:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
@@ -31,6 +30,7 @@ go_library(
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
         "//staging/src/k8s.io/client-go/tools/record:go_default_library",
+        "//staging/src/k8s.io/cloud-provider:go_default_library",
         "//staging/src/k8s.io/component-base/cli/flag:go_default_library",
         "//vendor/k8s.io/klog/v2:go_default_library",
     ],

cmd/cloud-controller-manager/app/options/options.go

@@ -34,6 +34,7 @@ import (
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/record"
+	ports "k8s.io/cloud-provider"
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/klog/v2"
 	ccmconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config"
@@ -42,7 +43,6 @@ import (
 	cloudcontrollerconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config"
 	cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options"
 	"k8s.io/kubernetes/pkg/controller"
-	"k8s.io/kubernetes/pkg/master/ports"
 
 	// add the kubernetes feature gates
 	_ "k8s.io/kubernetes/pkg/features"

pkg/master/ports/BUILD

@@ -12,6 +12,9 @@ go_library(
         "ports.go",
     ],
     importpath = "k8s.io/kubernetes/pkg/master/ports",
+    deps = [
+        "//staging/src/k8s.io/cloud-provider:go_default_library",
+    ],
 )
 
 filegroup(

pkg/master/ports/ports.go

@@ -16,6 +16,10 @@ limitations under the License.
 
 package ports
 
+import (
+	"k8s.io/cloud-provider"
+)
+
 const (
 	// ProxyStatusPort is the default port for the proxy metrics server.
 	// May be overridden by a flag at startup.
@@ -41,5 +45,5 @@ const (
 	KubeControllerManagerPort = 10257
 	// CloudControllerManagerPort is the default port for the cloud controller manager server.
 	// This value may be overridden by a flag at startup.
-	CloudControllerManagerPort = 10258
+	CloudControllerManagerPort = cloudprovider.CloudControllerManagerPort
 )

staging/src/k8s.io/cloud-provider/BUILD

@@ -11,6 +11,7 @@ go_library(
         "cloud.go",
         "doc.go",
         "plugins.go",
+        "ports.go",
     ],
     importmap = "k8s.io/kubernetes/vendor/k8s.io/cloud-provider",
     importpath = "k8s.io/cloud-provider",

staging/src/k8s.io/cloud-provider/ports.go

@@ -0,0 +1,23 @@
+/*
+Copyright 2014 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 cloudprovider
+
+const (
+	// CloudControllerManagerPort is the default port for the cloud controller manager server.
+	// This value may be overridden by a flag at startup.
+	CloudControllerManagerPort = 10258
+)