Skip to content

Commit

Permalink
Merge pull request #43530 from chendave/revert-43515-dev-1.29
Browse files Browse the repository at this point in the history
Revert "Introduce of the deprecated FG: MergeCLIArgumentsWithConfig"
  • Loading branch information
k8s-ci-robot authored Oct 17, 2023
2 parents a7d7ebb + a724145 commit 1d1366e
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ List of deprecated feature gates:
Feature | Default
:-------|:--------
`UpgradeAddonsBeforeControlPlane` | `false`
`MergeCLIArgumentsWithConfig` | `false`
{{< /table >}}

Feature gate descriptions:
Expand All @@ -208,13 +207,6 @@ instance is upgraded. The deprecated `UpgradeAddonsBeforeControlPlane` feature g
behavior. You should not need this old behavior; if you do, you should consider changing your cluster or upgrade processes, as this
feature gate will be removed in a future release.


`MergeCLIArgumentsWithConfig`
: This feature gate is introduced in Kubernetes v1.29 and defaults to `false`. Enabling this feature gate will merge the value passed
by the `--ignore-preflight-errors` flag with the value of `ignorePreflightErrors` defined in the config file, which is the default behavior
in v1.28 and earlier release. The default value `false` means that if the `--ignore-preflight-errors` flag is set and `ignorePreflightErrors`
is specified in the config file, the value defined in the config file will be ignored.

List of removed feature gates:

{{< table caption="kubeadm removed feature gates" >}}
Expand Down

0 comments on commit 1d1366e

Please sign in to comment.