diff --git a/CHANGELOG.md b/CHANGELOG.md index a1acb90def..d4a808f516 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -88,6 +88,15 @@ Adding a new version? You'll need three changes: - Removed support for deprecated `KongIngress` fields: `Proxy` and `Route`. Respective `Service` or `Ingress` annotations should be used instead. See [KIC Annotations reference]. [#4760](https://github.com/Kong/kubernetes-ingress-controller/pull/4760) +- Removed previously deprecated flags: + - `sync-rate-limit`: Use `--proxy-sync-seconds` instead + - `stderrthreshold`: Has no effect + - `update-status-on-shutdown`: Has no effect + - `kong-custom-entities-secret`: Has no effect + - `leader-elect`: DEPRECATED as of 2.1.0: leader election behavior is determined automatically based on the Kong database setting and this flag has no effect + - `enable-controller-ingress-extensionsv1beta1`: Has no effect + - `enable-controller-ingress-networkingv1beta1`: Has no effect + [#4770](https://github.com/Kong/kubernetes-ingress-controller/pull/4770) ### Fixed diff --git a/internal/manager/config.go b/internal/manager/config.go index 1ef08057a1..5e246bfa43 100644 --- a/internal/manager/config.go +++ b/internal/manager/config.go @@ -267,9 +267,6 @@ func (c *Config) FlagSet() *pflag.FlagSet { flagSet.DurationVar(&c.Konnect.RefreshNodePeriod, "konnect-refresh-node-period", konnect.DefaultRefreshNodePeriod, "Period of uploading status of KIC and controlled kong gateway instances") // Deprecated flags - _ = flagSet.Float32("sync-rate-limit", dataplane.DefaultSyncSeconds, "Use --proxy-sync-seconds instead") - _ = flagSet.MarkDeprecated("sync-rate-limit", "Use --proxy-sync-seconds instead") - flagSet.Var(flags.NewValidatedValue(&c.IngressService, namespacedNameFromFlagValue, nnTypeNameOverride), "publish-service", "Use --ingress-service instead") _ = flagSet.MarkDeprecated("publish-service", "Use --ingress-service instead") flagSet.Var(flags.NewValidatedValue(&c.IngressServiceUDP, namespacedNameFromFlagValue, nnTypeNameOverride), "publish-service-udp", "Use --ingress-service-udp instead") @@ -279,24 +276,6 @@ func (c *Config) FlagSet() *pflag.FlagSet { flagSet.StringSliceVar(&c.IngressAddressesUDP, "publish-status-address-udp", []string{}, "") _ = flagSet.MarkDeprecated("publish-status-address-udp", "Use --ingress-address-udp instead") - _ = flagSet.Int("stderrthreshold", 0, "Has no effect and will be removed in future releases (see github issue #1297)") - _ = flagSet.MarkDeprecated("stderrthreshold", "Has no effect and will be removed in future releases (see github issue #1297)") - - _ = flagSet.Bool("update-status-on-shutdown", false, "No longer has any effect and will be removed in a later release (see github issue #1304)") - _ = flagSet.MarkDeprecated("update-status-on-shutdown", "No longer has any effect and will be removed in a later release (see github issue #1304)") - - _ = flagSet.String("kong-custom-entities-secret", "", "Will be removed in next major release.") - _ = flagSet.MarkDeprecated("kong-custom-entities-secret", "Will be removed in next major release.") - - _ = flagSet.Bool("leader-elect", false, "DEPRECATED as of 2.1.0: leader election behavior is determined automatically based on the Kong database setting and this flag has no effect") - _ = flagSet.MarkDeprecated("leader-elect", "DEPRECATED as of 2.1.0: leader election behavior is determined automatically based on the Kong database setting and this flag has no effect") - - _ = flagSet.Bool("enable-controller-ingress-extensionsv1beta1", true, "DEPRECATED: Enable the extensions/v1beta1 Ingress controller.") - _ = flagSet.MarkDeprecated("enable-controller-ingress-extensionsv1beta1", "DEPRECATED: Enable the extensions/v1beta1 Ingress controller.") - - _ = flagSet.Bool("enable-controller-ingress-networkingv1beta1", true, "Enable the networking.k8s.io/v1beta1 Ingress controller.") - _ = flagSet.MarkDeprecated("enable-controller-ingress-networkingv1beta1", "Enable the networking.k8s.io/v1beta1 Ingress controller.") - c.flagSet = flagSet return flagSet }