xds: cleanup bootstrap processing functionality (#7299)

Author: easwars

internal/testutils/xds/bootstrap/bootstrap.go

@@ -111,7 +111,6 @@ func Contents(opts Options) ([]byte, error) {
 		ClientDefaultListenerResourceNameTemplate: opts.ClientDefaultListenerResourceNameTemplate,
 		ServerListenerResourceNameTemplate:        opts.ServerListenerResourceNameTemplate,
 	}
-	cfg.XdsServers[0].ServerFeatures = append(cfg.XdsServers[0].ServerFeatures, "xds_v3")
 	if opts.IgnoreResourceDeletion {
 		cfg.XdsServers[0].ServerFeatures = append(cfg.XdsServers[0].ServerFeatures, "ignore_resource_deletion")
 	}

internal/testutils/xds/e2e/setup_management_server.go

@@ -57,7 +57,7 @@ func SetupManagementServer(t *testing.T, opts ManagementServerOptions) (*Managem
 	}()
 
 	nodeID := uuid.New().String()
-	bootstrapContents, err := DefaultBootstrapContents(nodeID, server.Address)
+	bootstrapContents, err := DefaultBootstrapContents(nodeID, fmt.Sprintf("passthrough:///%s", server.Address))
 	if err != nil {
 		server.Stop()
 		t.Fatal(err)