whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kubeadm: Document new v1beta2 config format (#14607)

Browse Source 
Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
This commit is contained in:
Rostislav M. Georgiev
2019-06-10 22:27:17 +03:00
committed by Kubernetes Prow Robot
parent fc86f8fef9
commit b1a0711f11
8 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/en/docs/concepts/cluster-administration/cloud-providers.md
+2 -2
View File
@@ -17,14 +17,14 @@ kubeadm has configuration options to specify configuration information for cloud
in-tree cloud provider can be configured using kubeadm as shown below: in-tree cloud provider can be configured using kubeadm as shown below:
```yaml ```yaml
apiVersion: kubeadm.k8s.io/v1beta1 apiVersion: kubeadm.k8s.io/v1beta2
kind: InitConfiguration kind: InitConfiguration
nodeRegistration: nodeRegistration:
kubeletExtraArgs: kubeletExtraArgs:
cloud-provider: "openstack" cloud-provider: "openstack"
cloud-config: "/etc/kubernetes/cloud.conf" cloud-config: "/etc/kubernetes/cloud.conf"
--- ---
apiVersion: kubeadm.k8s.io/v1beta1 apiVersion: kubeadm.k8s.io/v1beta2
kind: ClusterConfiguration kind: ClusterConfiguration
kubernetesVersion: v1.13.0 kubernetesVersion: v1.13.0
apiServer: apiServer:
content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_config_migrate.md
+2 -2
View File
@@ -8,10 +8,10 @@ Read an older version of the kubeadm configuration API types from a file, and ou
This command lets you convert configuration objects of older versions to the latest supported version, This command lets you convert configuration objects of older versions to the latest supported version,
locally in the CLI tool without ever touching anything in the cluster. locally in the CLI tool without ever touching anything in the cluster.
In this version of kubeadm, the following API versions are supported: In this version of kubeadm, the following API versions are supported:
- kubeadm.k8s.io/v1alpha3
- kubeadm.k8s.io/v1beta1 - kubeadm.k8s.io/v1beta1
- kubeadm.k8s.io/v1beta2
Further, kubeadm can only write out config of version "kubeadm.k8s.io/v1beta1", but read both types. Further, kubeadm can only write out config of version "kubeadm.k8s.io/v1beta2", but read both types.
So regardless of what version you pass to the --old-config parameter here, the API object will be So regardless of what version you pass to the --old-config parameter here, the API object will be
read, deserialized, defaulted, converted, validated, and re-serialized when written to stdout or read, deserialized, defaulted, converted, validated, and re-serialized when written to stdout or
--new-config if specified. --new-config if specified.
content/en/docs/reference/setup-tools/kubeadm/kubeadm-init-phase.md
+4 -4
View File
@@ -145,18 +145,18 @@ kubeadm config images list/pull --config=someconfig.yaml
kubeadm upgrade apply --config=someconfig.yaml kubeadm upgrade apply --config=someconfig.yaml
``` ```
The file has to contain a [`DNS`](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1#DNS) field in[`ClusterConfiguration`](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1#ClusterConfiguration) The file has to contain a [`DNS`](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2#DNS) field in[`ClusterConfiguration`](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2#ClusterConfiguration)
and also a type for the addon - `kube-dns` (default value is `CoreDNS`). and also a type for the addon - `kube-dns` (default value is `CoreDNS`).
```yaml ```yaml
apiVersion: kubeadm.k8s.io/v1beta1 apiVersion: kubeadm.k8s.io/v1beta2
kind: ClusterConfiguration kind: ClusterConfiguration
dns: dns:
type: "kube-dns" type: "kube-dns"
``` ```
For more details on each field in the `v1beta1` configuration you can navigate to our For more details on each field in the `v1beta2` configuration you can navigate to our
[API reference pages.] (https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1) [API reference pages.] (https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2)
## What's next ## What's next
* [kubeadm init](/docs/reference/setup-tools/kubeadm/kubeadm-init/) to bootstrap a Kubernetes control-plane node * [kubeadm init](/docs/reference/setup-tools/kubeadm/kubeadm-init/) to bootstrap a Kubernetes control-plane node
content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md
+4 -5
View File
@@ -118,12 +118,11 @@ 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 In Kubernetes 1.11 and later, the default configuration can be printed out using the
[kubeadm config print](/docs/reference/setup-tools/kubeadm/kubeadm-config/) command. [kubeadm config print](/docs/reference/setup-tools/kubeadm/kubeadm-config/) command.
It is **recommended** that you migrate your old `v1alpha3` configuration to `v1beta1` using It is **recommended** that you migrate your old `v1beta1` configuration to `v1beta2` using
the [kubeadm config migrate](/docs/reference/setup-tools/kubeadm/kubeadm-config/) command, the [kubeadm config migrate](/docs/reference/setup-tools/kubeadm/kubeadm-config/) command.
because `v1alpha3` will be removed in Kubernetes 1.15.
For more details on each field in the `v1beta1` configuration you can navigate to our For more details on each field in the `v1beta2` configuration you can navigate to our
[API reference pages](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1). [API reference pages](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2).
### Adding kube-proxy parameters {#kube-proxy} ### Adding kube-proxy parameters {#kube-proxy}
content/en/docs/setup/independent/control-plane-flags.md
+4 -4
View File
@@ -23,7 +23,7 @@ The `extraArgs` field consist of `key: value` pairs. To override a flag for a co
2. Add the flags to override to the field. 2. Add the flags to override to the field.
For more details on each field in the configuration you can navigate to our For more details on each field in the configuration you can navigate to our
[API reference pages](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm#ClusterConfiguration). [API reference pages](https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2#ClusterConfiguration).
{{% /capture %}} {{% /capture %}}
@@ -35,7 +35,7 @@ For details, see the [reference documentation for kube-apiserver](/docs/referenc
Example usage: Example usage:
```yaml ```yaml
apiVersion: kubeadm.k8s.io/v1beta1 apiVersion: kubeadm.k8s.io/v1beta2
kind: ClusterConfiguration kind: ClusterConfiguration
kubernetesVersion: v1.13.0 kubernetesVersion: v1.13.0
metadata: metadata:
@@ -54,7 +54,7 @@ For details, see the [reference documentation for kube-controller-manager](/docs
Example usage: Example usage:
```yaml ```yaml
apiVersion: kubeadm.k8s.io/v1beta1 apiVersion: kubeadm.k8s.io/v1beta2
kind: ClusterConfiguration kind: ClusterConfiguration
kubernetesVersion: v1.13.0 kubernetesVersion: v1.13.0
metadata: metadata:
@@ -72,7 +72,7 @@ For details, see the [reference documentation for kube-scheduler](/docs/referenc
Example usage: Example usage:
```yaml ```yaml
apiVersion: kubeadm.k8s.io/v1beta1 apiVersion: kubeadm.k8s.io/v1beta2
kind: ClusterConfiguration kind: ClusterConfiguration
kubernetesVersion: v1.13.0 kubernetesVersion: v1.13.0
metadata: metadata:
content/en/docs/setup/independent/high-availability.md
+2 -2
View File
@@ -106,7 +106,7 @@ option. Your cluster requirements may need a different configuration.
1. On the first control plane node, create a configuration file called `kubeadm-config.yaml`: 1. On the first control plane node, create a configuration file called `kubeadm-config.yaml`:
apiVersion: kubeadm.k8s.io/v1beta1 apiVersion: kubeadm.k8s.io/v1beta2
kind: ClusterConfiguration kind: ClusterConfiguration
kubernetesVersion: stable kubernetesVersion: stable
controlPlaneEndpoint: "LOAD_BALANCER_DNS:LOAD_BALANCER_PORT" controlPlaneEndpoint: "LOAD_BALANCER_DNS:LOAD_BALANCER_PORT"
@@ -231,7 +231,7 @@ in the kubeadm config file.
1. Create a file called `kubeadm-config.yaml` with the following contents: 1. Create a file called `kubeadm-config.yaml` with the following contents:
apiVersion: kubeadm.k8s.io/v1beta1 apiVersion: kubeadm.k8s.io/v1beta2
kind: ClusterConfiguration kind: ClusterConfiguration
kubernetesVersion: stable kubernetesVersion: stable
controlPlaneEndpoint: "LOAD_BALANCER_DNS:LOAD_BALANCER_PORT" controlPlaneEndpoint: "LOAD_BALANCER_DNS:LOAD_BALANCER_PORT"
content/en/docs/setup/independent/setup-ha-etcd-with-kubeadm.md
+1 -1
View File
@@ -82,7 +82,7 @@ this example.
HOST=${ETCDHOSTS[$i]} HOST=${ETCDHOSTS[$i]}
NAME=${NAMES[$i]} NAME=${NAMES[$i]}
cat << EOF > /tmp/${HOST}/kubeadmcfg.yaml cat << EOF > /tmp/${HOST}/kubeadmcfg.yaml
apiVersion: "kubeadm.k8s.io/v1beta1" apiVersion: "kubeadm.k8s.io/v1beta2"
kind: ClusterConfiguration kind: ClusterConfiguration
etcd: etcd:
local: local:
content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-certs.md
+1 -1
View File
@@ -115,7 +115,7 @@ To activate the build-in signer, you must pass the `--cluster-signing-cert-file`
If you're creating a new cluster, you can use a kubeadm [configuration file][config]: If you're creating a new cluster, you can use a kubeadm [configuration file][config]:
```yaml ```yaml
apiVersion: kubeadm.k8s.io/v1beta1 apiVersion: kubeadm.k8s.io/v1beta2
kind: ClusterConfiguration kind: ClusterConfiguration
controllerManager: controllerManager:
extraArgs: extraArgs: