Add vpcID to defaultResourceManager

We're already passing this into NewDefaultResourceManager so no need to also add it to NetworkingManager.

Signed-off-by: Stephen Hoekstra <[email protected]>

Author: shoekstra

pkg/targetgroupbinding/networking_manager.go

@@ -41,9 +41,6 @@ type NetworkingManager interface {
 
 	// Cleanup reconcile network settings for TargetGroupBindings with zero endpoints.
 	Cleanup(ctx context.Context, tgb *elbv2api.TargetGroupBinding) error
-
-	// VpcID returns the ID of the VPC the ELB is attached to.
-	VpcID() string
 }
 
 // NewDefaultNetworkingManager constructs defaultNetworkingManager.
@@ -123,10 +120,6 @@ func (m *defaultNetworkingManager) Cleanup(ctx context.Context, tgb *elbv2api.Ta
 	return m.reconcileWithIngressPermissionsPerSG(ctx, tgb, nil)
 }
 
-func (m *defaultNetworkingManager) VpcID() string {
-	return m.vpcID
-}
-
 func (m *defaultNetworkingManager) computeIngressPermissionsPerSGWithPodEndpoints(ctx context.Context, tgbNetworking elbv2api.TargetGroupBindingNetworking, endpoints []backend.PodEndpoint) (map[string][]networking.IPPermissionInfo, error) {
 	pods := make([]k8s.PodInfo, 0, len(endpoints))
 	podByPodKey := make(map[types.NamespacedName]k8s.PodInfo, len(endpoints))

pkg/targetgroupbinding/resource_manager.go

@@ -58,6 +58,7 @@ func NewDefaultResourceManager(k8sClient client.Client, elbv2Client services.ELB
 		networkingManager: networkingManager,
 		eventRecorder:     eventRecorder,
 		logger:            logger,
+		vpcID:             vpcID,
 		vpcInfoProvider:   vpcInfoProvider,
 
 		targetHealthRequeueDuration: defaultTargetHealthRequeueDuration,
@@ -76,6 +77,7 @@ type defaultResourceManager struct {
 	eventRecorder     record.EventRecorder
 	logger            logr.Logger
 	vpcInfoProvider   networking.VPCInfoProvider
+	vpcID             string
 
 	targetHealthRequeueDuration time.Duration
 	enableEndpointSlices        bool
@@ -325,8 +327,7 @@ func (m *defaultResourceManager) deregisterTargets(ctx context.Context, tgARN st
 }
 
 func (m *defaultResourceManager) registerPodEndpoints(ctx context.Context, tgARN string, endpoints []backend.PodEndpoint) error {
-	vpcID := m.networkingManager.VpcID()
-	vpc, err := m.vpcInfoProvider.FetchVPCInfo(ctx, vpcID)
+	vpc, err := m.vpcInfoProvider.FetchVPCInfo(ctx, m.vpcID)
 	if err != nil {
 		return err
 	}