Skip to content

Commit 5ad633b

Browse files
authored
Merge pull request #29775 from jlbutler/merged-main-dev-1.23
periodic merge of main onto dev-1.23
2 parents c189c2d + b940dce commit 5ad633b

File tree

45 files changed

+2160
-184
lines changed

Some content is hidden

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

45 files changed

+2160
-184
lines changed

OWNERS_ALIASES

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ aliases:
7272
- anthonydahanne
7373
- feloy
7474
sig-docs-hi-owners: # Admins for Hindi content
75-
- avidLearnerInProgress
76-
- daminisatya
75+
- anubha-v-ardhan
76+
- divya-mohan0209
7777
- mittalyashu
7878
sig-docs-hi-reviews: # PR reviews for Hindi content
79-
- avidLearnerInProgress
80-
- daminisatya
79+
- anubha-v-ardhan
80+
- divya-mohan0209
8181
- mittalyashu
8282
sig-docs-id-owners: # Admins for Indonesian content
8383
- ariscahyadi

content/de/docs/tutorials/_index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ Bevor Sie die einzelnen Lernprogramme durchgehen, möchten Sie möglicherweise e
5050

5151
* [AppArmor](/docs/tutorials/clusters/apparmor/)
5252

53+
* [seccomp](/docs/tutorials/clusters/seccomp/)
54+
5355
## Services
5456

5557
* [Source IP verwenden](/docs/tutorials/services/source-ip/)

content/en/blog/_posts/2021-05-14-using-finalizers-to-control-deletion.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,17 +190,17 @@ kubectl get configmap
190190
No resources found in default namespace.
191191
```
192192

193-
To sum things up, when there's an override owner reference from a child to a parent, deleting the parent deletes the children automatically. This is called `cascade`. The default for cascade is `true`, however, you can use the --cascade=false option for `kubectl delete` to delete an object and orphan its children.
193+
To sum things up, when there's an override owner reference from a child to a parent, deleting the parent deletes the children automatically. This is called `cascade`. The default for cascade is `true`, however, you can use the --cascade=orphan option for `kubectl delete` to delete an object and orphan its children.
194194

195-
In the following example, there is a parent and a child. Notice the owner references are still included. If I delete the parent using --cascade=false, the parent is deleted but the child still exists:
195+
In the following example, there is a parent and a child. Notice the owner references are still included. If I delete the parent using --cascade=orphan, the parent is deleted but the child still exists:
196196

197197
```
198198
kubectl get configmap
199199
NAME DATA AGE
200200
mymap-child 0 13m8s
201201
mymap-parent 0 13m8s
202202
203-
kubectl delete --cascade=false configmap/mymap-parent
203+
kubectl delete --cascade=orphan configmap/mymap-parent
204204
configmap "mymap-parent" deleted
205205
206206
kubectl get configmap

content/en/blog/_posts/2021-09-13-read-write-once-pod-access-mode-alpha.md

Lines changed: 287 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,6 @@ imply any preferential status.
9191
Project [Antrea](https://github.com/vmware-tanzu/antrea) is an opensource Kubernetes networking solution intended to be Kubernetes native. It leverages Open vSwitch as the networking data plane. Open vSwitch is a high-performance programmable virtual switch that supports both Linux and Windows. Open vSwitch enables Antrea to implement Kubernetes Network Policies in a high-performance and efficient manner.
9292
Thanks to the "programmable" characteristic of Open vSwitch, Antrea is able to implement an extensive set of networking and security features and services on top of Open vSwitch.
9393

94-
### AOS from Apstra
95-
96-
[AOS](https://www.apstra.com/products/aos/) is an Intent-Based Networking system that creates and manages complex datacenter environments from a simple integrated platform. AOS leverages a highly scalable distributed design to eliminate network outages while minimizing costs.
97-
98-
The AOS Reference Design currently supports Layer-3 connected hosts that eliminate legacy Layer-2 switching problems. These Layer-3 hosts can be Linux servers (Debian, Ubuntu, CentOS) that create BGP neighbor relationships directly with the top of rack switches (TORs). AOS automates the routing adjacencies and then provides fine grained control over the route health injections (RHI) that are common in a Kubernetes deployment.
99-
100-
AOS has a rich set of REST API endpoints that enable Kubernetes to quickly change the network policy based on application requirements. Further enhancements will integrate the AOS Graph model used for the network design with the workload provisioning, enabling an end to end management system for both private and public clouds.
101-
102-
AOS supports the use of common vendor equipment from manufacturers including Cisco, Arista, Dell, Mellanox, HPE, and a large number of white-box systems and open network operating systems like Microsoft SONiC, Dell OPX, and Cumulus Linux.
103-
104-
Details on how the AOS system works can be accessed here: https://www.apstra.com/products/how-it-works/
105-
10694
### AWS VPC CNI for Kubernetes
10795

10896
The [AWS VPC CNI](https://github.com/aws/amazon-vpc-cni-k8s) offers integrated AWS Virtual Private Cloud (VPC) networking for Kubernetes clusters. This CNI plugin offers high throughput and availability, low latency, and minimal network jitter. Additionally, users can apply existing AWS VPC networking and security best practices for building Kubernetes clusters. This includes the ability to use VPC flow logs, VPC routing policies, and security groups for network traffic isolation.
@@ -116,15 +104,6 @@ Additionally, the CNI can be run alongside [Calico for network policy enforcemen
116104

117105
Azure CNI is available natively in the [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/en-us/azure/aks/configure-azure-cni).
118106

119-
120-
### Big Cloud Fabric from Big Switch Networks
121-
122-
[Big Cloud Fabric](https://www.bigswitch.com/container-network-automation) is a cloud native networking architecture, designed to run Kubernetes in private cloud/on-premises environments. Using unified physical & virtual SDN, Big Cloud Fabric tackles inherent container networking problems such as load balancing, visibility, troubleshooting, security policies & container traffic monitoring.
123-
124-
With the help of the Big Cloud Fabric's virtual pod multi-tenant architecture, container orchestration systems such as Kubernetes, RedHat OpenShift, Mesosphere DC/OS & Docker Swarm will be natively integrated alongside with VM orchestration systems such as VMware, OpenStack & Nutanix. Customers will be able to securely inter-connect any number of these clusters and enable inter-tenant communication between them if needed.
125-
126-
BCF was recognized by Gartner as a visionary in the latest [Magic Quadrant](https://go.bigswitch.com/17GatedDocuments-MagicQuadrantforDataCenterNetworking_Reg.html). One of the BCF Kubernetes on-premises deployments (which includes Kubernetes, DC/OS & VMware running on multiple DCs across different geographic regions) is also referenced [here](https://portworx.com/architects-corner-kubernetes-satya-komala-nio/).
127-
128107
### Calico
129108

130109
[Calico](https://docs.projectcalico.org/) is an open source networking and network security solution for containers, virtual machines, and native host-based workloads. Calico supports multiple data planes including: a pure Linux eBPF dataplane, a standard Linux networking dataplane, and a Windows HNS dataplane. Calico provides a full networking stack but can also be used in conjunction with [cloud provider CNIs](https://docs.projectcalico.org/networking/determine-best-networking#calico-compatible-cni-plugins-and-cloud-provider-integrations) to provide network policy enforcement.

content/en/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ weight: 20
1111
<!-- overview -->
1212

1313
The aggregation layer allows Kubernetes to be extended with additional APIs, beyond what is offered by the core Kubernetes APIs.
14-
The additional APIs can either be ready-made solutions such as [service-catalog](/docs/concepts/extend-kubernetes/service-catalog/), or APIs that you develop yourself.
14+
The additional APIs can either be ready-made solutions such as a [metrics server](https://github.com/kubernetes-sigs/metrics-server), or APIs that you develop yourself.
1515

1616
The aggregation layer is different from [Custom Resources](/docs/concepts/extend-kubernetes/api-extension/custom-resources/), which are a way to make the {{< glossary_tooltip term_id="kube-apiserver" text="kube-apiserver" >}} recognise new kinds of object.
1717

content/en/docs/concepts/extend-kubernetes/service-catalog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ The application can access the message queue as a service.
3232

3333
Service Catalog uses the [Open service broker API](https://github.com/openservicebrokerapi/servicebroker) to communicate with service brokers, acting as an intermediary for the Kubernetes API Server to negotiate the initial provisioning and retrieve the credentials necessary for the application to use a managed service.
3434

35-
It is implemented as an extension API server and a controller, using etcd for storage. It also uses the [aggregation layer](/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation/) available in Kubernetes 1.7+ to present its API.
35+
It is implemented using a [CRDs-based](/docs/concepts/extend-kubernetes/api-extension/custom-resources/#custom-resources) architecture.
3636

3737
<br>
3838

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,7 @@ variables and DNS.
444444

445445
When a Pod is run on a Node, the kubelet adds a set of environment variables
446446
for each active Service. It supports both [Docker links
447-
compatible](https://docs.docker.com/userguide/dockerlinks/) variables (see
448-
[makeLinkVariables](https://releases.k8s.io/{{< param "fullversion" >}}/pkg/kubelet/envvars/envvars.go#L49))
447+
compatible](https://docs.docker.com/userguide/dockerlinks/) variables (see [makeLinkVariables](https://github.com/kubernetes/kubernetes/blob/dd2d12f6dc0e654c15d5db57a5f9f6ba61192726/pkg/kubelet/envvars/envvars.go#L72))
449448
and simpler `{SVCNAME}_SERVICE_HOST` and `{SVCNAME}_SERVICE_PORT` variables,
450449
where the Service name is upper-cased and dashes are converted to underscores.
451450

content/en/docs/concepts/workloads/controllers/daemonset.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ You can modify the Pods that a DaemonSet creates. However, Pods do not allow al
185185
fields to be updated. Also, the DaemonSet controller will use the original template the next
186186
time a node (even with the same name) is created.
187187

188-
You can delete a DaemonSet. If you specify `--cascade=false` with `kubectl`, then the Pods
188+
You can delete a DaemonSet. If you specify `--cascade=orphan` with `kubectl`, then the Pods
189189
will be left on the nodes. If you subsequently create a new DaemonSet with the same selector,
190190
the new DaemonSet adopts the existing Pods. If any Pods need replacing the DaemonSet replaces
191191
them according to its `updateStrategy`.

content/en/docs/concepts/workloads/controllers/job.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ to keep running, but you want the rest of the Pods it creates
523523
to use a different pod template and for the Job to have a new name.
524524
You cannot update the Job because these fields are not updatable.
525525
Therefore, you delete Job `old` but _leave its pods
526-
running_, using `kubectl delete jobs/old --cascade=false`.
526+
running_, using `kubectl delete jobs/old --cascade=orphan`.
527527
Before deleting it, you make a note of what selector it uses:
528528
529529
```shell

0 commit comments

Comments
 (0)