remove remaining xDS resource v2 server and related converters

Updates projectcontour#1898 Signed-off-by: Steve Sloka <slokas@vmware.com>
stevesloka · Nov 13, 2020 · 81b9be2 · 81b9be2
1 parent 75a7e0c
commit 81b9be2
Show file tree

Hide file tree

Showing 45 changed files with 2 additions and 15,258 deletions.
diff --git a/cmd/contour/shutdownmanager.go b/cmd/contour/shutdownmanager.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"time"
 
-	xdscache_v2 "github.com/projectcontour/contour/internal/xdscache/v2"
+	xdscache_v3 "github.com/projectcontour/contour/internal/xdscache/v3"
 	"github.com/prometheus/common/expfmt"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/alecthomas/kingpin.v2"
@@ -40,7 +40,7 @@ const shutdownReadyFile = "/ok"
 const shutdownReadyCheckInterval = time.Second * 1
 
 func prometheusLabels() []string {
-	return []string{xdscache_v2.ENVOY_HTTP_LISTENER, xdscache_v2.ENVOY_HTTPS_LISTENER}
+	return []string{xdscache_v3.ENVOY_HTTP_LISTENER, xdscache_v3.ENVOY_HTTPS_LISTENER}
 }
 
 type shutdownmanagerContext struct {

diff --git a/internal/envoy/v2/accesslog.go b/internal/envoy/v2/accesslog.go
diff --git a/internal/envoy/v2/accesslog_test.go b/internal/envoy/v2/accesslog_test.go
diff --git a/internal/envoy/v2/auth.go b/internal/envoy/v2/auth.go