From 94ad0a15558d583d8a0d25eae75db9cf0b18554f Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Sun, 30 Oct 2022 22:31:18 +0100 Subject: [PATCH] Remove ip_prefix, its been deprecated for a long time (#899) * Remove ip_prefix, its been deprecated for a long time Signed-off-by: Kristoffer Dalby * update changelog Signed-off-by: Kristoffer Dalby Signed-off-by: Kristoffer Dalby Co-authored-by: Juan Font --- CHANGELOG.md | 1 + config.go | 16 ---------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66fbf989..870c88ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ - Add support for evaluating `autoApprovers` ACL entries when a machine is registered [#763](https://github.com/juanfont/headscale/pull/763) - Add config flag to allow Headscale to start if OIDC provider is down [#829](https://github.com/juanfont/headscale/pull/829) - Random node DNS suffix only applied if names collide in namespace. [#766](https://github.com/juanfont/headscale/issues/766) +- Remove `ip_prefix` configuration option and warning [#899](https://github.com/juanfont/headscale/pull/899) ## 0.16.4 (2022-08-21) diff --git a/config.go b/config.go index 494356d8..1a9d0af4 100644 --- a/config.go +++ b/config.go @@ -469,22 +469,6 @@ func GetHeadscaleConfig() (*Config, error) { configuredPrefixes := viper.GetStringSlice("ip_prefixes") parsedPrefixes := make([]netip.Prefix, 0, len(configuredPrefixes)+1) - legacyPrefixField := viper.GetString("ip_prefix") - if len(legacyPrefixField) > 0 { - log. - Warn(). - Msgf( - "%s, %s", - "use of 'ip_prefix' for configuration is deprecated", - "please see 'ip_prefixes' in the shipped example.", - ) - legacyPrefix, err := netip.ParsePrefix(legacyPrefixField) - if err != nil { - panic(fmt.Errorf("failed to parse ip_prefix: %w", err)) - } - parsedPrefixes = append(parsedPrefixes, legacyPrefix) - } - for i, prefixInConfig := range configuredPrefixes { prefix, err := netip.ParsePrefix(prefixInConfig) if err != nil {