Skip to content

Commit 3d17e6a

Browse files
authored
Merge branch 'main' into update-daemonset
2 parents 38f33cd + 2bf1a8a commit 3d17e6a

File tree

67 files changed

+1200
-779
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1200
-779
lines changed

content/en/blog/_posts/2022-12-05-forensic-container-checkpointing/index.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,3 +207,11 @@ and without losing the state of the containers in that Pod.
207207
You can reach SIG Node by several means:
208208
- Slack: [#sig-node](https://kubernetes.slack.com/messages/sig-node)
209209
- [Mailing list](https://groups.google.com/forum/#!forum/kubernetes-sig-node)
210+
211+
## Further reading
212+
213+
Please see the follow-up article [Forensic container
214+
analysis][forensic-container-analysis] for details on how a container checkpoint
215+
can be analyzed.
216+
217+
[forensic-container-analysis]: /blog/2023/03/10/forensic-container-analysis/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This page lists some of the available add-ons and links to their respective inst
1818

1919
* [ACI](https://www.github.com/noironetworks/aci-containers) provides integrated container networking and network security with Cisco ACI.
2020
* [Antrea](https://antrea.io/) operates at Layer 3/4 to provide networking and security services for Kubernetes, leveraging Open vSwitch as the networking data plane. Antrea is a [CNCF project at the Sandbox level](https://www.cncf.io/projects/antrea/).
21-
* [Calico](https://docs.projectcalico.org/latest/introduction/) is a networking and network policy provider. Calico supports a flexible set of networking options so you can choose the most efficient option for your situation, including non-overlay and overlay networks, with or without BGP. Calico uses the same engine to enforce network policy for hosts, pods, and (if using Istio & Envoy) applications at the service mesh layer.
21+
* [Calico](https://www.tigera.io/project-calico/) is a networking and network policy provider. Calico supports a flexible set of networking options so you can choose the most efficient option for your situation, including non-overlay and overlay networks, with or without BGP. Calico uses the same engine to enforce network policy for hosts, pods, and (if using Istio & Envoy) applications at the service mesh layer.
2222
* [Canal](https://projectcalico.docs.tigera.io/getting-started/kubernetes/flannel/flannel) unites Flannel and Calico, providing networking and network policy.
2323
* [Cilium](https://github.com/cilium/cilium) is a networking, observability, and security solution with an eBPF-based data plane. Cilium provides a simple flat Layer 3 network with the ability to span multiple clusters in either a native routing or overlay/encapsulation mode, and can enforce network policies on L3-L7 using an identity-based security model that is decoupled from network addressing. Cilium can act as a replacement for kube-proxy; it also offers additional, opt-in observability and security features. Cilium is a [CNCF project at the Incubation level](https://www.cncf.io/projects/cilium/).
2424
* [CNI-Genie](https://github.com/cni-genie/CNI-Genie) enables Kubernetes to seamlessly connect to a choice of CNI plugins, such as Calico, Canal, Flannel, or Weave. CNI-Genie is a [CNCF project at the Sandbox level](https://www.cncf.io/projects/cni-genie/).

content/en/docs/concepts/services-networking/endpoint-slices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ at different times.
235235
{{< note >}}
236236
Clients of the EndpointSlice API must iterate through all the existing EndpointSlices
237237
associated to a Service and build a complete list of unique network endpoints. It is
238-
important to mention that endpoints may be duplicated in different EndointSlices.
238+
important to mention that endpoints may be duplicated in different EndpointSlices.
239239

240240
You can find a reference implementation for how to perform this endpoint aggregation
241241
and deduplication as part of the `EndpointSliceCache` code within `kube-proxy`.

content/en/docs/concepts/services-networking/service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ by making the changes that are equivalent to you requesting a Service of
656656
`type: NodePort`. The cloud-controller-manager component then configures the external load balancer to
657657
forward traffic to that assigned node port.
658658

659-
_As an alpha feature_, you can configure a load balanced Service to
659+
You can configure a load balanced Service to
660660
[omit](#load-balancer-nodeport-allocation) assigning a node port, provided that the
661661
cloud provider implementation supports this.
662662

content/en/docs/concepts/workloads/controllers/cron-jobs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ That is, the CronJob does _not_ update existing Jobs, even if those remain runni
202202
A CronJob creates a Job object approximately once per execution time of its schedule.
203203
The scheduling is approximate because there
204204
are certain circumstances where two Jobs might be created, or no Job might be created.
205-
Kubernetes tries to avoid those situations, but do not completely prevent them. Therefore,
205+
Kubernetes tries to avoid those situations, but does not completely prevent them. Therefore,
206206
the Jobs that you define should be _idempotent_.
207207

208208
If `startingDeadlineSeconds` is set to a large value or left unset (the default)

content/en/docs/concepts/workloads/pods/user-namespaces.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ min-kubernetes-server-version: v1.25
1010
{{< feature-state for_k8s_version="v1.25" state="alpha" >}}
1111

1212
This page explains how user namespaces are used in Kubernetes pods. A user
13-
namespace allows to isolate the user running inside the container from the one
13+
namespace isolates the user running inside the container from the one
1414
in the host.
1515

1616
A process running as root in a container can run as a different (non-root) user

0 commit comments

Comments
 (0)