add comments, logs, remove printlns

hashicorp · Sep 19, 2023 · b8134ee · b8134ee
1 parent 4c0dba3
commit b8134ee
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 16 deletions.
diff --git a/internal/mesh/internal/controllers/sidecarproxy/controller.go b/internal/mesh/internal/controllers/sidecarproxy/controller.go
@@ -203,7 +203,7 @@ func (r *reconciler) Reconcile(ctx context.Context, rt controller.Runtime, req c
 	// Get all destinationsData.
 	destinationsRefs := r.destinationsCache.DestinationsBySourceProxy(req.ID)
 	if len(destinationsRefs) > 0 {
-		rt.Logger.Trace("found destinations", "destination_refs", destinationsRefs)
+		rt.Logger.Trace("found destinations for this proxy", "id", req.ID, "destination_refs", destinationsRefs)
 	} else {
 		rt.Logger.Trace("did not find any destinations for this proxy", "id", req.ID)
 	}

diff --git a/internal/mesh/internal/controllers/sidecarproxy/fetcher/data_fetcher.go b/internal/mesh/internal/controllers/sidecarproxy/fetcher/data_fetcher.go
@@ -352,6 +352,9 @@ func (f *Fetcher) FetchImplicitDestinationsData(
 					if err != nil {
 						return nil, err
 					}
+					// We only add the endpoint to the map if it's not nil. If it's missing on lookup now, the
+					// controller should get triggered when the endpoint exists again since it watches service
+					// endpoints.
 					if se != nil {
 						endpointsMap[seRK] = se
 					}

diff --git a/internal/mesh/internal/controllers/xds/controller.go b/internal/mesh/internal/controllers/xds/controller.go
@@ -156,7 +156,6 @@ func (r *xdsReconciler) Reconcile(ctx context.Context, rt controller.Runtime, re
 	endpointReferencesMap := proxyStateTemplate.Template.RequiredEndpoints
 	var endpointsInProxyStateTemplate []resource.ReferenceOrID
 	for xdsClusterName, endpointRef := range endpointReferencesMap {
-		fmt.Println("*********** xds controller: generating endpoints for", xdsClusterName, endpointRef)
 		// Step 1: Resolve the reference by looking up the ServiceEndpoints.
 		// serviceEndpoints will not be nil unless there is an error.
 		//
@@ -310,7 +309,6 @@ func (r *xdsReconciler) Reconcile(ctx context.Context, rt controller.Runtime, re
 	// Now that the references have been resolved, push the computed proxy state to the updater.
 	computedProxyState := proxyStateTemplate.Template.ProxyState
 
-	fmt.Println("******** generated proxy state", proxyStateTemplate.Template.ProxyState)
 	err = r.updater.PushChange(req.ID, &proxytracker.ProxyState{ProxyState: computedProxyState})
 	if err != nil {
 		// Set the status.
@@ -343,7 +341,6 @@ func leafResourceRef(workloadIdentity, namespace, partition string) *pbresource.
 		Tenancy: &pbresource.Tenancy{
 			Partition: partition,
 			Namespace: namespace,
-			PeerName:  "local",
 		},
 	}
 	return ref

diff --git a/internal/mesh/internal/controllers/xds/endpoint_builder.go b/internal/mesh/internal/controllers/xds/endpoint_builder.go
@@ -21,7 +21,6 @@ func generateProxyStateEndpoints(serviceEndpoints *ServiceEndpointsData, portNam
 	}
 	eps := serviceEndpoints.Endpoints.GetEndpoints()
 
-	fmt.Println("*********** xds controller: generating endpoints", psEndpoints)
 	for _, ep := range eps {
 		for _, addr := range ep.Addresses {
 			// Check if the address is using the portName name this proxy state endpoints is for. If it does, create the
@@ -44,8 +43,6 @@ func generateProxyStateEndpoints(serviceEndpoints *ServiceEndpointsData, portNam
 		}
 	}
 
-	fmt.Println("*********** xds controller: computed endpoints", psEndpoints)
-
 	return &pbproxystate.Endpoints{Endpoints: psEndpoints}, nil
 }
 

diff --git a/internal/mesh/internal/mappers/sidecarproxymapper/destinations_mapper.go b/internal/mesh/internal/mappers/sidecarproxymapper/destinations_mapper.go
@@ -5,7 +5,6 @@ package sidecarproxymapper
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/hashicorp/consul/internal/controller"
 	"github.com/hashicorp/consul/internal/mesh/internal/types/intermediate"
@@ -19,7 +18,6 @@ func (m *Mapper) MapDestinationsToProxyStateTemplate(ctx context.Context, rt con
 	if err != nil {
 		return nil, err
 	}
-	fmt.Println("******** observed upstreams", "id", res.Id)
 
 	// Look up workloads for this destinations.
 	sourceProxyIDs := make(map[resource.ReferenceKey]struct{})

diff --git a/internal/mesh/internal/mappers/sidecarproxymapper/service_mapper.go b/internal/mesh/internal/mappers/sidecarproxymapper/service_mapper.go
@@ -5,7 +5,6 @@ package sidecarproxymapper
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/hashicorp/consul/internal/controller"
 	"github.com/hashicorp/consul/internal/mesh/internal/types"
@@ -72,8 +71,6 @@ func (m *Mapper) mapServiceThroughDestinationsToProxyStateTemplates(
 }
 
 func (m *Mapper) listAllProxyStateTemplatesTemporarily(ctx context.Context, rt controller.Runtime, tenancy *pbresource.Tenancy) ([]*pbresource.ID, error) {
-	fmt.Println("******* listing all proxy state templates")
-	fmt.Println("******* tenancy", tenancy)
 	// todo (ishustava): this is a stub for now until we implement implicit destinations.
 	// For tproxy, we generate requests for all proxy states in the cluster.
 	// This will generate duplicate events for proxies already added above,
@@ -87,14 +84,10 @@ func (m *Mapper) listAllProxyStateTemplatesTemporarily(ctx context.Context, rt c
 		},
 	})
 	if err != nil {
-		fmt.Println("*********** errored listing all proxy state templates: ", err)
 		return nil, err
 	}
 
 	result := make([]*pbresource.ID, 0, len(rsp.Resources))
-	if len(rsp.Resources) == 0 {
-		fmt.Println("*********** got 0 proxy state templates: ")
-	}
 	for _, r := range rsp.Resources {
 		result = append(result, r.Id)
 	}