-
Notifications
You must be signed in to change notification settings - Fork 18.8k
Remove feature flag "windows-dns-proxy" #48738
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove feature flag "windows-dns-proxy" #48738
Conversation
| } | ||
|
|
||
| if _, ok := conf.Features["windows-dns-proxy"]; ok { | ||
| return errors.New("feature option 'windows-dns-proxy' is only available on Windows") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure how likely it is, but the only thing we could do is to (in the Windows variant of this) either return an error, or to log a Error / Warning to surface that the user is using an option that's no longer taken into account; given that the default is "true", that should probably only be relevant if they have it configured and set to false;
Lines 687 to 693 in 43bbacb
| if config.CorsHeaders != "" { | |
| // TODO(thaJeztah): option is used to produce error when used; remove in next release | |
| return errors.New(`DEPRECATED: The "api-cors-header" config parameter and the dockerd "--api-cors-header" option have been removed; use a reverse proxy if you need CORS headers`) | |
| } | |
| // validate platform-specific settings | |
| return config.ValidatePlatformConfig() |
Alternative to logging, we could add it to the Warnings array on the /info endpoint, which shows up in the output of docker info;
Lines 46 to 50 in 43bbacb
| func (daemon *Daemon) SystemInfo(ctx context.Context) (*system.Info, error) { | |
| defer metrics.StartTimer(hostInfoFunctions.WithValues("system_info"))() | |
| sysInfo := daemon.RawSysInfo() | |
| cfg := daemon.config() |
Lines 153 to 165 in 43bbacb
| func (daemon *Daemon) fillDriverInfo(v *system.Info) { | |
| v.Driver = daemon.imageService.StorageDriver() | |
| v.DriverStatus = daemon.imageService.LayerStoreStatus() | |
| const warnMsg = ` | |
| WARNING: The %s storage-driver is deprecated, and will be removed in a future release. | |
| Refer to the documentation for more information: https://docs.docker.com/go/storage-driver/` | |
| switch v.Driver { | |
| case "overlay": | |
| v.Warnings = append(v.Warnings, fmt.Sprintf(warnMsg, v.Driver)) | |
| } | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, sure - I've added a docker info warning (and I'll mark this as ready for review!), how does this look? ...
PS C:\ProgramData\docker> docker info
Client:
Version: 27.3.0-rc.1
[...]
Insecure Registries:
::1/128
127.0.0.0/8
Live Restore Enabled: false
WARNING: Feature flag "windows-dns-proxy" has been removed, forwarding to external DNS resolvers is enabled.
4f65a0d to
b79bba6
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
| if _, ok := cfg.Features["windows-dns-proxy"]; ok { | ||
| v.Warnings = append(v.Warnings, ` | ||
| WARNING: Feature flag "windows-dns-proxy" has been removed, forwarding to external DNS resolvers is enabled.`) | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! Yes, I was thinking we'd need it only if someone has false set, but I guess this is good as well to tell them "remove this from your config"
We can remove this in v29.0 or so (maybe earlier, it's just a warning)
- What I did
windows-dns-proxyfeature flag #47732Added in 26.1.0, commit 6c68be2
Default changed to true in 27.0.0, commit 33f9a53
- How I did it
No sign of problems so, removed.
- How to verify it
It doesn't do anything now.
- Description for the changelog