diff options
| author | Irbe Krumina <irbe@tailscale.com> | 2025-05-30 11:30:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-30 11:30:03 +0100 |
| commit | 5b670eb3a5f1749a655692d97a2e7086c78d1580 (patch) | |
| tree | 190e9d7be25e2276aceb60ad01d48c260b6d0a93 /control/controlhttp/controlhttpserver/controlhttpserver.go | |
| parent | ef49e75b10a30b32c0c4e79c7e78392b95435eed (diff) | |
| download | tailscale-5b670eb3a5f1749a655692d97a2e7086c78d1580.tar.xz tailscale-5b670eb3a5f1749a655692d97a2e7086c78d1580.zip | |
cmd/containerboot: allow setting --accept-dns via TS_EXTRA_ARGS again (#16129)
In 1.84 we made 'tailscale set'/'tailscale up' error out if duplicate
command line flags are passed.
This broke some container configurations as we have two env vars that
can be used to set --accept-dns flag:
- TS_ACCEPT_DNS- specifically for --accept-dns
- TS_EXTRA_ARGS- accepts any arbitrary 'tailscale up'/'tailscale set'
flag.
We default TS_ACCEPT_DNS to false (to make the container behaviour more
declarative), which with the new restrictive CLI behaviour resulted in
failure for users who had set --accept-dns via TS_EXTRA_ARGS as the flag would be
provided twice.
This PR re-instates the previous behaviour by checking if TS_EXTRA_ARGS
contains --accept-dns flag and if so using its value to override TS_ACCEPT_DNS.
Updates tailscale/tailscale#16108
Signed-off-by: Irbe Krumina <irbe@tailscale.com>
Diffstat (limited to 'control/controlhttp/controlhttpserver/controlhttpserver.go')
0 files changed, 0 insertions, 0 deletions