Skip to content

Commit d703ea5

Browse files
authored
Merge pull request #41406 from Ritikaa96/remove-redundant-selector-from-url
Removing redundant #selector in url and adding line-wrapping cleanup
2 parents aa05b84 + e67417a commit d703ea5

File tree

4 files changed

+25
-17
lines changed

4 files changed

+25
-17
lines changed

content/en/docs/concepts/architecture/garbage-collection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ break the kubelet behavior and remove containers that should exist.
118118
To configure options for unused container and image garbage collection, tune the
119119
kubelet using a [configuration file](/docs/tasks/administer-cluster/kubelet-config-file/)
120120
and change the parameters related to garbage collection using the
121-
[`KubeletConfiguration`](/docs/reference/config-api/kubelet-config.v1beta1/#kubelet-config-k8s-io-v1beta1-KubeletConfiguration)
121+
[`KubeletConfiguration`](/docs/reference/config-api/kubelet-config.v1beta1/)
122122
resource type.
123123

124124
### Container image lifecycle

content/en/docs/concepts/architecture/nodes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ in a cluster,
506506
|`custom-class-c` | 1000 |
507507
|`regular/unset` | 0 |
508508

509-
Within the [kubelet configuration](/docs/reference/config-api/kubelet-config.v1beta1/#kubelet-config-k8s-io-v1beta1-KubeletConfiguration)
509+
Within the [kubelet configuration](/docs/reference/config-api/kubelet-config.v1beta1/)
510510
the settings for `shutdownGracePeriodByPodPriority` could look like:
511511

512512
|Pod priority class value|Shutdown period|
@@ -625,7 +625,7 @@ onwards, swap memory support can be enabled on a per-node basis.
625625

626626
To enable swap on a node, the `NodeSwap` feature gate must be enabled on
627627
the kubelet, and the `--fail-swap-on` command line flag or `failSwapOn`
628-
[configuration setting](/docs/reference/config-api/kubelet-config.v1beta1/#kubelet-config-k8s-io-v1beta1-KubeletConfiguration)
628+
[configuration setting](/docs/reference/config-api/kubelet-config.v1beta1/)
629629
must be set to false.
630630

631631
{{< warning >}}

content/en/docs/concepts/cluster-administration/logging.md

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,16 @@ See the [`kubectl logs` documentation](/docs/reference/generated/kubectl/kubectl
8181

8282
![Node level logging](/images/docs/user-guide/logging/logging-node-level.png)
8383

84-
A container runtime handles and redirects any output generated to a containerized application's `stdout` and `stderr` streams.
85-
Different container runtimes implement this in different ways; however, the integration with the kubelet is standardized
86-
as the _CRI logging format_.
84+
A container runtime handles and redirects any output generated to a containerized
85+
application's `stdout` and `stderr` streams.
86+
Different container runtimes implement this in different ways; however, the integration
87+
with the kubelet is standardized as the _CRI logging format_.
8788

88-
By default, if a container restarts, the kubelet keeps one terminated container with its logs. If a pod is evicted from the node,
89-
all corresponding containers are also evicted, along with their logs.
89+
By default, if a container restarts, the kubelet keeps one terminated container with its logs.
90+
If a pod is evicted from the node, all corresponding containers are also evicted, along with their logs.
9091

91-
The kubelet makes logs available to clients via a special feature of the Kubernetes API. The usual way to access this is
92-
by running `kubectl logs`.
92+
The kubelet makes logs available to clients via a special feature of the Kubernetes API.
93+
The usual way to access this is by running `kubectl logs`.
9394

9495
### Log rotation
9596

@@ -101,7 +102,7 @@ If you configure rotation, the kubelet is responsible for rotating container log
101102
The kubelet sends this information to the container runtime (using CRI),
102103
and the runtime writes the container logs to the given location.
103104

104-
You can configure two kubelet [configuration settings](/docs/reference/config-api/kubelet-config.v1beta1/#kubelet-config-k8s-io-v1beta1-KubeletConfiguration),
105+
You can configure two kubelet [configuration settings](/docs/reference/config-api/kubelet-config.v1beta1/),
105106
`containerLogMaxSize` and `containerLogMaxFiles`,
106107
using the [kubelet configuration file](/docs/tasks/administer-cluster/kubelet-config-file/).
107108
These settings let you configure the maximum size for each log file and the maximum number of files allowed for each container respectively.
@@ -201,7 +202,8 @@ as your responsibility.
201202

202203
## Cluster-level logging architectures
203204

204-
While Kubernetes does not provide a native solution for cluster-level logging, there are several common approaches you can consider. Here are some options:
205+
While Kubernetes does not provide a native solution for cluster-level logging, there are
206+
several common approaches you can consider. Here are some options:
205207

206208
* Use a node-level logging agent that runs on every node.
207209
* Include a dedicated sidecar container for logging in an application pod.
@@ -211,14 +213,18 @@ While Kubernetes does not provide a native solution for cluster-level logging, t
211213

212214
![Using a node level logging agent](/images/docs/user-guide/logging/logging-with-node-agent.png)
213215

214-
You can implement cluster-level logging by including a _node-level logging agent_ on each node. The logging agent is a dedicated tool that exposes logs or pushes logs to a backend. Commonly, the logging agent is a container that has access to a directory with log files from all of the application containers on that node.
216+
You can implement cluster-level logging by including a _node-level logging agent_ on each node.
217+
The logging agent is a dedicated tool that exposes logs or pushes logs to a backend.
218+
Commonly, the logging agent is a container that has access to a directory with log files from all of the
219+
application containers on that node.
215220

216221
Because the logging agent must run on every node, it is recommended to run the agent
217222
as a `DaemonSet`.
218223

219224
Node-level logging creates only one agent per node and doesn't require any changes to the applications running on the node.
220225

221-
Containers write to stdout and stderr, but with no agreed format. A node-level agent collects these logs and forwards them for aggregation.
226+
Containers write to stdout and stderr, but with no agreed format. A node-level agent collects
227+
these logs and forwards them for aggregation.
222228

223229
### Using a sidecar container with the logging agent {#sidecar-container-with-logging-agent}
224230

content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-certs.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ setting up a cluster to use an external CA.
5353

5454
You can use the `check-expiration` subcommand to check when certificates expire:
5555

56-
```
56+
```shell
5757
kubeadm certs check-expiration
5858
```
5959

6060
The output is similar to this:
6161

62-
```
62+
```console
6363
CERTIFICATE EXPIRES RESIDUAL TIME CERTIFICATE AUTHORITY EXTERNALLY MANAGED
6464
admin.conf Dec 30, 2020 23:36 UTC 364d no
6565
apiserver Dec 30, 2020 23:36 UTC 364d ca no
@@ -268,7 +268,7 @@ serverTLSBootstrap: true
268268
If you have already created the cluster you must adapt it by doing the following:
269269
- Find and edit the `kubelet-config-{{< skew currentVersion >}}` ConfigMap in the `kube-system` namespace.
270270
In that ConfigMap, the `kubelet` key has a
271-
[KubeletConfiguration](/docs/reference/config-api/kubelet-config.v1beta1/#kubelet-config-k8s-io-v1beta1-KubeletConfiguration)
271+
[KubeletConfiguration](/docs/reference/config-api/kubelet-config.v1beta1/)
272272
document as its value. Edit the KubeletConfiguration document to set `serverTLSBootstrap: true`.
273273
- On each node, add the `serverTLSBootstrap: true` field in `/var/lib/kubelet/config.yaml`
274274
and restart the kubelet with `systemctl restart kubelet`
@@ -284,6 +284,8 @@ These CSRs can be viewed using:
284284

285285
```shell
286286
kubectl get csr
287+
```
288+
```console
287289
NAME AGE SIGNERNAME REQUESTOR CONDITION
288290
csr-9wvgt 112s kubernetes.io/kubelet-serving system:node:worker-1 Pending
289291
csr-lz97v 1m58s kubernetes.io/kubelet-serving system:node:control-plane-1 Pending

0 commit comments

Comments
 (0)