diff --git a/cmd/glbc/main.go b/cmd/glbc/main.go index 2d55422ec7..82ab194ec5 100644 --- a/cmd/glbc/main.go +++ b/cmd/glbc/main.go @@ -265,7 +265,7 @@ func main() { EnableWeightedL4NetLB: flags.F.EnableWeightedL4NetLB, DisableL4LBFirewall: flags.F.DisableL4LBFirewall, } - ctx := ingctx.NewControllerContext(kubeConfig, kubeClient, backendConfigClient, frontendConfigClient, firewallCRClient, svcNegClient, ingParamsClient, svcAttachmentClient, networkClient, nodeTopologyClient, eventRecorderKubeClient, cloud, namer, kubeSystemUID, ctxConfig, rootLogger) + ctx := ingctx.NewControllerContext(kubeClient, backendConfigClient, frontendConfigClient, firewallCRClient, svcNegClient, ingParamsClient, svcAttachmentClient, networkClient, nodeTopologyClient, eventRecorderKubeClient, cloud, namer, kubeSystemUID, ctxConfig, rootLogger) go app.RunHTTPServer(ctx.HealthCheck, rootLogger) var once sync.Once diff --git a/pkg/common/operator/ingress_test.go b/pkg/common/operator/ingress_test.go index 16c4982da9..6e33e352e9 100644 --- a/pkg/common/operator/ingress_test.go +++ b/pkg/common/operator/ingress_test.go @@ -57,7 +57,7 @@ func TestReferencesSvcNeg(t *testing.T) { HealthCheckPath: "/", EnableIngressRegionalExternal: true, } - ctx := context.NewControllerContext(nil, kubeClient, nil, nil, nil, nil, nil, nil, nil, nil, kubeClient /*kube client to be used for events*/, gceClient, namer, "" /*kubeSystemUID*/, ctxConfig, klog.TODO()) + ctx := context.NewControllerContext(kubeClient, nil, nil, nil, nil, nil, nil, nil, nil, kubeClient /*kube client to be used for events*/, gceClient, namer, "" /*kubeSystemUID*/, ctxConfig, klog.TODO()) if err := addTestService(ctx); err != nil { t.Fatalf("Failed to add test service: %v", err) diff --git a/pkg/context/context.go b/pkg/context/context.go index 8b59e3f0dd..0604da9281 100644 --- a/pkg/context/context.go +++ b/pkg/context/context.go @@ -36,7 +36,6 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" - "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/cloud-provider-gcp/providers/gce" @@ -75,7 +74,6 @@ const ( // ControllerContext holds the state needed for the execution of the controller. type ControllerContext struct { - KubeConfig *rest.Config KubeClient kubernetes.Interface SvcNegClient svcnegclient.Interface SAClient serviceattachmentclient.Interface @@ -155,7 +153,6 @@ type ControllerContextConfig struct { // NewControllerContext returns a new shared set of informers. func NewControllerContext( - kubeConfig *rest.Config, kubeClient kubernetes.Interface, backendConfigClient backendconfigclient.Interface, frontendConfigClient frontendconfigclient.Interface, @@ -185,7 +182,6 @@ func NewControllerContext( } context := &ControllerContext{ - KubeConfig: kubeConfig, KubeClient: kubeClient, FirewallClient: firewallClient, SvcNegClient: svcnegClient, diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go index cb9a039b39..0b9d826f86 100644 --- a/pkg/controller/controller_test.go +++ b/pkg/controller/controller_test.go @@ -87,7 +87,7 @@ func newLoadBalancerController() *LoadBalancerController { HealthCheckPath: "/", EnableIngressRegionalExternal: true, } - ctx := context.NewControllerContext(nil, kubeClient, backendConfigClient, nil, nil, svcNegClient, nil, nil, nil, nil, kubeClient /*kube client to be used for events*/, fakeGCE, namer, "" /*kubeSystemUID*/, ctxConfig, klog.TODO()) + ctx := context.NewControllerContext(kubeClient, backendConfigClient, nil, nil, svcNegClient, nil, nil, nil, nil, kubeClient /*kube client to be used for events*/, fakeGCE, namer, "" /*kubeSystemUID*/, ctxConfig, klog.TODO()) lbc := NewLoadBalancerController(ctx, stopCh, klog.TODO()) // TODO(rramkumar): Fix this so we don't have to override with our fake lbc.instancePool = instancegroups.NewManager(&instancegroups.ManagerConfig{ diff --git a/pkg/firewalls/controller_test.go b/pkg/firewalls/controller_test.go index 7d78cf3eb1..c1ebc50974 100644 --- a/pkg/firewalls/controller_test.go +++ b/pkg/firewalls/controller_test.go @@ -54,7 +54,7 @@ func newFirewallController() *FirewallController { ResyncPeriod: 1 * time.Minute, DefaultBackendSvcPort: test.DefaultBeSvcPort, } - ctx := context.NewControllerContext(nil, kubeClient, backendConfigClient, nil, firewallClient, nil, nil, nil, nil, nil, kubeClient /*kube client to be used for events*/, fakeGCE, defaultNamer, "" /*kubeSystemUID*/, ctxConfig, klog.TODO()) + ctx := context.NewControllerContext(kubeClient, backendConfigClient, nil, firewallClient, nil, nil, nil, nil, nil, kubeClient /*kube client to be used for events*/, fakeGCE, defaultNamer, "" /*kubeSystemUID*/, ctxConfig, klog.TODO()) fwc := NewFirewallController(ctx, []string{"30000-32767"}, false, false, true, make(chan struct{}), klog.TODO()) fwc.hasSynced = func() bool { return true } diff --git a/pkg/l4lb/l4controller_test.go b/pkg/l4lb/l4controller_test.go index b8cb0161fc..e57b204954 100644 --- a/pkg/l4lb/l4controller_test.go +++ b/pkg/l4lb/l4controller_test.go @@ -851,7 +851,7 @@ func newServiceController(t *testing.T, fakeGCE *gce.Cloud) *L4Controller { ResyncPeriod: 1 * time.Minute, NumL4Workers: 5, } - ctx := context.NewControllerContext(nil, kubeClient, nil, nil, nil, svcNegClient, nil, nil, nil, nil, kubeClient /*kube client to be used for events*/, fakeGCE, namer, "" /*kubeSystemUID*/, ctxConfig, klog.TODO()) + ctx := context.NewControllerContext(kubeClient, nil, nil, nil, svcNegClient, nil, nil, nil, nil, kubeClient /*kube client to be used for events*/, fakeGCE, namer, "" /*kubeSystemUID*/, ctxConfig, klog.TODO()) // Add some nodes so that NEG linker kicks in during ILB creation. nodes, err := test.CreateAndInsertNodes(ctx.Cloud, []string{"instance-1"}, vals.ZoneName) if err != nil { diff --git a/pkg/l4lb/l4netlbcontroller_test.go b/pkg/l4lb/l4netlbcontroller_test.go index 14b1f003c3..f2abe28dc1 100644 --- a/pkg/l4lb/l4netlbcontroller_test.go +++ b/pkg/l4lb/l4netlbcontroller_test.go @@ -310,7 +310,7 @@ func buildContext(vals gce.TestClusterValues) *ingctx.ControllerContext { NumL4NetLBWorkers: 5, MaxIGSize: 1000, } - return ingctx.NewControllerContext(nil, kubeClient, nil, nil, nil, svcNegClient, nil, nil, networkClient, nil, kubeClient /*kube client to be used for events*/, fakeGCE, namer, "" /*kubeSystemUID*/, ctxConfig, klog.TODO()) + return ingctx.NewControllerContext(kubeClient, nil, nil, nil, svcNegClient, nil, nil, networkClient, nil, kubeClient /*kube client to be used for events*/, fakeGCE, namer, "" /*kubeSystemUID*/, ctxConfig, klog.TODO()) } func newL4NetLBServiceController() *L4NetLBController { diff --git a/pkg/psc/controller_test.go b/pkg/psc/controller_test.go index 1d1ba2aba3..c568955ea3 100644 --- a/pkg/psc/controller_test.go +++ b/pkg/psc/controller_test.go @@ -1097,7 +1097,7 @@ func newTestController(clusterType string) *Controller { flags.F.GKEClusterName = ClusterName flags.F.GKEClusterType = clusterType - ctx := context.NewControllerContext(nil, kubeClient, nil, nil, nil, nil, nil, saClient, nil, nil, kubeClient /*kube client to be used for events*/, gceClient, resourceNamer, kubeSystemUID, ctxConfig, klog.TODO()) + ctx := context.NewControllerContext(kubeClient, nil, nil, nil, nil, nil, saClient, nil, nil, kubeClient /*kube client to be used for events*/, gceClient, resourceNamer, kubeSystemUID, ctxConfig, klog.TODO()) return NewController(ctx, make(<-chan struct{}), klog.TODO()) }