Refactor to remove ClusterManager completely #422
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
size/L
|
/assign @bowei |
rramkumar1
changed the title
bowei
reviewed
Aug 7, 2018
pkg/controller/controller.go
Outdated
| instancePool: instances.NewNodePool(ctx.Cloud, ctx.ClusterNamer), | ||
| l7Pool: loadbalancers.NewLoadBalancerPool(ctx.Cloud, ctx.ClusterNamer), | ||
| } | ||
| healthChecker := healthchecks.NewHealthChecker(ctx.Cloud, ctx.HealthCheckPath, ctx.DefaultBackendHealthCheckPath, ctx.ClusterNamer, ctx.DefaultBackendSvcPortID.Service) |
There was a problem hiding this comment.
Looks like this could be:
healthChecker := healthchecks.NewHealthChecker(ctx.Cloud, ctx.HealthCheckPath, ctx.DefaultBackendHealthCheckPath, ctx.ClusterNamer, ctx.DefaultBackendSvcPortID.Service)
instancePool := instances.NewNodePool(ctx.Cloud, ctx.ClusterNamer)
backendPool := backends.NewBackendPool(ctx.Cloud, ctx.Cloud, healthChecker, instancePool, ctx.ClusterNamer, ctx.BackendConfigEnabled, true)
lbc := LoadBalancerController{
...
nodes: NewNodeController(ctx, lbc.instancePool),
backendPool: backendPool,
}
pkg/controller/controller.go
Outdated
| lbc.Translator = translator.NewTranslator(lbc.CloudClusterManager.ClusterNamer, lbc.ctx) | ||
| lbc.Translator = translator.NewTranslator(lbc.ctx) | ||
| // TODO(rramkumar): Try to get rid of this "Init". | ||
| lbc.instancePool.Init(lbc.Translator) |
pkg/controller/controller.go
Outdated
| @@ -175,7 +183,11 @@ func NewLoadBalancerController( | |||
| }) | |||
| } | |||
|
|
|||
| lbc.Translator = translator.NewTranslator(lbc.CloudClusterManager.ClusterNamer, lbc.ctx) | |||
| lbc.Translator = translator.NewTranslator(lbc.ctx) | |||
There was a problem hiding this comment.
Add this to the lbc decl above Translator: ctx.
pkg/controller/controller.go
Outdated
| // TODO(rramkumar): Try to get rid of this "Init". | ||
| lbc.instancePool.Init(lbc.Translator) | ||
| lbc.backendPool.Init(lbc.Translator) | ||
|
|
||
| lbc.tlsLoader = &tls.TLSCertsFromSecretsLoader{Client: lbc.client} |
| @@ -25,12 +25,10 @@ import ( | |||
| api_v1 "k8s.io/api/core/v1" | |||
| meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" | |||
| "k8s.io/apimachinery/pkg/types" | |||
| "k8s.io/apimachinery/pkg/util/sets" | |||
| //"k8s.io/apimachinery/pkg/util/sets" | |||
There was a problem hiding this comment.
Commented out for now since its used in the test I commented out
| @@ -63,9 +60,10 @@ func TestZoneListing(t *testing.T) { | |||
| } | |||
| } | |||
|
|
|||
| /* | |||
There was a problem hiding this comment.
keep track of this so we don't forget..
There was a problem hiding this comment.
Yup, I'm going to fix it in a followup soon.
rramkumar1
force-pushed
the
remove-cluster-manager
branch
from
f78902a
to
e856849
Compare
k8s-ci-robot
added
size/XL
rramkumar1
force-pushed
the
remove-cluster-manager
branch
from
e856849
to
7c341b5
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR removes the ClusterManager completely from existence. All resource pools that were managed in the ClusterManager are now directly managed by the LB controller. Furthermore, all wrapper functions (EnsureInstanceGroupsAndPorts) are implemented by the LB controller itself.
Note: Still need to figure out unit test failure.
/assign @bowei