github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-13 21:25:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90734 from cici37/ports

Browse Source 
Move CloudControllerManagerPort to k8s.io/cloud_provider
This commit is contained in:
Kubernetes Prow Robot
2020-06-02 18:10:17 -07:00
committed by GitHub
parent bb11561ace fd694fa947
commit 4f78660cdf
6 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cloud-controller-manager/app/options/BUILD
View File

@@ -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",
],

2
cmd/cloud-controller-manager/app/options/options.go
View File

@@ -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"