xds: remove support for v2 Transport API (#6013)

grpc · Feb 14, 2023 · 081499f · 081499f
1 parent dd12def
commit 081499f
Show file tree

Hide file tree

Showing 41 changed files with 255 additions and 857 deletions.
diff --git a/admin/test/utils.go b/admin/test/utils.go
@@ -55,7 +55,6 @@ type ExpectedStatusCodes struct {
 func RunRegisterTests(t *testing.T, ec ExpectedStatusCodes) {
 	nodeID := uuid.New().String()
 	bootstrapCleanup, err := bootstrap.CreateFile(bootstrap.Options{
-		Version:   bootstrap.TransportV3,
 		NodeID:    nodeID,
 		ServerURI: "no.need.for.a.server",
 	})

diff --git a/internal/testutils/xds/bootstrap/bootstrap.go b/internal/testutils/xds/bootstrap/bootstrap.go
@@ -30,20 +30,8 @@ import (
 
 var logger = grpclog.Component("internal/xds")
 
-// TransportAPI refers to the API version for xDS transport protocol.
-type TransportAPI int
-
-const (
-	// TransportV2 refers to the v2 xDS transport protocol.
-	TransportV2 TransportAPI = iota
-	// TransportV3 refers to the v3 xDS transport protocol.
-	TransportV3
-)
-
 // Options wraps the parameters used to generate bootstrap configuration.
 type Options struct {
-	// Version is the xDS transport protocol version.
-	Version TransportAPI
 	// NodeID is the node identifier of the gRPC client/server node in the
 	// proxyless service mesh.
 	NodeID string
@@ -119,14 +107,7 @@ func Contents(opts Options) ([]byte, error) {
 		ClientDefaultListenerResourceNameTemplate: opts.ClientDefaultListenerResourceNameTemplate,
 		ServerListenerResourceNameTemplate:        opts.ServerListenerResourceNameTemplate,
 	}
-	switch opts.Version {
-	case TransportV2:
-		// TODO: Add any v2 specific fields.
-	case TransportV3:
-		cfg.XdsServers[0].ServerFeatures = append(cfg.XdsServers[0].ServerFeatures, "xds_v3")
-	default:
-		return nil, fmt.Errorf("unsupported xDS transport protocol version: %v", opts.Version)
-	}
+	cfg.XdsServers[0].ServerFeatures = append(cfg.XdsServers[0].ServerFeatures, "xds_v3")
 
 	auths := make(map[string]authority)
 	if envconfig.XDSFederation {

diff --git a/internal/testutils/xds/e2e/setup_management_server.go b/internal/testutils/xds/e2e/setup_management_server.go
@@ -79,7 +79,6 @@ func SetupManagementServer(t *testing.T, opts ManagementServerOptions) (*Managem
 	// Create a bootstrap file in a temporary directory.
 	nodeID := uuid.New().String()
 	bootstrapContents, err := bootstrap.Contents(bootstrap.Options{
-		Version:                            bootstrap.TransportV3,
 		NodeID:                             nodeID,
 		ServerURI:                          server.Address,
 		CertificateProviders:               cpc,

diff --git a/test/xds/xds_client_federation_test.go b/test/xds/xds_client_federation_test.go
@@ -74,7 +74,6 @@ func (s) TestClientSideFederation(t *testing.T) {
 	// Create a bootstrap file in a temporary directory.
 	nodeID := uuid.New().String()
 	bootstrapContents, err := bootstrap.Contents(bootstrap.Options{
-		Version:                            bootstrap.TransportV3,
 		NodeID:                             nodeID,
 		ServerURI:                          serverDefaultAuth.Address,
 		ServerListenerResourceNameTemplate: e2e.ServerListenerResourceNameTemplate,
@@ -220,7 +219,6 @@ func (s) TestFederation_UnknownAuthorityInReceivedResponse(t *testing.T) {
 
 	nodeID := uuid.New().String()
 	bootstrapContents, err := bootstrap.Contents(bootstrap.Options{
-		Version:                            bootstrap.TransportV3,
 		NodeID:                             nodeID,
 		ServerURI:                          mgmtServer.Address,
 		ServerListenerResourceNameTemplate: e2e.ServerListenerResourceNameTemplate,

diff --git a/xds/csds/csds.go b/xds/csds/csds.go
@@ -29,7 +29,6 @@ import (
 	"io"
 	"sync"
 
-	"github.com/golang/protobuf/proto"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
 	internalgrpclog "google.golang.org/grpc/internal/grpclog"
@@ -39,8 +38,6 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	v3adminpb "github.com/envoyproxy/go-control-plane/envoy/admin/v3"
-	v2corepb "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
-	v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	v3statusgrpc "github.com/envoyproxy/go-control-plane/envoy/service/status/v3"
 	v3statuspb "github.com/envoyproxy/go-control-plane/envoy/service/status/v3"
 )
@@ -126,7 +123,7 @@ func (s *ClientStatusDiscoveryServer) buildClientStatusRespForReq(req *v3statusp
 	ret := &v3statuspb.ClientStatusResponse{
 		Config: []*v3statuspb.ClientConfig{
 			{
-				Node:              nodeProtoToV3(s.xdsClient.BootstrapConfig().XDSServer.NodeProto, s.logger),
+				Node:              s.xdsClient.BootstrapConfig().NodeProto,
 				GenericXdsConfigs: dumpToGenericXdsConfig(dump),
 			},
 		},
@@ -141,37 +138,6 @@ func (s *ClientStatusDiscoveryServer) Close() {
 	}
 }
 
-// nodeProtoToV3 converts the given proto into a v3.Node. n is from bootstrap
-// config, it can be either v2.Node or v3.Node.
-//
-// If n is already a v3.Node, return it.
-// If n is v2.Node, marshal and unmarshal it to v3.
-// Otherwise, return nil.
-//
-// The default case (not v2 or v3) is nil, instead of error, because the
-// resources in the response are more important than the node. The worst case is
-// that the user will receive no Node info, but will still get resources.
-func nodeProtoToV3(n proto.Message, logger *internalgrpclog.PrefixLogger) *v3corepb.Node {
-	var node *v3corepb.Node
-	switch nn := n.(type) {
-	case *v3corepb.Node:
-		node = nn
-	case *v2corepb.Node:
-		v2, err := proto.Marshal(nn)
-		if err != nil {
-			logger.Warningf("Failed to marshal node (%v): %v", n, err)
-			break
-		}
-		node = new(v3corepb.Node)
-		if err := proto.Unmarshal(v2, node); err != nil {
-			logger.Warningf("Failed to unmarshal node (%v): %v", v2, err)
-		}
-	default:
-		logger.Warningf("node from bootstrap is %#v, only v2.Node and v3.Node are supported", nn)
-	}
-	return node
-}
-
 func dumpToGenericXdsConfig(dump map[string]map[string]xdsresource.UpdateWithMD) []*v3statuspb.ClientConfig_GenericXdsConfig {
 	var ret []*v3statuspb.ClientConfig_GenericXdsConfig
 	for typeURL, updates := range dump {

diff --git a/xds/csds/csds_e2e_test.go b/xds/csds/csds_e2e_test.go
@@ -125,7 +125,6 @@ func (s) TestCSDS(t *testing.T) {
 
 	// Create a bootstrap file in a temporary directory.
 	bootstrapCleanup, err := bootstrap.CreateFile(bootstrap.Options{
-		Version:   bootstrap.TransportV3,
 		NodeID:    nodeID,
 		ServerURI: mgmtServer.Address,
 	})

diff --git a/xds/csds/csds_test.go b/xds/csds/csds_test.go
diff --git a/xds/googledirectpath/googlec2p.go b/xds/googledirectpath/googlec2p.go
@@ -41,7 +41,6 @@ import (
 	_ "google.golang.org/grpc/xds" // To register xds resolvers and balancers.
 	"google.golang.org/grpc/xds/internal/xdsclient"
 	"google.golang.org/grpc/xds/internal/xdsclient/bootstrap"
-	"google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version"
 	"google.golang.org/protobuf/types/known/structpb"
 
 	v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
@@ -118,10 +117,8 @@ func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts
 		balancerName = tdURL
 	}
 	serverConfig := &bootstrap.ServerConfig{
-		ServerURI:    balancerName,
-		Creds:        grpc.WithCredentialsBundle(google.NewDefaultCredentials()),
-		TransportAPI: version.TransportV3,
-		NodeProto:    newNode(<-zoneCh, <-ipv6CapableCh),
+		ServerURI: balancerName,
+		Creds:     grpc.WithCredentialsBundle(google.NewDefaultCredentials()),
 	}
 	config := &bootstrap.Config{
 		XDSServer: serverConfig,
@@ -131,6 +128,7 @@ func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts
 				XDSServer: serverConfig,
 			},
 		},
+		NodeProto: newNode(<-zoneCh, <-ipv6CapableCh),
 	}
 
 	// Create singleton xds client with this config. The xds client will be

diff --git a/xds/googledirectpath/googlec2p_test.go b/xds/googledirectpath/googlec2p_test.go
@@ -32,7 +32,6 @@ import (
 	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/xds/internal/xdsclient"
 	"google.golang.org/grpc/xds/internal/xdsclient/bootstrap"
-	"google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version"
 	"google.golang.org/protobuf/testing/protocmp"
 	"google.golang.org/protobuf/types/known/structpb"
 
@@ -214,9 +213,7 @@ func TestBuildXDS(t *testing.T) {
 				}
 			}
 			serverConfig := &bootstrap.ServerConfig{
-				ServerURI:    tdURL,
-				TransportAPI: version.TransportV3,
-				NodeProto:    wantNode,
+				ServerURI: tdURL,
 			}
 			wantConfig := &bootstrap.Config{
 				XDSServer: serverConfig,
@@ -226,6 +223,7 @@ func TestBuildXDS(t *testing.T) {
 						XDSServer: serverConfig,
 					},
 				},
+				NodeProto: wantNode,
 			}
 			if tt.tdURI != "" {
 				wantConfig.XDSServer.ServerURI = tt.tdURI

diff --git a/xds/internal/httpfilter/fault/fault_test.go b/xds/internal/httpfilter/fault/fault_test.go
@@ -106,7 +106,6 @@ func clientSetup(t *testing.T) (*e2e.ManagementServer, string, uint32, func()) {
 
 	// Create a bootstrap file in a temporary directory.
 	bootstrapCleanup, err := bootstrap.CreateFile(bootstrap.Options{
-		Version:                            bootstrap.TransportV3,
 		NodeID:                             nodeID,
 		ServerURI:                          fs.Address,
 		ServerListenerResourceNameTemplate: "grpc/server",