github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #73427 from andrewsykim/cloud-provider-controller-client-builder

Browse Source 
use ControllerClientBuilder in k8s.io/cloud-provider for AWS/GCE cloud providers
This commit is contained in:
Kubernetes Prow Robot 2019-01-29 08:12:24 -08:00 committed by GitHub
commit d2570d3971
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cloudprovider/providers/aws/aws.go
View File

@ -505,7 +505,7 @@ type Cloud struct {
instanceCache instanceCache instanceCache instanceCache
clientBuilder controller.ControllerClientBuilder clientBuilder cloudprovider.ControllerClientBuilder
kubeClient clientset.Interface kubeClient clientset.Interface
eventBroadcaster record.EventBroadcaster eventBroadcaster record.EventBroadcaster
eventRecorder record.EventRecorder eventRecorder record.EventRecorder

1
pkg/cloudprovider/providers/gce/BUILD
View File

@ -47,7 +47,6 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/gce", importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/gce",
deps = [ deps = [
"//pkg/api/v1/service:go_default_library", "//pkg/api/v1/service:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/features:go_default_library", "//pkg/features:go_default_library",
"//pkg/kubelet/apis:go_default_library", "//pkg/kubelet/apis:go_default_library",
"//pkg/master/ports:go_default_library", "//pkg/master/ports:go_default_library",

3
pkg/cloudprovider/providers/gce/gce.go
View File

@ -51,7 +51,6 @@ import (
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud" "github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
cloudprovider "k8s.io/cloud-provider" cloudprovider "k8s.io/cloud-provider"
"k8s.io/kubernetes/pkg/controller"
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
"k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/pkg/version"
) )
@ -118,7 +117,7 @@ type Cloud struct {
containerService *container.Service containerService *container.Service
tpuService *tpuService tpuService *tpuService
client clientset.Interface client clientset.Interface
clientBuilder controller.ControllerClientBuilder clientBuilder cloudprovider.ControllerClientBuilder
eventBroadcaster record.EventBroadcaster eventBroadcaster record.EventBroadcaster
eventRecorder record.EventRecorder eventRecorder record.EventRecorder
projectID string projectID string