Skip to content

Commit

Permalink
kubeadm-config: include new commands
Browse files Browse the repository at this point in the history
Add notes and includes for these new commands in 1.11:
- kubeadm config print-default
- kubeadm config migrate
- kubeadm config images list
- kubeadm config images pull

Include placeholder generated files for the above.
  • Loading branch information
neolit123 committed Jun 4, 2018
1 parent 7549d77 commit 601f8c6
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 0 deletions.
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.
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
PLACEHOLDER FILE UNTIL WE GENERATE THE REAL THING. DO NOT REMOVE FROM 1.11 DOCS BRANCH

### Synopsis

migrate config from one version to another.

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.
19 changes: 19 additions & 0 deletions content/en/docs/reference/setup-tools/kubeadm/kubeadm-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ 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 - `kubeadm config print-default`, `kubeadm config migrate`,
`kubeadm config images list` and `kubeadm config images pull`.
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 which kubeadm requires.

{{% /capture %}}

{{% capture body %}}
Expand All @@ -27,6 +33,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

0 comments on commit 601f8c6

Please sign in to comment.