diff --git a/cmd/kubeadm/app/cmd/BUILD b/cmd/kubeadm/app/cmd/BUILD index 95c9ed77579..ae9b863cfd3 100644 --- a/cmd/kubeadm/app/cmd/BUILD +++ b/cmd/kubeadm/app/cmd/BUILD @@ -25,6 +25,7 @@ go_library( "//cmd/kubeadm/app/apis/kubeadm/v1alpha3:go_default_library", "//cmd/kubeadm/app/apis/kubeadm/v1beta1:go_default_library", "//cmd/kubeadm/app/apis/kubeadm/validation:go_default_library", + "//cmd/kubeadm/app/cmd/alpha:go_default_library", "//cmd/kubeadm/app/cmd/options:go_default_library", "//cmd/kubeadm/app/cmd/phases:go_default_library", "//cmd/kubeadm/app/cmd/phases/workflow:go_default_library", @@ -131,6 +132,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", + "//cmd/kubeadm/app/cmd/alpha:all-srcs", "//cmd/kubeadm/app/cmd/options:all-srcs", "//cmd/kubeadm/app/cmd/phases:all-srcs", "//cmd/kubeadm/app/cmd/upgrade:all-srcs", diff --git a/cmd/kubeadm/app/cmd/phases/certs/BUILD b/cmd/kubeadm/app/cmd/alpha/BUILD similarity index 63% rename from cmd/kubeadm/app/cmd/phases/certs/BUILD rename to cmd/kubeadm/app/cmd/alpha/BUILD index 3f1ba58371e..2aad820f93b 100644 --- a/cmd/kubeadm/app/cmd/phases/certs/BUILD +++ b/cmd/kubeadm/app/cmd/alpha/BUILD @@ -2,36 +2,36 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", - srcs = ["renew.go"], - importpath = "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/certs", + srcs = [ + "alpha.go", + "certs.go", + "kubeconfig.go", + "kubelet.go", + "preflight.go", + ], + importpath = "k8s.io/kubernetes/cmd/kubeadm/app/cmd/alpha", visibility = ["//visibility:public"], deps = [ "//cmd/kubeadm/app/apis/kubeadm/scheme:go_default_library", "//cmd/kubeadm/app/apis/kubeadm/v1beta1:go_default_library", + "//cmd/kubeadm/app/apis/kubeadm/validation:go_default_library", "//cmd/kubeadm/app/cmd/options:go_default_library", + "//cmd/kubeadm/app/cmd/phases:go_default_library", "//cmd/kubeadm/app/cmd/util:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", "//cmd/kubeadm/app/phases/certs:go_default_library", "//cmd/kubeadm/app/phases/certs/renewal:go_default_library", + "//cmd/kubeadm/app/phases/kubeconfig:go_default_library", + "//cmd/kubeadm/app/phases/kubelet:go_default_library", + "//cmd/kubeadm/app/preflight:go_default_library", "//cmd/kubeadm/app/util:go_default_library", "//cmd/kubeadm/app/util/config:go_default_library", "//cmd/kubeadm/app/util/kubeconfig:go_default_library", "//pkg/util/normalizer:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library", + "//vendor/github.com/pkg/errors:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", - ], -) - -go_test( - name = "go_default_test", - srcs = ["renewal_test.go"], - embed = [":go_default_library"], - deps = [ - "//cmd/kubeadm/app/constants:go_default_library", - "//cmd/kubeadm/app/phases/certs/pkiutil:go_default_library", - "//cmd/kubeadm/test:go_default_library", - "//cmd/kubeadm/test/certs:go_default_library", - "//cmd/kubeadm/test/cmd:go_default_library", - "//vendor/github.com/spf13/cobra:go_default_library", + "//vendor/k8s.io/utils/exec:go_default_library", ], ) @@ -48,3 +48,22 @@ filegroup( tags = ["automanaged"], visibility = ["//visibility:public"], ) + +go_test( + name = "go_default_test", + srcs = [ + "certs_test.go", + "kubeconfig_test.go", + ], + embed = [":go_default_library"], + deps = [ + "//cmd/kubeadm/app/constants:go_default_library", + "//cmd/kubeadm/app/phases/certs/pkiutil:go_default_library", + "//cmd/kubeadm/test:go_default_library", + "//cmd/kubeadm/test/certs:go_default_library", + "//cmd/kubeadm/test/cmd:go_default_library", + "//cmd/kubeadm/test/kubeconfig:go_default_library", + "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", + "//vendor/github.com/spf13/cobra:go_default_library", + ], +) diff --git a/cmd/kubeadm/app/cmd/phases/BUILD b/cmd/kubeadm/app/cmd/phases/BUILD index 5bb49f8242e..3c73b3ead13 100644 --- a/cmd/kubeadm/app/cmd/phases/BUILD +++ b/cmd/kubeadm/app/cmd/phases/BUILD @@ -11,7 +11,6 @@ go_library( "kubeconfig.go", "kubelet.go", "markmaster.go", - "phase.go", "preflight.go", "selfhosting.go", "uploadconfig.go", @@ -25,7 +24,6 @@ go_library( "//cmd/kubeadm/app/apis/kubeadm/v1beta1:go_default_library", "//cmd/kubeadm/app/apis/kubeadm/validation:go_default_library", "//cmd/kubeadm/app/cmd/options:go_default_library", - "//cmd/kubeadm/app/cmd/phases/certs:go_default_library", "//cmd/kubeadm/app/cmd/phases/workflow:go_default_library", "//cmd/kubeadm/app/cmd/util:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", @@ -53,7 +51,6 @@ go_library( "//pkg/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/cluster-bootstrap/token/api:go_default_library", "//vendor/github.com/golang/glog:go_default_library", @@ -69,21 +66,14 @@ go_test( srcs = [ "addons_test.go", "etcd_test.go", - "kubeconfig_test.go", - "kubelet_test.go", "util_test.go", ], embed = [":go_default_library"], deps = [ "//cmd/kubeadm/app/apis/kubeadm/v1beta1:go_default_library", - "//cmd/kubeadm/app/constants:go_default_library", - "//cmd/kubeadm/app/phases/certs/pkiutil:go_default_library", "//cmd/kubeadm/test:go_default_library", "//cmd/kubeadm/test/cmd:go_default_library", - "//cmd/kubeadm/test/kubeconfig:go_default_library", "//pkg/version:go_default_library", - "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", - "//vendor/github.com/spf13/cobra:go_default_library", ], ) @@ -98,7 +88,6 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//cmd/kubeadm/app/cmd/phases/certs:all-srcs", "//cmd/kubeadm/app/cmd/phases/workflow:all-srcs", ], tags = ["automanaged"], diff --git a/docs/.generated_docs b/docs/.generated_docs index 11deb6312bd..27089a5a9c8 100644 --- a/docs/.generated_docs +++ b/docs/.generated_docs @@ -6,6 +6,22 @@ docs/admin/kube-proxy.md docs/admin/kube-scheduler.md docs/admin/kubeadm.md docs/admin/kubeadm_alpha.md +docs/admin/kubeadm_alpha_certs.md +docs/admin/kubeadm_alpha_certs_renew.md +docs/admin/kubeadm_alpha_certs_renew_all.md +docs/admin/kubeadm_alpha_certs_renew_apiserver-etcd-client.md +docs/admin/kubeadm_alpha_certs_renew_apiserver-kubelet-client.md +docs/admin/kubeadm_alpha_certs_renew_apiserver.md +docs/admin/kubeadm_alpha_certs_renew_etcd-healthcheck-client.md +docs/admin/kubeadm_alpha_certs_renew_etcd-peer.md +docs/admin/kubeadm_alpha_certs_renew_etcd-server.md +docs/admin/kubeadm_alpha_certs_renew_front-proxy-client.md +docs/admin/kubeadm_alpha_kubeconfig.md +docs/admin/kubeadm_alpha_kubeconfig_user.md +docs/admin/kubeadm_alpha_kubelet.md +docs/admin/kubeadm_alpha_kubelet_config.md +docs/admin/kubeadm_alpha_kubelet_config_download.md +docs/admin/kubeadm_alpha_kubelet_config_enable-dynamic.md docs/admin/kubeadm_alpha_phase.md docs/admin/kubeadm_alpha_phase_addon.md docs/admin/kubeadm_alpha_phase_addon_all.md @@ -18,32 +34,14 @@ docs/admin/kubeadm_alpha_phase_bootstrap-token_create.md docs/admin/kubeadm_alpha_phase_bootstrap-token_node.md docs/admin/kubeadm_alpha_phase_bootstrap-token_node_allow-auto-approve.md docs/admin/kubeadm_alpha_phase_bootstrap-token_node_allow-post-csrs.md -docs/admin/kubeadm_alpha_phase_certs.md -docs/admin/kubeadm_alpha_phase_certs_renew.md -docs/admin/kubeadm_alpha_phase_certs_renew_all.md -docs/admin/kubeadm_alpha_phase_certs_renew_apiserver-etcd-client.md -docs/admin/kubeadm_alpha_phase_certs_renew_apiserver-kubelet-client.md -docs/admin/kubeadm_alpha_phase_certs_renew_apiserver.md -docs/admin/kubeadm_alpha_phase_certs_renew_etcd-healthcheck-client.md -docs/admin/kubeadm_alpha_phase_certs_renew_etcd-peer.md -docs/admin/kubeadm_alpha_phase_certs_renew_etcd-server.md -docs/admin/kubeadm_alpha_phase_certs_renew_front-proxy-client.md docs/admin/kubeadm_alpha_phase_etcd.md docs/admin/kubeadm_alpha_phase_etcd_local.md -docs/admin/kubeadm_alpha_phase_kubeconfig.md -docs/admin/kubeadm_alpha_phase_kubeconfig_user.md -docs/admin/kubeadm_alpha_phase_kubelet.md -docs/admin/kubeadm_alpha_phase_kubelet_config.md -docs/admin/kubeadm_alpha_phase_kubelet_config_annotate-cri.md -docs/admin/kubeadm_alpha_phase_kubelet_config_download.md -docs/admin/kubeadm_alpha_phase_kubelet_config_enable-dynamic.md -docs/admin/kubeadm_alpha_phase_kubelet_config_upload.md docs/admin/kubeadm_alpha_phase_mark-master.md -docs/admin/kubeadm_alpha_phase_preflight.md -docs/admin/kubeadm_alpha_phase_preflight_node.md docs/admin/kubeadm_alpha_phase_selfhosting.md docs/admin/kubeadm_alpha_phase_selfhosting_convert-from-staticpods.md docs/admin/kubeadm_alpha_phase_upload-config.md +docs/admin/kubeadm_alpha_preflight.md +docs/admin/kubeadm_alpha_preflight_node.md docs/admin/kubeadm_completion.md docs/admin/kubeadm_config.md docs/admin/kubeadm_config_images.md @@ -103,6 +101,22 @@ docs/man/man1/kube-apiserver.1 docs/man/man1/kube-controller-manager.1 docs/man/man1/kube-proxy.1 docs/man/man1/kube-scheduler.1 +docs/man/man1/kubeadm-alpha-certs-renew-all.1 +docs/man/man1/kubeadm-alpha-certs-renew-apiserver-etcd-client.1 +docs/man/man1/kubeadm-alpha-certs-renew-apiserver-kubelet-client.1 +docs/man/man1/kubeadm-alpha-certs-renew-apiserver.1 +docs/man/man1/kubeadm-alpha-certs-renew-etcd-healthcheck-client.1 +docs/man/man1/kubeadm-alpha-certs-renew-etcd-peer.1 +docs/man/man1/kubeadm-alpha-certs-renew-etcd-server.1 +docs/man/man1/kubeadm-alpha-certs-renew-front-proxy-client.1 +docs/man/man1/kubeadm-alpha-certs-renew.1 +docs/man/man1/kubeadm-alpha-certs.1 +docs/man/man1/kubeadm-alpha-kubeconfig-user.1 +docs/man/man1/kubeadm-alpha-kubeconfig.1 +docs/man/man1/kubeadm-alpha-kubelet-config-download.1 +docs/man/man1/kubeadm-alpha-kubelet-config-enable-dynamic.1 +docs/man/man1/kubeadm-alpha-kubelet-config.1 +docs/man/man1/kubeadm-alpha-kubelet.1 docs/man/man1/kubeadm-alpha-phase-addon-all.1 docs/man/man1/kubeadm-alpha-phase-addon-coredns.1 docs/man/man1/kubeadm-alpha-phase-addon-kube-proxy.1 @@ -114,33 +128,15 @@ docs/man/man1/kubeadm-alpha-phase-bootstrap-token-node-allow-auto-approve.1 docs/man/man1/kubeadm-alpha-phase-bootstrap-token-node-allow-post-csrs.1 docs/man/man1/kubeadm-alpha-phase-bootstrap-token-node.1 docs/man/man1/kubeadm-alpha-phase-bootstrap-token.1 -docs/man/man1/kubeadm-alpha-phase-certs-renew-all.1 -docs/man/man1/kubeadm-alpha-phase-certs-renew-apiserver-etcd-client.1 -docs/man/man1/kubeadm-alpha-phase-certs-renew-apiserver-kubelet-client.1 -docs/man/man1/kubeadm-alpha-phase-certs-renew-apiserver.1 -docs/man/man1/kubeadm-alpha-phase-certs-renew-etcd-healthcheck-client.1 -docs/man/man1/kubeadm-alpha-phase-certs-renew-etcd-peer.1 -docs/man/man1/kubeadm-alpha-phase-certs-renew-etcd-server.1 -docs/man/man1/kubeadm-alpha-phase-certs-renew-front-proxy-client.1 -docs/man/man1/kubeadm-alpha-phase-certs-renew.1 -docs/man/man1/kubeadm-alpha-phase-certs.1 docs/man/man1/kubeadm-alpha-phase-etcd-local.1 docs/man/man1/kubeadm-alpha-phase-etcd.1 -docs/man/man1/kubeadm-alpha-phase-kubeconfig-user.1 -docs/man/man1/kubeadm-alpha-phase-kubeconfig.1 -docs/man/man1/kubeadm-alpha-phase-kubelet-config-annotate-cri.1 -docs/man/man1/kubeadm-alpha-phase-kubelet-config-download.1 -docs/man/man1/kubeadm-alpha-phase-kubelet-config-enable-dynamic.1 -docs/man/man1/kubeadm-alpha-phase-kubelet-config-upload.1 -docs/man/man1/kubeadm-alpha-phase-kubelet-config.1 -docs/man/man1/kubeadm-alpha-phase-kubelet.1 docs/man/man1/kubeadm-alpha-phase-mark-master.1 -docs/man/man1/kubeadm-alpha-phase-preflight-node.1 -docs/man/man1/kubeadm-alpha-phase-preflight.1 docs/man/man1/kubeadm-alpha-phase-selfhosting-convert-from-staticpods.1 docs/man/man1/kubeadm-alpha-phase-selfhosting.1 docs/man/man1/kubeadm-alpha-phase-upload-config.1 docs/man/man1/kubeadm-alpha-phase.1 +docs/man/man1/kubeadm-alpha-preflight-node.1 +docs/man/man1/kubeadm-alpha-preflight.1 docs/man/man1/kubeadm-alpha.1 docs/man/man1/kubeadm-completion.1 docs/man/man1/kubeadm-config-images-list.1 diff --git a/docs/admin/kubeadm_alpha_phase_certs.md b/docs/admin/kubeadm_alpha_certs.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_certs.md rename to docs/admin/kubeadm_alpha_certs.md diff --git a/docs/admin/kubeadm_alpha_phase_certs_renew.md b/docs/admin/kubeadm_alpha_certs_renew.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_certs_renew.md rename to docs/admin/kubeadm_alpha_certs_renew.md diff --git a/docs/admin/kubeadm_alpha_phase_certs_renew_all.md b/docs/admin/kubeadm_alpha_certs_renew_all.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_certs_renew_all.md rename to docs/admin/kubeadm_alpha_certs_renew_all.md diff --git a/docs/admin/kubeadm_alpha_phase_certs_renew_apiserver-etcd-client.md b/docs/admin/kubeadm_alpha_certs_renew_apiserver-etcd-client.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_certs_renew_apiserver-etcd-client.md rename to docs/admin/kubeadm_alpha_certs_renew_apiserver-etcd-client.md diff --git a/docs/admin/kubeadm_alpha_phase_certs_renew_apiserver-kubelet-client.md b/docs/admin/kubeadm_alpha_certs_renew_apiserver-kubelet-client.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_certs_renew_apiserver-kubelet-client.md rename to docs/admin/kubeadm_alpha_certs_renew_apiserver-kubelet-client.md diff --git a/docs/admin/kubeadm_alpha_phase_certs_renew_apiserver.md b/docs/admin/kubeadm_alpha_certs_renew_apiserver.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_certs_renew_apiserver.md rename to docs/admin/kubeadm_alpha_certs_renew_apiserver.md diff --git a/docs/admin/kubeadm_alpha_phase_certs_renew_etcd-healthcheck-client.md b/docs/admin/kubeadm_alpha_certs_renew_etcd-healthcheck-client.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_certs_renew_etcd-healthcheck-client.md rename to docs/admin/kubeadm_alpha_certs_renew_etcd-healthcheck-client.md diff --git a/docs/admin/kubeadm_alpha_phase_certs_renew_etcd-peer.md b/docs/admin/kubeadm_alpha_certs_renew_etcd-peer.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_certs_renew_etcd-peer.md rename to docs/admin/kubeadm_alpha_certs_renew_etcd-peer.md diff --git a/docs/admin/kubeadm_alpha_phase_certs_renew_etcd-server.md b/docs/admin/kubeadm_alpha_certs_renew_etcd-server.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_certs_renew_etcd-server.md rename to docs/admin/kubeadm_alpha_certs_renew_etcd-server.md diff --git a/docs/admin/kubeadm_alpha_phase_certs_renew_front-proxy-client.md b/docs/admin/kubeadm_alpha_certs_renew_front-proxy-client.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_certs_renew_front-proxy-client.md rename to docs/admin/kubeadm_alpha_certs_renew_front-proxy-client.md diff --git a/docs/admin/kubeadm_alpha_phase_kubeconfig.md b/docs/admin/kubeadm_alpha_kubeconfig.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_kubeconfig.md rename to docs/admin/kubeadm_alpha_kubeconfig.md diff --git a/docs/admin/kubeadm_alpha_phase_kubeconfig_user.md b/docs/admin/kubeadm_alpha_kubeconfig_user.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_kubeconfig_user.md rename to docs/admin/kubeadm_alpha_kubeconfig_user.md diff --git a/docs/admin/kubeadm_alpha_phase_kubelet.md b/docs/admin/kubeadm_alpha_kubelet.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_kubelet.md rename to docs/admin/kubeadm_alpha_kubelet.md diff --git a/docs/admin/kubeadm_alpha_phase_kubelet_config.md b/docs/admin/kubeadm_alpha_kubelet_config.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_kubelet_config.md rename to docs/admin/kubeadm_alpha_kubelet_config.md diff --git a/docs/admin/kubeadm_alpha_phase_kubelet_config_annotate-cri.md b/docs/admin/kubeadm_alpha_kubelet_config_download.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_kubelet_config_annotate-cri.md rename to docs/admin/kubeadm_alpha_kubelet_config_download.md diff --git a/docs/admin/kubeadm_alpha_phase_kubelet_config_download.md b/docs/admin/kubeadm_alpha_kubelet_config_enable-dynamic.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_kubelet_config_download.md rename to docs/admin/kubeadm_alpha_kubelet_config_enable-dynamic.md diff --git a/docs/admin/kubeadm_alpha_phase_kubelet_config_enable-dynamic.md b/docs/admin/kubeadm_alpha_preflight.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_kubelet_config_enable-dynamic.md rename to docs/admin/kubeadm_alpha_preflight.md diff --git a/docs/admin/kubeadm_alpha_phase_kubelet_config_upload.md b/docs/admin/kubeadm_alpha_preflight_node.md similarity index 100% rename from docs/admin/kubeadm_alpha_phase_kubelet_config_upload.md rename to docs/admin/kubeadm_alpha_preflight_node.md diff --git a/docs/admin/kubeadm_alpha_phase_preflight.md b/docs/man/man1/kubeadm-alpha-certs-renew-all.1 similarity index 100% rename from docs/admin/kubeadm_alpha_phase_preflight.md rename to docs/man/man1/kubeadm-alpha-certs-renew-all.1 diff --git a/docs/admin/kubeadm_alpha_phase_preflight_node.md b/docs/man/man1/kubeadm-alpha-certs-renew-apiserver-etcd-client.1 similarity index 100% rename from docs/admin/kubeadm_alpha_phase_preflight_node.md rename to docs/man/man1/kubeadm-alpha-certs-renew-apiserver-etcd-client.1 diff --git a/docs/man/man1/kubeadm-alpha-phase-certs-renew-all.1 b/docs/man/man1/kubeadm-alpha-certs-renew-apiserver-kubelet-client.1 similarity index 100% rename from docs/man/man1/kubeadm-alpha-phase-certs-renew-all.1 rename to docs/man/man1/kubeadm-alpha-certs-renew-apiserver-kubelet-client.1 diff --git a/docs/man/man1/kubeadm-alpha-phase-certs-renew-apiserver-etcd-client.1 b/docs/man/man1/kubeadm-alpha-certs-renew-apiserver.1 similarity index 100% rename from docs/man/man1/kubeadm-alpha-phase-certs-renew-apiserver-etcd-client.1 rename to docs/man/man1/kubeadm-alpha-certs-renew-apiserver.1 diff --git a/docs/man/man1/kubeadm-alpha-phase-certs-renew-apiserver-kubelet-client.1 b/docs/man/man1/kubeadm-alpha-certs-renew-etcd-healthcheck-client.1 similarity index 100% rename from docs/man/man1/kubeadm-alpha-phase-certs-renew-apiserver-kubelet-client.1 rename to docs/man/man1/kubeadm-alpha-certs-renew-etcd-healthcheck-client.1 diff --git a/docs/man/man1/kubeadm-alpha-phase-certs-renew-apiserver.1 b/docs/man/man1/kubeadm-alpha-certs-renew-etcd-peer.1 similarity index 100% rename from docs/man/man1/kubeadm-alpha-phase-certs-renew-apiserver.1 rename to docs/man/man1/kubeadm-alpha-certs-renew-etcd-peer.1 diff --git a/docs/man/man1/kubeadm-alpha-phase-certs-renew-etcd-healthcheck-client.1 b/docs/man/man1/kubeadm-alpha-certs-renew-etcd-server.1 similarity index 100% rename from docs/man/man1/kubeadm-alpha-phase-certs-renew-etcd-healthcheck-client.1 rename to docs/man/man1/kubeadm-alpha-certs-renew-etcd-server.1 diff --git a/docs/man/man1/kubeadm-alpha-phase-certs-renew-etcd-peer.1 b/docs/man/man1/kubeadm-alpha-certs-renew-front-proxy-client.1 similarity index 100% rename from docs/man/man1/kubeadm-alpha-phase-certs-renew-etcd-peer.1 rename to docs/man/man1/kubeadm-alpha-certs-renew-front-proxy-client.1 diff --git a/docs/man/man1/kubeadm-alpha-phase-certs-renew-etcd-server.1 b/docs/man/man1/kubeadm-alpha-certs-renew.1 similarity index 100% rename from docs/man/man1/kubeadm-alpha-phase-certs-renew-etcd-server.1 rename to docs/man/man1/kubeadm-alpha-certs-renew.1 diff --git a/docs/man/man1/kubeadm-alpha-phase-certs-renew-front-proxy-client.1 b/docs/man/man1/kubeadm-alpha-certs.1 similarity index 100% rename from docs/man/man1/kubeadm-alpha-phase-certs-renew-front-proxy-client.1 rename to docs/man/man1/kubeadm-alpha-certs.1 diff --git a/docs/man/man1/kubeadm-alpha-phase-certs-renew.1 b/docs/man/man1/kubeadm-alpha-kubeconfig-user.1 similarity index 100% rename from docs/man/man1/kubeadm-alpha-phase-certs-renew.1 rename to docs/man/man1/kubeadm-alpha-kubeconfig-user.1 diff --git a/docs/man/man1/kubeadm-alpha-phase-certs.1 b/docs/man/man1/kubeadm-alpha-kubeconfig.1 similarity index 100% rename from docs/man/man1/kubeadm-alpha-phase-certs.1 rename to docs/man/man1/kubeadm-alpha-kubeconfig.1 diff --git a/docs/man/man1/kubeadm-alpha-phase-kubeconfig-user.1 b/docs/man/man1/kubeadm-alpha-kubelet-config-download.1 similarity index 100% rename from docs/man/man1/kubeadm-alpha-phase-kubeconfig-user.1 rename to docs/man/man1/kubeadm-alpha-kubelet-config-download.1 diff --git a/docs/man/man1/kubeadm-alpha-phase-kubeconfig.1 b/docs/man/man1/kubeadm-alpha-kubelet-config-enable-dynamic.1 similarity index 100% rename from docs/man/man1/kubeadm-alpha-phase-kubeconfig.1 rename to docs/man/man1/kubeadm-alpha-kubelet-config-enable-dynamic.1 diff --git a/docs/man/man1/kubeadm-alpha-phase-kubelet-config-annotate-cri.1 b/docs/man/man1/kubeadm-alpha-kubelet-config.1 similarity index 100% rename from docs/man/man1/kubeadm-alpha-phase-kubelet-config-annotate-cri.1 rename to docs/man/man1/kubeadm-alpha-kubelet-config.1 diff --git a/docs/man/man1/kubeadm-alpha-phase-kubelet-config-download.1 b/docs/man/man1/kubeadm-alpha-kubelet.1 similarity index 100% rename from docs/man/man1/kubeadm-alpha-phase-kubelet-config-download.1 rename to docs/man/man1/kubeadm-alpha-kubelet.1 diff --git a/docs/man/man1/kubeadm-alpha-phase-kubelet-config.1 b/docs/man/man1/kubeadm-alpha-phase-kubelet-config.1 deleted file mode 100644 index b6fd7a0f989..00000000000 --- a/docs/man/man1/kubeadm-alpha-phase-kubelet-config.1 +++ /dev/null @@ -1,3 +0,0 @@ -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. diff --git a/docs/man/man1/kubeadm-alpha-phase-kubelet.1 b/docs/man/man1/kubeadm-alpha-phase-kubelet.1 deleted file mode 100644 index b6fd7a0f989..00000000000 --- a/docs/man/man1/kubeadm-alpha-phase-kubelet.1 +++ /dev/null @@ -1,3 +0,0 @@ -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. diff --git a/docs/man/man1/kubeadm-alpha-phase-preflight-node.1 b/docs/man/man1/kubeadm-alpha-phase-preflight-node.1 deleted file mode 100644 index b6fd7a0f989..00000000000 --- a/docs/man/man1/kubeadm-alpha-phase-preflight-node.1 +++ /dev/null @@ -1,3 +0,0 @@ -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. diff --git a/docs/man/man1/kubeadm-alpha-phase-preflight.1 b/docs/man/man1/kubeadm-alpha-phase-preflight.1 deleted file mode 100644 index b6fd7a0f989..00000000000 --- a/docs/man/man1/kubeadm-alpha-phase-preflight.1 +++ /dev/null @@ -1,3 +0,0 @@ -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. diff --git a/docs/man/man1/kubeadm-alpha-phase-kubelet-config-enable-dynamic.1 b/docs/man/man1/kubeadm-alpha-preflight-node.1 similarity index 100% rename from docs/man/man1/kubeadm-alpha-phase-kubelet-config-enable-dynamic.1 rename to docs/man/man1/kubeadm-alpha-preflight-node.1 diff --git a/docs/man/man1/kubeadm-alpha-phase-kubelet-config-upload.1 b/docs/man/man1/kubeadm-alpha-preflight.1 similarity index 100% rename from docs/man/man1/kubeadm-alpha-phase-kubelet-config-upload.1 rename to docs/man/man1/kubeadm-alpha-preflight.1