Revert "TUN-6373: Add edge-ip-version to remotely pushed configuration"

DevinCarr · DevinCarr · commit b9453b84bb15 · 2022-06-14T16:07:37.000-07:00
This reverts commit 8e9091c.
diff --git a/cmd/cloudflared/tunnel/configuration.go b/cmd/cloudflared/tunnel/configuration.go
@@ -45,7 +45,7 @@ var (
 	secretFlags     = [2]*altsrc.StringFlag{credentialsContentsFlag, tunnelTokenFlag}
 	defaultFeatures = []string{supervisor.FeatureAllowRemoteConfig, supervisor.FeatureSerializedHeaders}
 
-	configFlags = []string{"autoupdate-freq", "no-autoupdate", "retries", "protocol", "loglevel", "transport-loglevel", "origincert", "metrics", "metrics-update-freq", "edge-ip-version"}
+	configFlags = []string{"autoupdate-freq", "no-autoupdate", "retries", "protocol", "loglevel", "transport-loglevel", "origincert", "metrics", "metrics-update-freq"}
 )
 
 // returns the first path that contains a cert.pem file. If none of the DefaultConfigSearchDirectories

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ var (`
`45`	`45`	`secretFlags = [2]*altsrc.StringFlag{credentialsContentsFlag, tunnelTokenFlag}`
`46`	`46`	`defaultFeatures = []string{supervisor.FeatureAllowRemoteConfig, supervisor.FeatureSerializedHeaders}`
`47`	`47`
`48`		`- configFlags = []string{"autoupdate-freq", "no-autoupdate", "retries", "protocol", "loglevel", "transport-loglevel", "origincert", "metrics", "metrics-update-freq", "edge-ip-version"}`
	`48`	`+ configFlags = []string{"autoupdate-freq", "no-autoupdate", "retries", "protocol", "loglevel", "transport-loglevel", "origincert", "metrics", "metrics-update-freq"}`
`49`	`49`	`)`
`50`	`50`
`51`	`51`	`// returns the first path that contains a cert.pem file. If none of the DefaultConfigSearchDirectories`