Merge remote-tracking branch 'upstream/main' into dev-1.31

Author: Princesso

assets/scss/_custom.scss

@@ -507,7 +507,7 @@ body {
     h4, h4.alert-heading {
       color: #000;
       display: block;
-      float: left;
+      float: initial;
       font-size: 1rem;
       padding: 0;
       padding-right: 0.5rem;

content/de/OWNERS

@@ -8,14 +8,7 @@ reviewers:
 
 approvers:
 - sig-docs-de-owners
-- sig-docs-website-owners # important due to no_parent_owners option
 
 labels:
 - area/localization
 - language/de
-
-# Disable inheritance so that the localization team don't end up as approvers for all
-# languages.
-# https://github.com/kubernetes/community/blob/master/communication/website-guidelines.md
-options:
-  no_parent_owners: true

content/de/docs/reference/glossary/index.md

@@ -2,6 +2,7 @@
 title: Standardisiertes Glossar
 layout: glossary
 noedit: true
+body_class: glossary
 default_active_tag: fundamental
 weight: 5
 card:

content/en/OWNERS

@@ -8,6 +8,12 @@ reviewers:
 
 approvers:
 - sig-docs-en-owners
+- sig-docs-website-owners # important due to no_parent_owners option
 
 labels:
 - language/en
+
+# Disable inheritance so that the localization team don't end up as approvers for English
+# https://github.com/kubernetes/community/blob/master/communication/website-guidelines.md
+options:
+  no_parent_owners: true

content/en/blog/_posts/2024-05-16-contribute-as-sig-docs-reviewer.md

@@ -0,0 +1,9 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+# Teams and members are visible at https://github.com/orgs/kubernetes/teams.
+
+reviewers:
+- sig-docs-en-reviews
+
+approvers:
+- sig-docs-en-owners

content/en/docs/OWNERS

@@ -29,7 +29,7 @@ entities to represent the state of your cluster. Specifically, they can describe
 * The policies around how those applications behave, such as restart policies, upgrades, and fault-tolerance
 
 A Kubernetes object is a "record of intent"--once you create the object, the Kubernetes system
-will constantly work to ensure that object exists. By creating an object, you're effectively
+will constantly work to ensure that the object exists. By creating an object, you're effectively
 telling the Kubernetes system what you want your cluster's workload to look like; this is your
 cluster's *desired state*.
 
@@ -72,7 +72,7 @@ When you create an object in Kubernetes, you must provide the object spec that d
 desired state, as well as some basic information about the object (such as a name). When you use
 the Kubernetes API to create the object (either directly or via `kubectl`), that API request must
 include that information as JSON in the request body.
-Most often, you provide the information to `kubectl` in file known as a _manifest_.
+Most often, you provide the information to `kubectl` in a file known as a _manifest_.
 By convention, manifests are YAML (you could also use JSON format).
 Tools such as `kubectl` convert the information from a manifest into JSON or another supported
 serialization format when making the API request over HTTP.
@@ -121,7 +121,7 @@ its desired state.
 Within the `.spec` of a StatefulSet is a [template](/docs/concepts/workloads/pods/#pod-templates)
 for Pod objects. That template describes Pods that the StatefulSet controller will create in order to
 satisfy the StatefulSet specification.
-Different kinds of object can also have different `.status`; again, the API reference pages
+Different kinds of objects can also have different `.status`; again, the API reference pages
 detail the structure of that `.status` field, and its content for each different type of object.
 
 {{< note >}}

content/en/docs/concepts/overview/working-with-objects/_index.md

@@ -368,6 +368,8 @@ This field follows standard Kubernetes label syntax. Valid values are one of:
 | Protocol | Description |
 |----------|-------------|
 | `kubernetes.io/h2c` | HTTP/2 over cleartext as described in [RFC 7540](https://www.rfc-editor.org/rfc/rfc7540) |
+| `kubernetes.io/ws`  | WebSocket over cleartext as described in [RFC 6455](https://www.rfc-editor.org/rfc/rfc6455) |
+| `kubernetes.io/wss` | WebSocket over TLS as described in [RFC 6455](https://www.rfc-editor.org/rfc/rfc6455) |
 
 ### Multi-port Services
 

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

@@ -196,8 +196,7 @@ To investigate the root cause of a `CrashLoopBackOff` issue, a user can:
    application code. Running this container image locally or in a development
    environment can help diagnose application specific issues.
 
-
-## Container restart policy {#restart-policy}
+### Container restart policy {#restart-policy}
 
 The `spec` of a Pod has a `restartPolicy` field with possible values Always, OnFailure,
 and Never. The default value is Always.

content/en/docs/concepts/workloads/pods/pod-lifecycle.md

@@ -128,7 +128,9 @@ Here is the configuration file for the application Deployment:
    response to a successful request is a hello message:
 
    ```none
-   Hello Kubernetes!
+   Hello, world!
+   Version: 2.0.0
+   Hostname: hello-world-cdd4458f4-m47c8
    ```
 
 ## Using a service configuration file