Revert "TUN-4926: Implement --region configuration option"
This reverts commit d0a1daac3b.
			
			
This commit is contained in:
		
							parent
							
								
									75bdc96763
								
							
						
					
					
						commit
						27cd83c2d3
					
				|  | @ -494,11 +494,6 @@ func tunnelFlags(shouldHide bool) []cli.Flag { | |||
| 			EnvVars: []string{"TUNNEL_EDGE"}, | ||||
| 			Hidden:  true, | ||||
| 		}), | ||||
| 		altsrc.NewStringSliceFlag(&cli.StringSliceFlag{ | ||||
| 			Name:    "region", | ||||
| 			Usage:   "Cloudflare Edge region to connect to. Omit or set to empty to connect to the global region.", | ||||
| 			EnvVars: []string{"TUNNEL_REGION"}, | ||||
| 		}), | ||||
| 		altsrc.NewStringFlag(&cli.StringFlag{ | ||||
| 			Name:    tlsconfig.CaCertFlag, | ||||
| 			Usage:   "Certificate Authority authenticating connections with Cloudflare's edge network.", | ||||
|  |  | |||
|  | @ -279,7 +279,6 @@ func prepareTunnelConfig( | |||
| 		OSArch:           buildInfo.OSArch(), | ||||
| 		ClientID:         clientID, | ||||
| 		EdgeAddrs:        c.StringSlice("edge"), | ||||
| 		Region:           c.String("region"), | ||||
| 		HAConnections:    c.Int("ha-connections"), | ||||
| 		IncidentLookup:   origin.NewIncidentLookup(), | ||||
| 		IsAutoupdated:    c.Bool("is-autoupdated"), | ||||
|  |  | |||
|  | @ -74,7 +74,7 @@ func NewSupervisor(config *TunnelConfig, reconnectCh chan ReconnectSignal, grace | |||
| 	if len(config.EdgeAddrs) > 0 { | ||||
| 		edgeIPs, err = edgediscovery.StaticEdge(config.Log, config.EdgeAddrs) | ||||
| 	} else { | ||||
| 		edgeIPs, err = edgediscovery.ResolveEdge(config.Log, config.Region) | ||||
| 		edgeIPs, err = edgediscovery.ResolveEdge(config.Log, "") | ||||
| 	} | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
|  |  | |||
|  | @ -45,7 +45,6 @@ type TunnelConfig struct { | |||
| 	ClientID         string | ||||
| 	CloseConnOnce    *sync.Once // Used to close connectedSignal no more than once
 | ||||
| 	EdgeAddrs        []string | ||||
| 	Region           string | ||||
| 	HAConnections    int | ||||
| 	IncidentLookup   IncidentLookup | ||||
| 	IsAutoupdated    bool | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue