Merge pull request #69617 from rosti/config-defaults-split

kubeadm: Introduce config print init/join-defaults
2025-09-09 05:01:46 +00:00 · 2018-10-20 08:04:53 -07:00
parent 0bf8a51f4b 91049ef77b
commit a6e273214b
10 changed files with 215 additions and 15 deletions
--- a/docs/.generated_docs
+++ b/docs/.generated_docs
@@ -74,7 +74,9 @@ docs/admin/kubeadm_config_images.md
 docs/admin/kubeadm_config_images_list.md
 docs/admin/kubeadm_config_images_pull.md
 docs/admin/kubeadm_config_migrate.md
-docs/admin/kubeadm_config_print-default.md
+docs/admin/kubeadm_config_print.md
+docs/admin/kubeadm_config_print_init-defaults.md
+docs/admin/kubeadm_config_print_join-defaults.md
 docs/admin/kubeadm_config_upload.md
 docs/admin/kubeadm_config_upload_from-file.md
 docs/admin/kubeadm_config_upload_from-flags.md
@@ -172,6 +174,9 @@ docs/man/man1/kubeadm-config-images-pull.1
 docs/man/man1/kubeadm-config-images.1
 docs/man/man1/kubeadm-config-migrate.1
 docs/man/man1/kubeadm-config-print-default.1
+docs/man/man1/kubeadm-config-print-init-defaults.1
+docs/man/man1/kubeadm-config-print-join-defaults.1
+docs/man/man1/kubeadm-config-print.1
 docs/man/man1/kubeadm-config-upload-from-file.1
 docs/man/man1/kubeadm-config-upload-from-flags.1
 docs/man/man1/kubeadm-config-upload.1
--- a/docs/admin/kubeadm_config_print-default.md
+++ b/docs/admin/kubeadm_config_print-default.md
--- a/docs/admin/kubeadm_config_print_init-defaults.md
+++ b/docs/admin/kubeadm_config_print_init-defaults.md
@@ -0,0 +1,3 @@
+This file is autogenerated, but we've stopped checking such files into the
+repository to reduce the need for rebases. Please run hack/generate-docs.sh to
+populate this file.
--- a/docs/admin/kubeadm_config_print_join-defaults.md
+++ b/docs/admin/kubeadm_config_print_join-defaults.md
@@ -0,0 +1,3 @@
+This file is autogenerated, but we've stopped checking such files into the
+repository to reduce the need for rebases. Please run hack/generate-docs.sh to
+populate this file.
--- a/docs/man/man1/kubeadm-config-print-init-defaults.1
+++ b/docs/man/man1/kubeadm-config-print-init-defaults.1
@@ -0,0 +1,3 @@
+This file is autogenerated, but we've stopped checking such files into the
+repository to reduce the need for rebases. Please run hack/generate-docs.sh to
+populate this file.
--- a/docs/man/man1/kubeadm-config-print-join-defaults.1
+++ b/docs/man/man1/kubeadm-config-print-join-defaults.1
@@ -0,0 +1,3 @@
+This file is autogenerated, but we've stopped checking such files into the
+repository to reduce the need for rebases. Please run hack/generate-docs.sh to
+populate this file.
--- a/docs/man/man1/kubeadm-config-print.1
+++ b/docs/man/man1/kubeadm-config-print.1
@@ -0,0 +1,3 @@
+This file is autogenerated, but we've stopped checking such files into the
+repository to reduce the need for rebases. Please run hack/generate-docs.sh to
+populate this file.