Skip to content

Commit 9a16c96

Browse files
authored
Merge pull request kubernetes#126324 from pacoxu/v1beta4-typo
fix a typo in kubeadm v1beta4 doc
2 parents 5f5c02d + bdb51f2 commit 9a16c96

File tree

1 file changed

+6
-6
lines changed
  • cmd/kubeadm/app/apis/kubeadm/v1beta4

1 file changed

+6
-6
lines changed

cmd/kubeadm/app/apis/kubeadm/v1beta4/doc.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@ limitations under the License.
2727
// - Support custom environment variables in control plane components under `ClusterConfiguration`.
2828
// Use `APIServer.ExtraEnvs`, `ControllerManager.ExtraEnvs`, `Scheduler.ExtraEnvs`, `Etcd.Local.ExtraEnvs`.
2929
// - The ResetConfiguration API type is now supported in v1beta4. Users are able to reset a node by passing
30-
// a --config file to "kubeadm reset".
31-
// - `dry-run` mode in is now configurable in InitConfiguration and JoinConfiguration.
30+
// a `--config` file to `kubeadm reset`.
31+
// - Dry run mode is now configurable in InitConfiguration and JoinConfiguration.
3232
// - Replace the existing string/string extra argument maps with structured extra arguments that support duplicates.
33-
// The change applies to `ClusterConfiguration` - `APIServer.ExtraArgs, `ControllerManager.ExtraArgs`,
33+
// The change applies to `ClusterConfiguration` - `APIServer.ExtraArgs`, `ControllerManager.ExtraArgs`,
3434
// `Scheduler.ExtraArgs`, `Etcd.Local.ExtraArgs`. Also to `NodeRegistrationOptions.KubeletExtraArgs`.
3535
// - Add `ClusterConfiguration.EncryptionAlgorithm` that can be used to set the asymmetric encryption algorithm
3636
// used for this cluster's keys and certificates. Can be one of "RSA-2048" (default), "RSA-3072", "RSA-4096" or "ECDSA-P256".
3737
// - Add `ClusterConfiguration.DNS.Disabled` and `ClusterConfiguration.Proxy.Disabled` that can be used to disable
3838
// the CoreDNS and kube-proxy addons during cluster initialization. Skipping the related addons phases,
3939
// during cluster creation will set the same fields to `false`.
40-
// - Add the `NodeRegistration.ImagePullSerial` field in 'InitConfiguration` and `JoinConfiguration`, which
40+
// - Add the `NodeRegistration.ImagePullSerial` field in `InitConfiguration` and `JoinConfiguration`, which
4141
// can be used to control if kubeadm pulls images serially or in parallel.
42-
// - The UpgradeConfiguration kubeadm API is now supported in v1beta4 when passing --config to "kubeadm upgrade" subcommands.
42+
// - The UpgradeConfiguration kubeadm API is now supported in v1beta4 when passing `--config` to `kubeadm upgrade` subcommands.
4343
// Usage of component configuration for kubelet and kube-proxy, InitConfiguration and ClusterConfiguration is deprecated
44-
// and will be ignored when passing --config to upgrade subcommands.
44+
// and will be ignored when passing `--config` to upgrade subcommands.
4545
// - Add a `Timeouts` structure to `InitConfiguration`, `JoinConfiguration`, `ResetConfiguration` and `UpgradeConfiguration`
4646
// that can be used to configure various timeouts. The `ClusterConfiguration.TimeoutForControlPlane` field is replaced
4747
// by `Timeouts.ControlPlaneComponentHealthCheck`. The `JoinConfiguration.Discovery.Timeout` is replaced by

0 commit comments

Comments
 (0)