kubeadm: update the configuration docs to v1beta1 (#10959)

kubernetes · Nov 12, 2018 · 09aae56 · 09aae56
1 parent ecef1e7
commit 09aae56
Show file tree

Hide file tree

Showing 11 changed files with 87 additions and 78 deletions.
diff --git a/content/en/docs/concepts/cluster-administration/cloud-providers.md b/content/en/docs/concepts/cluster-administration/cloud-providers.md
@@ -17,30 +17,32 @@ kubeadm has configuration options to specify configuration information for cloud
 in-tree cloud provider can be configured using kubeadm as shown below:
 
 ```yaml
-apiVersion: kubeadm.k8s.io/v1alpha3
+apiVersion: kubeadm.k8s.io/v1beta1
 kind: InitConfiguration
 nodeRegistration:
   kubeletExtraArgs:
     cloud-provider: "openstack"
     cloud-config: "/etc/kubernetes/cloud.conf"
 ---
+apiVersion: kubeadm.k8s.io/v1beta1
 kind: ClusterConfiguration
-apiVersion: kubeadm.k8s.io/v1alpha3
-kubernetesVersion: v1.12.0
-apiServerExtraArgs:
-  cloud-provider: "openstack"
-  cloud-config: "/etc/kubernetes/cloud.conf"
-apiServerExtraVolumes:
-- name: cloud
-  hostPath: "/etc/kubernetes/cloud.conf"
-  mountPath: "/etc/kubernetes/cloud.conf"
-controllerManagerExtraArgs:
-  cloud-provider: "openstack"
-  cloud-config: "/etc/kubernetes/cloud.conf"
-controllerManagerExtraVolumes:
-- name: cloud
-  hostPath: "/etc/kubernetes/cloud.conf"
-  mountPath: "/etc/kubernetes/cloud.conf"
+kubernetesVersion: v1.13.0
+apiServer:
+  extraArgs:
+    cloud-provider: "openstack"
+    cloud-config: "/etc/kubernetes/cloud.conf"
+  extraVolumes:
+  - name: cloud
+    hostPath: "/etc/kubernetes/cloud.conf"
+    mountPath: "/etc/kubernetes/cloud.conf"
+controllerManager:
+  extraArgs:
+    cloud-provider: "openstack"
+    cloud-config: "/etc/kubernetes/cloud.conf"
+  extraVolumes:
+  - name: cloud
+    hostPath: "/etc/kubernetes/cloud.conf"
+    mountPath: "/etc/kubernetes/cloud.conf"
 ```
 
 The in-tree cloud providers typically need both `--cloud-provider` and `--cloud-config` specified in the command lines

diff --git a/content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md b/content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md
@@ -102,12 +102,12 @@ configuration file options. This file is passed in the `--config` option.
 
 In Kubernetes 1.11 and later, the default configuration can be printed out using the
 [kubeadm config print-default](/docs/reference/setup-tools/kubeadm/kubeadm-config/) command.
-It is **recommended** that you migrate your old `v1alpha2` configuration to `v1alpha3` using
+It is **recommended** that you migrate your old `v1alpha3` configuration to `v1beta1` using
 the [kubeadm config migrate](/docs/reference/setup-tools/kubeadm/kubeadm-config/) command,
-because `v1alpha2` will be removed in Kubernetes 1.13.
+because `v1alpha3` will be removed in Kubernetes 1.14.
 
-For more details on each field in the `v1alpha3` configuration you can navigate to our
-[API reference pages.] (https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha3)
+For more details on each field in the `v1beta1` configuration you can navigate to our
+[API reference pages.] (https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1)
 
 ### Adding kube-proxy parameters {#kube-proxy}
 

diff --git a/content/en/docs/setup/independent/control-plane-flags.md b/content/en/docs/setup/independent/control-plane-flags.md
@@ -32,16 +32,17 @@ For details, see the [reference documentation for kube-apiserver](https://kubern
 
 Example usage:
 ```yaml
-apiVersion: kubeadm.k8s.io/v1alpha3
+apiVersion: kubeadm.k8s.io/v1beta1
 kind: ClusterConfiguration
-kubernetesVersion: v1.12.0
+kubernetesVersion: v1.13.0
 metadata:
-  name: 1.12-sample
-apiServerExtraArgs:
-  advertise-address: 192.168.0.103
-  anonymous-auth: false
-  enable-admission-plugins: AlwaysPullImages,DefaultStorageClass
-  audit-log-path: /home/johndoe/audit.log
+  name: 1.13-sample
+apiServer:
+  extraArgs:
+    advertise-address: 192.168.0.103
+    anonymous-auth: false
+    enable-admission-plugins: AlwaysPullImages,DefaultStorageClass
+    audit-log-path: /home/johndoe/audit.log
 ```
 
 ## ControllerManager flags
@@ -50,15 +51,16 @@ For details, see the [reference documentation for kube-controller-manager](https
 
 Example usage:
 ```yaml
-apiVersion: kubeadm.k8s.io/v1alpha3
+apiVersion: kubeadm.k8s.io/v1beta1
 kind: ClusterConfiguration
-kubernetesVersion: v1.12.0
+kubernetesVersion: v1.13.0
 metadata:
-  name: 1.12-sample
-controllerManagerExtraArgs:
-  cluster-signing-key-file: /home/johndoe/keys/ca.key
-  bind-address: 0.0.0.0
-  deployment-controller-sync-period: 50
+  name: 1.13-sample
+controllerManager:
+  extraArgs:
+    cluster-signing-key-file: /home/johndoe/keys/ca.key
+    bind-address: 0.0.0.0
+    deployment-controller-sync-period: 50
 ```
 
 ## Scheduler flags
@@ -67,15 +69,16 @@ For details, see the [reference documentation for kube-scheduler](https://kubern
 
 Example usage:
 ```yaml
-apiVersion: kubeadm.k8s.io/v1alpha3
+apiVersion: kubeadm.k8s.io/v1beta1
 kind: ClusterConfiguration
-kubernetesVersion: v1.12.0
+kubernetesVersion: v1.13.0
 metadata:
-  name: 1.12-sample
-schedulerExtraArgs:
-  address: 0.0.0.0
-  config: /home/johndoe/schedconfig.yaml
-  kubeconfig: /home/johndoe/kubeconfig.yaml
+  name: 1.13-sample
+scheduler:
+  extraArgs:
+    address: 0.0.0.0
+    config: /home/johndoe/schedconfig.yaml
+    kubeconfig: /home/johndoe/kubeconfig.yaml
 ```
 
 {{% /capture %}}
diff --git a/content/en/docs/setup/independent/high-availability.md b/content/en/docs/setup/independent/high-availability.md
@@ -145,7 +145,7 @@ different configuration.
 
 1.  Create a `kubeadm-config.yaml` template file:
 
-        apiVersion: kubeadm.k8s.io/v1alpha3
+        apiVersion: kubeadm.k8s.io/v1beta1
         kind: ClusterConfiguration
         kubernetesVersion: stable
         apiServerCertSANs:
@@ -224,7 +224,7 @@ done
 
 1.  Create a second, different `kubeadm-config.yaml` template file:
 
-        apiVersion: kubeadm.k8s.io/v1alpha3
+        apiVersion: kubeadm.k8s.io/v1beta1
         kind: ClusterConfiguration
         kubernetesVersion: stable
         apiServerCertSANs:
@@ -314,7 +314,7 @@ done
 
 1.  Create a third, different `kubeadm-config.yaml` template file:
 
-        apiVersion: kubeadm.k8s.io/v1alpha3
+        apiVersion: kubeadm.k8s.io/v1beta1
         kind: ClusterConfiguration
         kubernetesVersion: stable
         apiServerCertSANs:
@@ -442,7 +442,7 @@ done
 **Note**: Optionally replace `stable` with a different version of Kubernetes, for example `v1.11.3`.
 {{< /note >}}
 
-        apiVersion: kubeadm.k8s.io/v1alpha3
+        apiVersion: kubeadm.k8s.io/v1beta1
         kind: ClusterConfiguration
         kubernetesVersion: stable
         apiServerCertSANs:

diff --git a/content/en/docs/setup/independent/setup-ha-etcd-with-kubeadm.md b/content/en/docs/setup/independent/setup-ha-etcd-with-kubeadm.md
@@ -83,7 +83,7 @@ this example.
     HOST=${ETCDHOSTS[$i]}
     NAME=${NAMES[$i]}
     cat << EOF > /tmp/${HOST}/kubeadmcfg.yaml
-    apiVersion: "kubeadm.k8s.io/v1alpha3"
+    apiVersion: "kubeadm.k8s.io/v1beta1"
     kind: ClusterConfiguration
     etcd:
         local:

diff --git a/content/en/docs/setup/independent/troubleshooting-kubeadm.md b/content/en/docs/setup/independent/troubleshooting-kubeadm.md
@@ -194,7 +194,7 @@ Error from server: Get https://10.19.0.41:10250/containerLogs/default/mysql-ddc6
   curl http://169.254.169.254/metadata/v1/interfaces/public/0/anchor_ipv4/address
   ```
 
-  The workaround is to tell `kubelet` which IP to use using `--node-ip`. When using Digital Ocean, it can be the public one (assigned to `eth0`) or the private one (assigned to `eth1`) should you want to use the optional private network. The [`KubeletExtraArgs` section of the kubeadm `NodeRegistrationOptions` structure](https://github.com/kubernetes/kubernetes/blob/release-1.12/cmd/kubeadm/app/apis/kubeadm/v1alpha3/types.go#L163-L166) can be used for this.
+  The workaround is to tell `kubelet` which IP to use using `--node-ip`. When using Digital Ocean, it can be the public one (assigned to `eth0`) or the private one (assigned to `eth1`) should you want to use the optional private network. The [`KubeletExtraArgs` section of the kubeadm `NodeRegistrationOptions` structure](https://github.com/kubernetes/kubernetes/blob/release-1.13/cmd/kubeadm/app/apis/kubeadm/v1beta1/types.go) can be used for this.
 
   Then restart `kubelet`:
 

diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-ha.md b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-ha.md
@@ -114,7 +114,7 @@ You should see something like the following:
 
     [upgrade/successful] SUCCESS! Your cluster was upgraded to "v1.12.0". Enjoy!
 
-The `kubeadm-config` ConfigMap is now updated from `v1alpha2` version to `v1alpha3`.
+The `kubeadm-config` ConfigMap is now updated from `v1alpha3` version to `v1beta1`.
 
 ### Upgrading additional control plane nodes
 

diff --git a/content/ko/docs/setup/independent/control-plane-flags.md b/content/ko/docs/setup/independent/control-plane-flags.md
@@ -30,16 +30,17 @@ For details, see the [reference documentation for kube-apiserver](https://kubern
 
 Example usage:
 ```yaml
-apiVersion: kubeadm.k8s.io/v1alpha3
+apiVersion: kubeadm.k8s.io/v1beta1
 kind: ClusterConfiguration
-kubernetesVersion: v1.12.0
+kubernetesVersion: v1.13.0
 metadata:
-  name: 1.12-sample
-apiServerExtraArgs:
-  advertise-address: 192.168.0.103
-  anonymous-auth: false
-  enable-admission-plugins: AlwaysPullImages,DefaultStorageClass
-  audit-log-path: /home/johndoe/audit.log
+  name: 1.13-sample
+apiServer:
+  extraArgs:
+    advertise-address: 192.168.0.103
+    anonymous-auth: false
+    enable-admission-plugins: AlwaysPullImages,DefaultStorageClass
+    audit-log-path: /home/johndoe/audit.log
 ```
 
 ## ControllerManager flags
@@ -48,15 +49,16 @@ For details, see the [reference documentation for kube-controller-manager](https
 
 Example usage:
 ```yaml
-apiVersion: kubeadm.k8s.io/v1alpha3
+apiVersion: kubeadm.k8s.io/v1beta1
 kind: ClusterConfiguration
-kubernetesVersion: v1.12.0
+kubernetesVersion: v1.13.0
 metadata:
-  name: 1.12-sample
-controllerManagerExtraArgs:
-  cluster-signing-key-file: /home/johndoe/keys/ca.key
-  bind-address: 0.0.0.0
-  deployment-controller-sync-period: 50
+  name: 1.13-sample
+controllerManager:
+  extraArgs:
+    cluster-signing-key-file: /home/johndoe/keys/ca.key
+    bind-address: 0.0.0.0
+    deployment-controller-sync-period: 50
 ```
 
 ## Scheduler flags
@@ -65,15 +67,16 @@ For details, see the [reference documentation for kube-scheduler](https://kubern
 
 Example usage:
 ```yaml
-apiVersion: kubeadm.k8s.io/v1alpha3
+apiVersion: kubeadm.k8s.io/v1beta1
 kind: ClusterConfiguration
-kubernetesVersion: v1.12.0
+kubernetesVersion: v1.13.0
 metadata:
-  name: 1.12-sample
-schedulerExtraArgs:
-  address: 0.0.0.0
-  config: /home/johndoe/schedconfig.yaml
-  kubeconfig: /home/johndoe/kubeconfig.yaml
+  name: 1.13-sample
+scheduler:
+  extraArgs:
+    address: 0.0.0.0
+    config: /home/johndoe/schedconfig.yaml
+    kubeconfig: /home/johndoe/kubeconfig.yaml
 ```
 
 {{% /capture %}}
diff --git a/content/ko/docs/setup/independent/high-availability.md b/content/ko/docs/setup/independent/high-availability.md
@@ -143,7 +143,7 @@ different configuration.
 
 1.  Create a `kubeadm-config.yaml` template file:
 
-        apiVersion: kubeadm.k8s.io/v1alpha3
+        apiVersion: kubeadm.k8s.io/v1beta1
         kind: ClusterConfiguration
         kubernetesVersion: stable
         apiServerCertSANs:
@@ -222,7 +222,7 @@ done
 
 1.  Create a second, different `kubeadm-config.yaml` template file:
 
-        apiVersion: kubeadm.k8s.io/v1alpha3
+        apiVersion: kubeadm.k8s.io/v1beta1
         kind: ClusterConfiguration
         kubernetesVersion: stable
         apiServerCertSANs:
@@ -304,14 +304,15 @@ done
     ```sh
     kubeadm alpha phase kubeconfig all --config kubeadm-config.yaml
     kubeadm alpha phase controlplane all --config kubeadm-config.yaml
+    kubeadm alpha phase kubelet config annotate-cri --config kubeadm-config.yaml
     kubeadm alpha phase mark-master --config kubeadm-config.yaml
     ```
 
 ### Add the third stacked control plane node
 
 1.  Create a third, different `kubeadm-config.yaml` template file:
 
-        apiVersion: kubeadm.k8s.io/v1alpha3
+        apiVersion: kubeadm.k8s.io/v1beta1
         kind: ClusterConfiguration
         kubernetesVersion: stable
         apiServerCertSANs:
@@ -439,7 +440,7 @@ done
 **Note**: Optionally replace `stable` with a different version of Kubernetes, for example `v1.11.3`.
 {{< /note >}}
 
-        apiVersion: kubeadm.k8s.io/v1alpha3
+        apiVersion: kubeadm.k8s.io/v1beta1
         kind: ClusterConfiguration
         kubernetesVersion: stable
         apiServerCertSANs:

diff --git a/content/ko/docs/setup/independent/setup-ha-etcd-with-kubeadm.md b/content/ko/docs/setup/independent/setup-ha-etcd-with-kubeadm.md
@@ -81,7 +81,7 @@ this example.
     HOST=${ETCDHOSTS[$i]}
     NAME=${NAMES[$i]}
     cat << EOF > /tmp/${HOST}/kubeadmcfg.yaml
-    apiVersion: "kubeadm.k8s.io/v1alpha3"
+    apiVersion: "kubeadm.k8s.io/v1beta1"
     kind: ClusterConfiguration
     etcd:
         local:

diff --git a/content/ko/docs/setup/independent/troubleshooting-kubeadm.md b/content/ko/docs/setup/independent/troubleshooting-kubeadm.md
@@ -190,7 +190,7 @@ Error from server: Get https://10.19.0.41:10250/containerLogs/default/mysql-ddc6
   curl http://169.254.169.254/metadata/v1/interfaces/public/0/anchor_ipv4/address
   ```
 
-  The workaround is to tell `kubelet` which IP to use using `--node-ip`. When using Digital Ocean, it can be the public one (assigned to `eth0`) or the private one (assigned to `eth1`) should you want to use the optional private network. The [`KubeletExtraArgs` section of the kubeadm `NodeRegistrationOptions` structure](https://github.com/kubernetes/kubernetes/blob/release-1.12/cmd/kubeadm/app/apis/kubeadm/v1alpha3/types.go#L163-L166) can be used for this.
+  The workaround is to tell `kubelet` which IP to use using `--node-ip`. When using Digital Ocean, it can be the public one (assigned to `eth0`) or the private one (assigned to `eth1`) should you want to use the optional private network. The [`KubeletExtraArgs` section of the kubeadm `NodeRegistrationOptions` structure](https://github.com/kubernetes/kubernetes/blob/release-1.12/cmd/kubeadm/app/apis/kubeadm/v1beta1/types.go) can be used for this.
 
   Then restart `kubelet`: