Merge pull request #47461 from salaxander/merged-main-dev-1.31

Merged main dev 1.31
kubernetes · Aug 12, 2024 · ad850cd · ad850cd
2 parents 329ee0c + 2a5a9d8
commit ad850cd
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 213 deletions.
diff --git a/README-zh.md b/README-zh.md
@@ -284,7 +284,7 @@ Then run the following commands (adapted from <https://gist.github.com/tombigel/
 ```shell
 #!/bin/sh
 
-# 这些是原始的 gist 链接，立即链接到我的 gist
+# 这些是原始的 gist 链接，现在则会链接到我的 gist
 # curl -O https://gist.githubusercontent.com/a2ikm/761c2ab02b7b3935679e55af5d81786a/raw/ab644cb92f216c019a2f032bbf25e258b01d87f9/limit.maxfiles.plist
 # curl -O https://gist.githubusercontent.com/a2ikm/761c2ab02b7b3935679e55af5d81786a/raw/ab644cb92f216c019a2f032bbf25e258b01d87f9/limit.maxproc.plist
 

diff --git a/content/de/docs/home/supported-doc-versions.md b/content/de/docs/home/supported-doc-versions.md
@@ -1,10 +1,8 @@
 ---
 title: Unterstützte Versionen der Kubernetes-Dokumentation
-content_type: concept
-card:
-  name: about
-  weight: 10
-  title: Unterstützte Versionen der Dokumentation
+content_type: custom
+layout: supported-versions
+weight: 10
 ---
 
 <!-- overview -->
@@ -14,17 +12,3 @@ und die vier vorherigen Versionen von Kubernetes.
 
 
 
-<!-- body -->
-
-## Aktuelle Version
-
-Die aktuelle Version ist
-[{{< param "version" >}}](/).
-
-## Vorherige Versionen
-
-{{< versions-other >}}
-
-
-
-
diff --git a/content/en/docs/reference/labels-annotations-taints/_index.md b/content/en/docs/reference/labels-annotations-taints/_index.md
@@ -1209,6 +1209,24 @@ Used on: IngressClass
 When a IngressClass resource has this annotation set to `"true"`, new Ingress resource
 without a class specified will be assigned this default class.
 
+### nginx.ingress.kubernetes.io/configuration-snippet
+
+Type: Annotation
+
+Example: `nginx.ingress.kubernetes.io/configuration-snippet: "  more_set_headers \"Request-Id: $req_id\";\nmore_set_headers \"Example: 42\";\n"`
+
+Used on: Ingress
+
+You can use this annotation to set extra configuration on an Ingress that 
+uses the [NGINX Ingress Controller] (https://github.com/kubernetes/ingress-nginx/)
+The `configuration-snippet` annotation is ignored
+by default since version 1.9.0 of the ingress controller.
+The NGINX ingress controller setting `allow-snippet-annotations.` 
+has to be explicitly enabled to
+use this annotation.
+Enabling the annotation can be dangerous in a multi-tenant cluster, as it can lead people with otherwise
+limited permissions being able to retrieve all Secrets in the cluster.
+
 ### kubernetes.io/ingress.class (deprecated)
 
 Type: Annotation

diff --git a/content/en/docs/tasks/debug/debug-cluster/troubleshoot-kubectl.md b/content/en/docs/tasks/debug/debug-cluster/troubleshoot-kubectl.md
@@ -112,6 +112,7 @@ Verify the status of the load balancer (if used) to ensure it is healthy and for
 traffic to the API server.
 
 ## TLS problems
+* Additional tools required - `base64` and `openssl` version 3.0 or above.
 
 The Kubernetes API server only serves HTTPS requests by default. In that case TLS problems
 may occur due to various reasons, such as certificate expiry or chain of trust validity.
@@ -123,23 +124,23 @@ directory. The `certificate-authority` attribute contains the CA certificate and
 Verify the expiry of these certificates:
 
 ```shell
-openssl x509 -noout -dates -in $(kubectl config view --minify --output 'jsonpath={.clusters[0].cluster.certificate-authority}')
+kubectl config view --flatten --output 'jsonpath={.clusters[0].cluster.certificate-authority-data}' | base64 -d | openssl x509 -noout -dates
 ```
 
 output:
 ```console
-notBefore=Sep  2 08:34:12 2023 GMT
-notAfter=Aug 31 08:34:12 2033 GMT
+notBefore=Feb 13 05:57:47 2024 GMT
+notAfter=Feb 10 06:02:47 2034 GMT
 ```
 
 ```shell
-openssl x509 -noout -dates -in $(kubectl config view --minify --output 'jsonpath={.users[0].user.client-certificate}')
+kubectl config view --flatten --output 'jsonpath={.users[0].user.client-certificate-data}'| base64 -d | openssl x509 -noout -dates
 ```
 
 output:
 ```console
-notBefore=Sep  2 08:34:12 2023 GMT
-notAfter=Sep  2 08:34:12 2026 GMT
+notBefore=Feb 13 05:57:47 2024 GMT
+notAfter=Feb 12 06:02:50 2025 GMT
 ```
 
 ## Verify kubectl helpers
@@ -155,4 +156,4 @@ kubectl config view
 ```
 
 If you previously used a helper tool (for example, `kubectl-oidc-login`), ensure that it is still
-installed and configured correctly.
+installed and configured correctly.
diff --git a/content/hi/docs/reference/glossary/cluster.md b/content/hi/docs/reference/glossary/cluster.md
@@ -0,0 +1,20 @@
+---
+title: क्लस्टर
+id: cluster
+date: 2019-06-15
+full_link: 
+short_description: >
+  वर्कर मशीनों का एक समूह, जिन्हें नोड्स भी कहा जाता है, जो कंटेनरीकृत एप्लिकेशन्स चलाते हैं। हर क्लस्टर में कम से कम एक वर्कर नोड होता है।
+
+aka: 
+tags:
+- fundamental
+- operation
+---
+वर्कर मशीनों का एक समूह, जिन्हें {{< glossary_tooltip text="नोड्स" term_id="node" >}} भी कहा जाता है,
+जो कंटेनरीकृत एप्लिकेशन्स चलाते हैं। हर क्लस्टर में कम से कम एक वर्कर नोड होता है।
+
+<!--more-->
+वर्कर मशीन {{< glossary_tooltip text="पॉड्स" term_id="pod" >}} को होस्ट करते है जो कि एप्लिकेशन वर्कलोड के घटक हैं।  
+{{< glossary_tooltip text="कंट्रोल प्लेन" term_id="control-plane" >}} क्लस्टर में वर्कर नोड्स और पॉड्स का प्रबंधन करता है। एक प्रोडक्शन वातावरण में, कंट्रोल प्लेन आमतौर पर
+कई कंप्यूटरों पर चलता है और एक क्लस्टर आमतौर पर कई नोड्स चलाता है, जो बिना किसी विफलता के और उच्च उपलब्धता प्रदान करता है।
diff --git a/content/it/docs/concepts/cluster-administration/federation.md b/content/it/docs/concepts/cluster-administration/federation.md
diff --git a/content/ja/docs/concepts/extend-kubernetes/operator.md b/content/ja/docs/concepts/extend-kubernetes/operator.md
@@ -89,7 +89,7 @@ kubectl edit SampleDB/example-database # 手動でいくつかの設定を変更
 * ユースケースに合わせた、既製のオペレーターを[OperatorHub.io](https://operatorhub.io/)から見つけます
 * 自前のオペレーターを書くために既存のツールを使います、例:
   * [Charmed Operator Framework](https://juju.is/)
-  * [Java Operator SDK](https://github.com/java-operator-sdk/java-operator-sdk)
+  * [Java Operator SDK](https://github.com/operator-framework/java-operator-sdk)
   * [Kopf](https://github.com/nolar/kopf) (Kubernetes Operator Pythonic Framework)
   * [kube-rs](https://kube.rs/) (Rust)
   * [kubebuilder](https://book.kubebuilder.io/)を使います

diff --git a/content/zh-cn/docs/concepts/services-networking/ingress.md b/content/zh-cn/docs/concepts/services-networking/ingress.md
@@ -581,7 +581,7 @@ that is used for a workload. If you used a cluster-scoped parameter then either:
   the application team make changes to the cluster-scoped parameters resource.
 -->
 名字空间作用域的参数帮助集群操作者将对工作负载所需的配置数据（比如：负载均衡设置、
-API 网关定义）的控制权力委派出去。如果你使用集群作用域的参数，那么你将面临一下情况之一：
+API 网关定义）的控制权力委派出去。如果你使用集群作用域的参数，那么你将面临以下情况之一：
 
 - 每次应用一项新的配置变更时，集群操作团队需要批准其他团队所作的修改。
 - 集群操作团队必须定义具体的准入控制规则，比如 [RBAC](/zh-cn/docs/reference/access-authn-authz/rbac/)

diff --git a/data/i18n/de/de.toml b/data/i18n/de/de.toml
@@ -1,5 +1,14 @@
 # i18n strings for the German (main) site.
 
+[docs_version_current]
+other = "(dieser Dokumentation)"
+
+[docs_version_latest_heading]
+other = "Aktuelle Version"
+
+[docs_version_other_heading]
+other = "Vorherige Versionen"
+
 [deprecation_warning]
 other = " Die Dokumentation wird nicht mehr aktiv gepflegt. Die aktuell angezeigte Version ist eine statische Momentaufnahme. Aktuelle Dokumentation finden Sie unter "