gravitational/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport.git synced 2026-10-12 02:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Configure allow-proxy-conflict in teleport-update using env var (#63860)

Browse Source 
`teleport-update` is used to auto discover servers.
Sometimes it might be required to allow proxy conflicts, when we are
installing instances that were previously discovered by another cluster.

This is a simple fix for a single instance: just remove the
`teleport.yaml` file in target server.

However, for large clusters, this can be problematic.

Exposing this setting using an env var allows the Discovery Service to
conditionally set it.
This commit is contained in:
Marco Dinis
2026-02-18 12:19:04 +00:00
committed by GitHub
parent 844928e1ff
commit 91a5094e5d
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/autoupdate/suffix.go → lib/autoupdate/env_vars.go
+7 -2
View File
@@ -18,5 +18,10 @@
package autoupdate
// InstallSuffixEnvVar specifies the Teleport install suffix.
const InstallSuffixEnvVar = "TELEPORT_INSTALL_SUFFIX"
const (
// InstallSuffixEnvVar specifies the Teleport install suffix.
InstallSuffixEnvVar = "TELEPORT_INSTALL_SUFFIX"
// AllowProxyConflictEnvVar allows defining whether a proxy conflict is allowed via env var.
AllowProxyConflictEnvVar = "TELEPORT_ALLOW_PROXY_CONFLICT"
)
tool/teleport-update/main.go
+1 -1
View File
@@ -134,7 +134,7 @@ func Run(args []string) int {
enableCmd.Flag("overwrite", "Allow existing installed binaries and services to be overwritten.").
Short('o').BoolVar(&ccfg.AllowOverwrite)
enableCmd.Flag("allow-proxy-conflict", "Allow proxy addresses in teleport.yaml and update.yaml to conflict.").
BoolVar(&ccfg.AllowProxyConflict)
Envar(common.AllowProxyConflictEnvVar).BoolVar(&ccfg.AllowProxyConflict)
enableCmd.Flag("force-version", "Force the provided version instead of using the version provided by the Teleport cluster.").
Hidden().Short('f').Envar(updateVersionEnvVar).StringVar(&ccfg.ForceVersion)
enableCmd.Flag("force-flag", "Force the provided version flags instead of using the version flags provided by the Teleport cluster.").