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: update authored content for 1.12 (reference docs and cluster creation) #10348

Merged
merged 2 commits into from
Sep 20, 2018
Merged

kubeadm: update authored content for 1.12 (reference docs and cluster creation) #10348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
694bf8f
kubeadm: update authored content in reference docs for 1.12
neolit123 Sep 20, 2018
4927ac6
kubeadm: add time frame in create-cluster-kubeadm for 1.12
neolit123 Sep 20, 2018
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
12 changes: 9 additions & 3 deletions content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,11 @@ manager, and scheduler run as [DaemonSet pods](/docs/concepts/workloads/controll
configured via the Kubernetes API instead of [static pods](/docs/tasks/administer-cluster/static-pod/)
configured in the kubelet via static files.

To create a self-hosted cluster, pass the flag `--feature-gates=SelfHosting=true` to `kubeadm init`.

{{< caution >}}
**Caution:** Self-hosting is alpha, but is expected to become the default in
a future version. To create a self-hosted cluster, pass the `--feature-gates=SelfHosting=true`
flag to `kubeadm init`.
**Caution:** `SelfHosting` is an alpha feature. It is deprecated in 1.12
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we let users know what solution will replace the current feature? If some users depend on this feature, they might want to know for now what they can do in the future.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xiangpengzhao

@Bradamant3 just requested that we remove the hint that this feature might be replaced eventually:
#10348 (comment)

also, this is quite unclear ATM and still in the planning stage:
kubernetes/kubeadm#1093

probably best to not link to that issue for now, too.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't notice that comment. SGTM.
/lgtm

and will be removed in 1.13.
{{< /caution >}}

{{< warning >}}
Expand All @@ -304,6 +305,11 @@ instead. This requires very careful control over the authentication and
authorization configuration for your cluster, and may not be appropriate for
your environment.

{{< caution >}}
**Caution:** `StoreCertsInSecrets` is an alpha feature. It is deprecated in 1.12
and will be removed in 1.13.
{{< /caution >}}

In kubeadm 1.8, the self-hosted portion of the control plane does not include etcd,
which still runs as a static Pod.

Expand Down
28 changes: 10 additions & 18 deletions content/en/docs/reference/setup-tools/kubeadm/kubeadm-join.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,25 +210,17 @@ still considered alpha and may change in future versions.

It's possible to configure `kubeadm join` with a configuration file instead of command
line flags, and some more advanced features may only be available as
configuration file options. This file is passed in the `--config` option.

```yaml
apiVersion: kubeadm.k8s.io/v1alpha1
kind: NodeConfiguration
caCertPath: <path|string>
discoveryFile: <path|string>
discoveryToken: <string>
discoveryTokenAPIServers:
- <address|string>
- <address|string>
nodeName: <string>
tlsBootstrapToken: <string>
token: <string>
discoveryTokenCACertHashes:
- <SHA-256 hash|string>
- <SHA-256 hash|string>
discoveryTokenUnsafeSkipCAVerification: <bool>
configuration file options. This file is passed using the `--config` flag and it must
contain a `JoinConfiguration` structure.

To print the default values of `JoinConfiguration` run the following command:

```bash
kubeadm config print-default --api-objects=JoinConfiguration
```

For details on individual fields in `JoinConfiguration` see [the godoc](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm#JoinConfiguration).

{{% /capture %}}

{{% capture whatsnext %}}
Expand Down
1 change: 1 addition & 0 deletions content/en/docs/reference/setup-tools/kubeadm/kubeadm-upgrade.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ For more version-specific upgrade guidance, see the following resources:
* [1.9.x to 1.9.y upgrades](/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-9/)
* [1.9.x to 1.9.y HA cluster upgrades](/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-ha/)
* [1.10 to 1.11 upgrades](/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-11/)
* [1.11 to 1.12 upgrades](/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-12/)

In Kubernetes v1.11.0 and later, you can use `kubeadm upgrade diff` to see the changes that would be
applied to static pod manifests.
Expand Down
1 change: 1 addition & 0 deletions content/en/docs/setup/independent/create-cluster-kubeadm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ timeframe; which also applies to `kubeadm`.
| v1.9.x | December 2017 | September 2018   |
| v1.10.x | March 2018 | December 2018   |
| v1.11.x | June 2018 | March 2019   |
| v1.12.x | September 2018 | June 2019   |

{{% /capture %}}

Expand Down