Skip to content

Commit df1e0b0

Browse files
committed
tweak line wrappings in kops and kubespray
1 parent 6486762 commit df1e0b0

File tree

3 files changed

+77
-29
lines changed

3 files changed

+77
-29
lines changed

content/en/docs/setup/production-environment/tools/kops.md

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,23 @@ It uses a tool called [`kOps`](https://github.com/kubernetes/kops).
1414
* Fully automated installation
1515
* Uses DNS to identify clusters
1616
* Self-healing: everything runs in Auto-Scaling Groups
17-
* Multiple OS support (Amazon Linux, Debian, Flatcar, RHEL, Rocky and Ubuntu) - see the [images.md](https://github.com/kubernetes/kops/blob/master/docs/operations/images.md)
18-
* High-Availability support - see the [high_availability.md](https://github.com/kubernetes/kops/blob/master/docs/operations/high_availability.md)
19-
* Can directly provision, or generate terraform manifests - see the [terraform.md](https://github.com/kubernetes/kops/blob/master/docs/terraform.md)
17+
* Multiple OS support (Amazon Linux, Debian, Flatcar, RHEL, Rocky and Ubuntu) - see the
18+
[images.md](https://github.com/kubernetes/kops/blob/master/docs/operations/images.md)
19+
* High-Availability support - see the
20+
[high_availability.md](https://github.com/kubernetes/kops/blob/master/docs/operations/high_availability.md)
21+
* Can directly provision, or generate terraform manifests - see the
22+
[terraform.md](https://github.com/kubernetes/kops/blob/master/docs/terraform.md)
2023

2124
## {{% heading "prerequisites" %}}
2225

2326
* You must have [kubectl](/docs/tasks/tools/) installed.
2427

2528
* You must [install](https://github.com/kubernetes/kops#installing) `kops` on a 64-bit (AMD64 and Intel 64) device architecture.
2629

27-
* You must have an [AWS account](https://docs.aws.amazon.com/polly/latest/dg/setting-up.html), generate [IAM keys](https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys) and [configure](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html#cli-quick-configuration) them. The IAM user will need [adequate permissions](https://github.com/kubernetes/kops/blob/master/docs/getting_started/aws.md#setup-iam-user).
30+
* You must have an [AWS account](https://docs.aws.amazon.com/polly/latest/dg/setting-up.html),
31+
generate [IAM keys](https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys)
32+
and [configure](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html#cli-quick-configuration) them.
33+
The IAM user will need [adequate permissions](https://github.com/kubernetes/kops/blob/master/docs/getting_started/aws.md#setup-iam-user).
2834

2935
3036

@@ -34,7 +40,8 @@ It uses a tool called [`kOps`](https://github.com/kubernetes/kops).
3440

3541
#### Installation
3642

37-
Download kops from the [releases page](https://github.com/kubernetes/kops/releases) (it is also convenient to build from source):
43+
Download kops from the [releases page](https://github.com/kubernetes/kops/releases)
44+
(it is also convenient to build from source):
3845

3946
{{< tabs name="kops_installation" >}}
4047
{{% tab name="macOS" %}}
@@ -212,7 +219,8 @@ for production clusters!
212219

213220
### Explore other add-ons
214221

215-
See the [list of add-ons](/docs/concepts/cluster-administration/addons/) to explore other add-ons, including tools for logging, monitoring, network policy, visualization, and control of your Kubernetes cluster.
222+
See the [list of add-ons](/docs/concepts/cluster-administration/addons/) to explore other add-ons,
223+
including tools for logging, monitoring, network policy, visualization, and control of your Kubernetes cluster.
216224

217225
## Cleanup
218226

@@ -221,6 +229,8 @@ See the [list of add-ons](/docs/concepts/cluster-administration/addons/) to expl
221229
## {{% heading "whatsnext" %}}
222230

223231
* Learn more about Kubernetes [concepts](/docs/concepts/) and [`kubectl`](/docs/reference/kubectl/).
224-
* Learn more about `kOps` [advanced usage](https://kops.sigs.k8s.io/) for tutorials, best practices and advanced configuration options.
225-
* Follow `kOps` community discussions on Slack: [community discussions](https://github.com/kubernetes/kops#other-ways-to-communicate-with-the-contributors).
232+
* Learn more about `kOps` [advanced usage](https://kops.sigs.k8s.io/) for tutorials,
233+
best practices and advanced configuration options.
234+
* Follow `kOps` community discussions on Slack:
235+
[community discussions](https://github.com/kubernetes/kops#other-ways-to-communicate-with-the-contributors).
226236
* Contribute to `kOps` by addressing or raising an issue [GitHub Issues](https://github.com/kubernetes/kops/issues).

content/en/docs/setup/production-environment/tools/kubeadm/dual-stack-support.md

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,21 @@ min-kubernetes-server-version: 1.21
99

1010
{{< feature-state for_k8s_version="v1.23" state="stable" >}}
1111

12-
Your Kubernetes cluster includes [dual-stack](/docs/concepts/services-networking/dual-stack/) networking, which means that cluster networking lets you use either address family. In a cluster, the control plane can assign both an IPv4 address and an IPv6 address to a single {{< glossary_tooltip text="Pod" term_id="pod" >}} or a {{< glossary_tooltip text="Service" term_id="service" >}}.
12+
Your Kubernetes cluster includes [dual-stack](/docs/concepts/services-networking/dual-stack/)
13+
networking, which means that cluster networking lets you use either address family.
14+
In a cluster, the control plane can assign both an IPv4 address and an IPv6 address to a single
15+
{{< glossary_tooltip text="Pod" term_id="pod" >}} or a {{< glossary_tooltip text="Service" term_id="service" >}}.
1316

1417
1518

1619
## {{% heading "prerequisites" %}}
1720

18-
You need to have installed the {{< glossary_tooltip text="kubeadm" term_id="kubeadm" >}} tool, following the steps from [Installing kubeadm](/docs/setup/production-environment/tools/kubeadm/install-kubeadm/).
21+
You need to have installed the {{< glossary_tooltip text="kubeadm" term_id="kubeadm" >}} tool,
22+
following the steps from [Installing kubeadm](/docs/setup/production-environment/tools/kubeadm/install-kubeadm/).
1923

20-
For each server that you want to use as a {{< glossary_tooltip text="node" term_id="node" >}}, make sure it allows IPv6 forwarding. On Linux, you can set this by running run `sysctl -w net.ipv6.conf.all.forwarding=1` as the root user on each server.
24+
For each server that you want to use as a {{< glossary_tooltip text="node" term_id="node" >}},
25+
make sure it allows IPv6 forwarding. On Linux, you can set this by running run
26+
`sysctl -w net.ipv6.conf.all.forwarding=1` as the root user on each server.
2127

2228
You need to have an IPv4 and and IPv6 address range to use. Cluster operators typically
2329
use private address ranges for IPv4. For IPv6, a cluster operator typically chooses a global
@@ -65,15 +71,18 @@ nodeRegistration:
6571
node-ip: 10.100.0.2,fd00:1:2:3::2
6672
```
6773
68-
`advertiseAddress` in InitConfiguration specifies the IP address that the API Server will advertise it is listening on. The value of `advertiseAddress` equals the `--apiserver-advertise-address` flag of `kubeadm init`
74+
`advertiseAddress` in InitConfiguration specifies the IP address that the API Server
75+
will advertise it is listening on. The value of `advertiseAddress` equals the
76+
`--apiserver-advertise-address` flag of `kubeadm init`.
6977

7078
Run kubeadm to initiate the dual-stack control plane node:
7179

7280
```shell
7381
kubeadm init --config=kubeadm-config.yaml
7482
```
7583

76-
The kube-controller-manager flags `--node-cidr-mask-size-ipv4|--node-cidr-mask-size-ipv6` are set with default values. See [configure IPv4/IPv6 dual stack](/docs/concepts/services-networking/dual-stack#configure-ipv4-ipv6-dual-stack).
84+
The kube-controller-manager flags `--node-cidr-mask-size-ipv4|--node-cidr-mask-size-ipv6`
85+
are set with default values. See [configure IPv4/IPv6 dual stack](/docs/concepts/services-networking/dual-stack#configure-ipv4-ipv6-dual-stack).
7786

7887
{{< note >}}
7988
The `--apiserver-advertise-address` flag does not support dual-stack.
@@ -124,7 +133,9 @@ nodeRegistration:
124133
125134
```
126135

127-
`advertiseAddress` in JoinConfiguration.controlPlane specifies the IP address that the API Server will advertise it is listening on. The value of `advertiseAddress` equals the `--apiserver-advertise-address` flag of `kubeadm join`.
136+
`advertiseAddress` in JoinConfiguration.controlPlane specifies the IP address that the
137+
API Server will advertise it is listening on. The value of `advertiseAddress` equals
138+
the `--apiserver-advertise-address` flag of `kubeadm join`.
128139

129140
```shell
130141
kubeadm join --config=kubeadm-config.yaml

content/en/docs/setup/production-environment/tools/kubespray.md

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@ weight: 30
66

77
88

9-
This quickstart helps to install a Kubernetes cluster hosted on GCE, Azure, OpenStack, AWS, vSphere, Equinix Metal (formerly Packet), Oracle Cloud Infrastructure (Experimental) or Baremetal with [Kubespray](https://github.com/kubernetes-sigs/kubespray).
9+
This quickstart helps to install a Kubernetes cluster hosted on GCE, Azure, OpenStack,
10+
AWS, vSphere, Equinix Metal (formerly Packet), Oracle Cloud Infrastructure (Experimental)
11+
or Baremetal with [Kubespray](https://github.com/kubernetes-sigs/kubespray).
1012

11-
Kubespray is a composition of [Ansible](https://docs.ansible.com/) playbooks, [inventory](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/ansible.md#inventory), provisioning tools, and domain knowledge for generic OS/Kubernetes clusters configuration management tasks.
13+
Kubespray is a composition of [Ansible](https://docs.ansible.com/) playbooks,
14+
[inventory](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/ansible.md#inventory),
15+
provisioning tools, and domain knowledge for generic OS/Kubernetes clusters configuration management tasks.
1216

1317
Kubespray provides:
18+
1419
* Highly available cluster.
1520
* Composable (Choice of the network plugin for instance).
1621
* Supports most popular Linux distributions:
@@ -28,7 +33,8 @@ Kubespray provides:
2833
- Amazon Linux 2
2934
* Continuous integration tests.
3035

31-
To choose a tool which best fits your use case, read [this comparison](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/comparisons.md) to
36+
To choose a tool which best fits your use case, read
37+
[this comparison](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/comparisons.md) to
3238
[kubeadm](/docs/reference/setup-tools/kubeadm/) and [kops](/docs/setup/production-environment/tools/kops/).
3339

3440
@@ -44,8 +50,11 @@ Provision servers with the following [requirements](https://github.com/kubernete
4450
* The target servers must have **access to the Internet** in order to pull docker images. Otherwise, additional configuration is required See ([Offline Environment](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/offline-environment.md))
4551
* The target servers are configured to allow **IPv4 forwarding**.
4652
* If using IPv6 for pods and services, the target servers are configured to allow **IPv6 forwarding**.
47-
* The **firewalls are not managed**, you'll need to implement your own rules the way you used to. in order to avoid any issue during deployment you should disable your firewall.
48-
* If kubespray is run from non-root user account, correct privilege escalation method should be configured in the target servers. Then the `ansible_become` flag or command parameters `--become` or `-b` should be specified.
53+
* The **firewalls are not managed**, you'll need to implement your own rules the way you used to.
54+
in order to avoid any issue during deployment you should disable your firewall.
55+
* If kubespray is run from non-root user account, correct privilege escalation method
56+
should be configured in the target servers. Then the `ansible_become` flag or command
57+
parameters `--become` or `-b` should be specified.
4958

5059
Kubespray provides the following utilities to help provision your environment:
5160

@@ -56,7 +65,10 @@ Kubespray provides the following utilities to help provision your environment:
5665

5766
### (2/5) Compose an inventory file
5867

59-
After you provision your servers, create an [inventory file for Ansible](https://docs.ansible.com/ansible/latest/network/getting_started/first_inventory.html). You can do this manually or via a dynamic inventory script. For more information, see "[Building your own inventory](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/getting-started.md#building-your-own-inventory)".
68+
After you provision your servers, create an
69+
[inventory file for Ansible](https://docs.ansible.com/ansible/latest/network/getting_started/first_inventory.html).
70+
You can do this manually or via a dynamic inventory script. For more information,
71+
see "[Building your own inventory](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/getting-started.md#building-your-own-inventory)".
6072

6173
### (3/5) Plan your cluster deployment
6274

@@ -74,49 +86,64 @@ Kubespray provides the ability to customize many aspects of the deployment:
7486
* {{< glossary_tooltip term_id="cri-o" >}}
7587
* Certificate generation methods
7688

77-
Kubespray customizations can be made to a [variable file](https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html). If you are getting started with Kubespray, consider using the Kubespray defaults to deploy your cluster and explore Kubernetes.
89+
Kubespray customizations can be made to a
90+
[variable file](https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html).
91+
If you are getting started with Kubespray, consider using the Kubespray
92+
defaults to deploy your cluster and explore Kubernetes.
7893

7994
### (4/5) Deploy a Cluster
8095

8196
Next, deploy your cluster:
8297

83-
Cluster deployment using [ansible-playbook](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/getting-started.md#starting-custom-deployment).
98+
Cluster deployment using
99+
[ansible-playbook](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/getting-started.md#starting-custom-deployment).
84100

85101
```shell
86102
ansible-playbook -i your/inventory/inventory.ini cluster.yml -b -v \
87103
--private-key=~/.ssh/private_key
88104
```
89105

90-
Large deployments (100+ nodes) may require [specific adjustments](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/large-deployments.md) for best results.
106+
Large deployments (100+ nodes) may require
107+
[specific adjustments](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/large-deployments.md)
108+
for best results.
91109

92110
### (5/5) Verify the deployment
93111

94-
Kubespray provides a way to verify inter-pod connectivity and DNS resolve with [Netchecker](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/netcheck.md). Netchecker ensures the netchecker-agents pods can resolve DNS requests and ping each over within the default namespace. Those pods mimic similar behavior as the rest of the workloads and serve as cluster health indicators.
112+
Kubespray provides a way to verify inter-pod connectivity and DNS resolve with
113+
[Netchecker](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/netcheck.md).
114+
Netchecker ensures the netchecker-agents pods can resolve DNS requests and ping each
115+
over within the default namespace. Those pods mimic similar behavior as the rest
116+
of the workloads and serve as cluster health indicators.
95117

96118
## Cluster operations
97119

98120
Kubespray provides additional playbooks to manage your cluster: _scale_ and _upgrade_.
99121

100122
### Scale your cluster
101123

102-
You can add worker nodes from your cluster by running the scale playbook. For more information, see "[Adding nodes](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/getting-started.md#adding-nodes)".
103-
You can remove worker nodes from your cluster by running the remove-node playbook. For more information, see "[Remove nodes](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/getting-started.md#remove-nodes)".
124+
You can add worker nodes from your cluster by running the scale playbook. For more information,
125+
see "[Adding nodes](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/getting-started.md#adding-nodes)".
126+
You can remove worker nodes from your cluster by running the remove-node playbook. For more information,
127+
see "[Remove nodes](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/getting-started.md#remove-nodes)".
104128

105129
### Upgrade your cluster
106130

107-
You can upgrade your cluster by running the upgrade-cluster playbook. For more information, see "[Upgrades](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/upgrades.md)".
131+
You can upgrade your cluster by running the upgrade-cluster playbook. For more information,
132+
see "[Upgrades](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/upgrades.md)".
108133

109134
## Cleanup
110135

111-
You can reset your nodes and wipe out all components installed with Kubespray via the [reset playbook](https://github.com/kubernetes-sigs/kubespray/blob/master/reset.yml).
136+
You can reset your nodes and wipe out all components installed with Kubespray
137+
via the [reset playbook](https://github.com/kubernetes-sigs/kubespray/blob/master/reset.yml).
112138

113139
{{< caution >}}
114140
When running the reset playbook, be sure not to accidentally target your production cluster!
115141
{{< /caution >}}
116142

117143
## Feedback
118144

119-
* Slack Channel: [#kubespray](https://kubernetes.slack.com/messages/kubespray/) (You can get your invite [here](https://slack.k8s.io/)).
145+
* Slack Channel: [#kubespray](https://kubernetes.slack.com/messages/kubespray/)
146+
(You can get your invite [here](https://slack.k8s.io/)).
120147
* [GitHub Issues](https://github.com/kubernetes-sigs/kubespray/issues).
121148

122149
## {{% heading "whatsnext" %}}

0 commit comments

Comments
 (0)