Skip to content

Commit 27cd83c

Browse files
committed
Revert "TUN-4926: Implement --region configuration option"
This reverts commit d0a1daa.
1 parent 75bdc96 commit 27cd83c

File tree

4 files changed

+1
-8
lines changed

4 files changed

+1
-8
lines changed

cmd/cloudflared/tunnel/cmd.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -494,11 +494,6 @@ func tunnelFlags(shouldHide bool) []cli.Flag {
494494
EnvVars: []string{"TUNNEL_EDGE"},
495495
Hidden: true,
496496
}),
497-
altsrc.NewStringSliceFlag(&cli.StringSliceFlag{
498-
Name: "region",
499-
Usage: "Cloudflare Edge region to connect to. Omit or set to empty to connect to the global region.",
500-
EnvVars: []string{"TUNNEL_REGION"},
501-
}),
502497
altsrc.NewStringFlag(&cli.StringFlag{
503498
Name: tlsconfig.CaCertFlag,
504499
Usage: "Certificate Authority authenticating connections with Cloudflare's edge network.",

cmd/cloudflared/tunnel/configuration.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ func prepareTunnelConfig(
279279
OSArch: buildInfo.OSArch(),
280280
ClientID: clientID,
281281
EdgeAddrs: c.StringSlice("edge"),
282-
Region: c.String("region"),
283282
HAConnections: c.Int("ha-connections"),
284283
IncidentLookup: origin.NewIncidentLookup(),
285284
IsAutoupdated: c.Bool("is-autoupdated"),

origin/supervisor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func NewSupervisor(config *TunnelConfig, reconnectCh chan ReconnectSignal, grace
7474
if len(config.EdgeAddrs) > 0 {
7575
edgeIPs, err = edgediscovery.StaticEdge(config.Log, config.EdgeAddrs)
7676
} else {
77-
edgeIPs, err = edgediscovery.ResolveEdge(config.Log, config.Region)
77+
edgeIPs, err = edgediscovery.ResolveEdge(config.Log, "")
7878
}
7979
if err != nil {
8080
return nil, err

origin/tunnel.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ type TunnelConfig struct {
4545
ClientID string
4646
CloseConnOnce *sync.Once // Used to close connectedSignal no more than once
4747
EdgeAddrs []string
48-
Region string
4948
HAConnections int
5049
IncidentLookup IncidentLookup
5150
IsAutoupdated bool

0 commit comments

Comments
 (0)