Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kubeadm-config: include new commands #8862

Merged
merged 1 commit into from
Jun 11, 2018
Merged

kubeadm-config: include new commands #8862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...t/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_config_images_list.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
PLACEHOLDER FILE UNTIL WE GENERATE THE REAL THING. DO NOT REMOVE FROM 1.11 DOCS BRANCH

### Synopsis

Print a list of images kubeadm will use.
5 changes: 5 additions & 0 deletions ...t/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_config_images_pull.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
PLACEHOLDER FILE UNTIL WE GENERATE THE REAL THING. DO NOT REMOVE FROM 1.11 DOCS BRANCH

### Synopsis

Pull images used by kubeadm.
5 changes: 5 additions & 0 deletions content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_config_migrate.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
PLACEHOLDER FILE UNTIL WE GENERATE THE REAL THING. DO NOT REMOVE FROM 1.11 DOCS BRANCH

### Synopsis

migrate config from one version to another.
5 changes: 5 additions & 0 deletions ...en/docs/reference/setup-tools/kubeadm/generated/kubeadm_config_print-default.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
PLACEHOLDER FILE UNTIL WE GENERATE THE REAL THING. DO NOT REMOVE FROM 1.11 DOCS BRANCH

### Synopsis

print default config.
18 changes: 18 additions & 0 deletions content/en/docs/reference/setup-tools/kubeadm/kubeadm-config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ You can execute `kubeadm config view` to view the ConfigMap. If you initialized
kubeadm v1.7.x or lower, you must use `kubeadm config upload` to create the ConfigMap before you
may use `kubeadm upgrade`.

In Kubernetes v1.11.0, some new commands were added. You can use `kubeadm config print-default`
to print the default configuration and `kubeadm config migrate` to convert your old configuration
files to a newer version. `kubeadm config images list` and `kubeadm config images pull` can be used
to list and pull the images that kubeadm requires.

{{% /capture %}}

{{% capture body %}}
Expand All @@ -27,6 +32,19 @@ may use `kubeadm upgrade`.

## kubeadm config view {#cmd-config-view}
{{< include "generated/kubeadm_config_view.md" >}}

## kubeadm config print-default {#cmd-config-print-default}
{{< include "generated/kubeadm_config_print-default.md" >}}

## kubeadm config migrate {#cmd-config-migrate}
{{< include "generated/kubeadm_config_migrate.md" >}}

## kubeadm config images list {#cmd-config-images-list}
{{< include "generated/kubeadm_config_images_list.md" >}}

## kubeadm config images pull {#cmd-config-images-pull}
{{< include "generated/kubeadm_config_images_pull.md" >}}

{{% /capture %}}

{{% capture whatsnext %}}
Expand Down