Merge pull request projectcontour#1038 from davecheney/linting

all: fix a few lint warnings

cmd/contour/contour.go

@@ -170,7 +170,7 @@ func main() {
 		// once it attempts to log to files under /tmp, will crash the
 		// whole process since the path may not be accessible in
 		// container environment. See #959
-		flag.Lookup("logtostderr").Value.Set("true")
+		_ = flag.Lookup("logtostderr").Value.Set("true")
 
 		reh.IngressRouteRootNamespaces = parseRootNamespaces(ingressrouteRootNamespaceFlag)
 

internal/dag/builder_test.go

@@ -3644,10 +3644,8 @@ func route(prefix string, services ...*HTTPService) *Route {
 
 func routeCluster(prefix string, clusters ...*Cluster) *Route {
 	route := Route{
-		Prefix: prefix,
-	}
-	for _, c := range clusters {
-		route.Clusters = append(route.Clusters, c)
+		Prefix:   prefix,
+		Clusters: clusters,
 	}
 	return &route
 }

internal/envoy/route_test.go

@@ -448,11 +448,3 @@ func TestUpgradeHTTPS(t *testing.T) {
 		t.Fatal(diff)
 	}
 }
-
-func services(svcs ...*v1.Service) (v []*dag.TCPService) {
-	for _, s := range svcs {
-		x := service(s)
-		v = append(v, &x)
-	}
-	return v
-}