Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

googlec2p: remove support for the experimental scheme #6645

Merged
merged 2 commits into from
Sep 25, 2023
Merged

googlec2p: remove support for the experimental scheme #6645

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
921e932
googlec2p: remove support for the experimental scheme
easwars Sep 18, 2023
377db0b
remove scheme field in c2pResolverBuilder
easwars Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions xds/googledirectpath/googlec2p.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,8 @@ import (
)

const (
c2pScheme = "google-c2p"
c2pExperimentalScheme = "google-c2p-experimental"
c2pAuthority = "traffic-director-c2p.xds.googleapis.com"
c2pScheme = "google-c2p"
c2pAuthority = "traffic-director-c2p.xds.googleapis.com"

tdURL = "dns:///directpath-pa.googleapis.com"
httpReqTimeout = 10 * time.Second
Expand Down Expand Up @@ -77,18 +76,10 @@ var (
)

func init() {
resolver.Register(c2pResolverBuilder{
scheme: c2pScheme,
})
// TODO(apolcyn): remove this experimental scheme before the 1.52 release
resolver.Register(c2pResolverBuilder{
scheme: c2pExperimentalScheme,
})
resolver.Register(c2pResolverBuilder{})
}

type c2pResolverBuilder struct {
scheme string
}
type c2pResolverBuilder struct{}

func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) {
if t.URL.Host != "" {
Expand Down Expand Up @@ -165,7 +156,7 @@ func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts
}

func (b c2pResolverBuilder) Scheme() string {
return b.scheme
return c2pScheme
}

type c2pResolver struct {
Expand Down