kubeadm: update authored content in reference docs for 1.12

kubernetes · Sep 20, 2018 · e726951 · e726951
1 parent 46328a4
commit e726951
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 21 deletions.
diff --git a/content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md b/content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md
@@ -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
+and will be removed in 1.13.
 {{< /caution >}}
 
 {{< warning >}}
@@ -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.
 

diff --git a/content/en/docs/reference/setup-tools/kubeadm/kubeadm-join.md b/content/en/docs/reference/setup-tools/kubeadm/kubeadm-join.md
@@ -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 %}}

diff --git a/content/en/docs/reference/setup-tools/kubeadm/kubeadm-upgrade.md b/content/en/docs/reference/setup-tools/kubeadm/kubeadm-upgrade.md
@@ -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.