Skip to content

Commit 7c72661

Browse files
authored
Merge branch 'kubernetes:main' into dev
2 parents f13b975 + 7d88af1 commit 7c72661

File tree

32 files changed

+741
-344
lines changed

32 files changed

+741
-344
lines changed

content/en/blog/_posts/2025-03-24-ingress-nginx-CVE-2025-1974.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: >
77
Tabitha Sable (Kubernetes Security Response Committee)
88
---
99

10-
Today, the ingress-nginx maintainers have [released patches for a batch of critical vulnerabilities](https://github.com/kubernetes/ingress-nginx/releases) that could make it easy for attackers to take over your Kubernetes cluster. If you are among the over 40% of Kubernetes administrators using [ingress-nginx](https://github.com/kubernetes/ingress-nginx/), you should take action immediately to protect your users and data.
10+
Today, the ingress-nginx maintainers have released patches for a batch of critical vulnerabilities that could make it easy for attackers to take over your Kubernetes cluster: [ingress-nginx v1.12.1](https://github.com/kubernetes/ingress-nginx/releases/tag/controller-v1.12.1) and [ingress-nginx v1.11.5](https://github.com/kubernetes/ingress-nginx/releases/tag/controller-v1.11.5). If you are among the over 40% of Kubernetes administrators using [ingress-nginx](https://github.com/kubernetes/ingress-nginx/), you should take action immediately to protect your users and data.
1111

1212
## Background
1313

@@ -23,7 +23,7 @@ Four of today’s ingress-nginx vulnerabilities are improvements to how ingress-
2323

2424
The most serious of today’s vulnerabilities, [CVE-2025-1974](https://github.com/kubernetes/kubernetes/issues/131009), rated [9.8 CVSS](https://www.first.org/cvss/calculator/3-1#CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H), allows anything on the Pod network to exploit configuration injection vulnerabilities via the Validating Admission Controller feature of ingress-nginx. This makes such vulnerabilities far more dangerous: ordinarily one would need to be able to create an Ingress object in the cluster, which is a fairly privileged action. When combined with today’s other vulnerabilities, **CVE-2025-1974 means that anything on the Pod network has a good chance of taking over your Kubernetes cluster, with no credentials or administrative access required**. In many common scenarios, the Pod network is accessible to all workloads in your cloud VPC, or even anyone connected to your corporate network\! This is a very serious situation.
2525

26-
Today, we have [released ingress-nginx v1.12.1 and v1.11.5](https://github.com/kubernetes/ingress-nginx/releases), which have fixes for all five of these vulnerabilities.
26+
Today, we have released [ingress-nginx v1.12.1](https://github.com/kubernetes/ingress-nginx/releases/tag/controller-v1.12.1) and [ingress-nginx v1.11.5](https://github.com/kubernetes/ingress-nginx/releases/tag/controller-v1.11.5), which have fixes for all five of these vulnerabilities.
2727

2828
## Your next steps
2929

@@ -52,3 +52,5 @@ Thanks go out to Nir Ohfeld, Sagi Tzadik, Ronen Shustin, and Hillai Ben-Sasson f
5252
For further information about the maintenance and future of ingress-nginx, please see this [GitHub issue](https://github.com/kubernetes/ingress-nginx/issues/13002) and/or attend [James and Marco’s KubeCon/CloudNativeCon EU 2025 presentation](https://kccnceu2025.sched.com/event/1tcyc/).
5353

5454
For further information about the specific vulnerabilities discussed in this article, please see the appropriate GitHub issue: [CVE-2025-24513](https://github.com/kubernetes/kubernetes/issues/131005), [CVE-2025-24514](https://github.com/kubernetes/kubernetes/issues/131006), [CVE-2025-1097](https://github.com/kubernetes/kubernetes/issues/131007), [CVE-2025-1098](https://github.com/kubernetes/kubernetes/issues/131008), or [CVE-2025-1974](https://github.com/kubernetes/kubernetes/issues/131009)
55+
56+
*This blog post was revised in May 2025 to update the hyperlinks.*
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

content/en/blog/_posts/2025-05-19-announcing-etcd-3.6.md renamed to content/en/blog/_posts/2025-05-15-announcing-etcd-3.6/index.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ In this release, we reduced average memory consumption by at least 50% (see Figu
112112
- The default value of `--snapshot-count` has been reduced from 100,000 in v3.5 to 10,000 in v3.6. As a result, etcd v3.6 now retains only about 10% of the history records compared to v3.5.
113113
- Raft history is compacted more frequently, as introduced in [PR/18825][].
114114

115-
![figure-1](../2025-05-19-announcing-etcd-3.6/figure-1.png "Diagram of memory usage")
115+
{{< figure src="figure-1.png" alt="Diagram of memory usage" >}}
116116

117117
_**Figure 1:** Memory usage comparison between etcd v3.5.20 and v3.6.0-rc.2 under different read/write ratios.
118118
Each subplot shows the memory usage over time with a specific read/write ratio. The red line represents etcd
@@ -126,25 +126,25 @@ in both read and write throughput (see Figure 2, 3, 4 and 5). This improvement i
126126
any single major change, but rather the cumulative effect of multiple minor enhancements. One such
127127
example is the optimization of the free page queries introduced in [PR/419][].
128128

129-
![figure-2](../2025-05-19-announcing-etcd-3.6/figure-2.png "etcd read transaction performance with a high write ratio")
129+
{{< figure src="figure-2.png" alt="etcd read transaction performance with a high write ratio" >}}
130130

131131
_**Figure 2:** Read throughput comparison between etcd v3.5.20 and v3.6.0-rc.2 under a high write ratio. The
132132
read/write ratio is 0.0078, meaning 1 read per 128 writes. The right bar shows the percentage improvement
133133
in read throughput of v3.6.0-rc.2 over v3.5.20, ranging from 3.21% to 25.59%._
134134

135-
![figure-3](../2025-05-19-announcing-etcd-3.6/figure-3.png "etcd read transaction performance with a high read ratio")
135+
{{< figure src="figure-3.png" alt="etcd read transaction performance with a high read ratio" >}}
136136

137137
_**Figure 3:** Read throughput comparison between etcd v3.5.20 and v3.6.0-rc.2 under a high read ratio.
138138
The read/write ratio is 8, meaning 8 reads per write. The right bar shows the percentage improvement in
139139
read throughput of v3.6.0-rc.2 over v3.5.20, ranging from 4.38% to 27.20%._
140140

141-
![figure-4](../2025-05-19-announcing-etcd-3.6/figure-4.png "etcd write transaction performance with a high write ratio")
141+
{{< figure src="figure-4.png" alt="etcd write transaction performance with a high write ratio" >}}
142142

143143
_**Figure 4:** Write throughput comparison between etcd v3.5.20 and v3.6.0-rc.2 under a high write ratio. The
144144
read/write ratio is 0.0078, meaning 1 read per 128 writes. The right bar shows the percentage improvement
145145
in write throughput of v3.6.0-rc.2 over v3.5.20, ranging from 2.95% to 24.24%._
146146

147-
![figure-5](../2025-05-19-announcing-etcd-3.6/figure-5.png "etcd write transaction performance with a high read ratio")
147+
{{< figure src="figure-5.png" alt="etcd write transaction performance with a high read ratio" >}}
148148

149149
_**Figure 5:** Write throughput comparison between etcd v3.5.20 and v3.6.0-rc.2 under a high read ratio.
150150
The read/write ratio is 8, meaning 8 reads per write. The right bar shows the percentage improvement in

content/en/docs/reference/using-api/deprecation-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ deprecated API versions to newer and more stable API versions.
2222

2323
### v1.32
2424

25-
The **v1.32** release will stop serving the following deprecated API versions:
25+
The **v1.32** release stopped serving the following deprecated API versions:
2626

2727
#### Flow control resources {#flowcontrol-resources-v132}
2828

29-
The **flowcontrol.apiserver.k8s.io/v1beta3** API version of FlowSchema and PriorityLevelConfiguration will no longer be served in v1.32.
29+
The **flowcontrol.apiserver.k8s.io/v1beta3** API version of FlowSchema and PriorityLevelConfiguration is no longer served as of v1.32.
3030

3131
* Migrate manifests and API clients to use the **flowcontrol.apiserver.k8s.io/v1** API version, available since v1.29.
3232
* All existing persisted objects are accessible via the new API

content/ja/docs/tutorials/kubernetes-basics/deploy-app/deploy-interactive.html

Lines changed: 0 additions & 46 deletions
This file was deleted.

content/ja/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -80,23 +80,6 @@ <h2 style="color: #3771e3;">Kubernetes上にはじめてのアプリケーショ
8080
</div>
8181
</div>
8282

83-
<div class="row">
84-
<div class="col-md-8">
85-
86-
<p>最初のDeploymentには、DockerコンテナにパッケージされたNode.jsアプリケーションを使用します。(まだNode.jsアプリケーションを作成してデプロイしていない場合、<a href="/ja/docs/tutorials/hello-minikube/">Hello Minikubeチュートリアル</a>の通りにやってみましょう。)</p>
87-
88-
<p>Deploymentが何であるかがわかったので、オンラインチュートリアルに行き、最初のアプリケーションをデプロイしましょう!</p>
89-
90-
</div>
91-
</div>
92-
<br>
93-
94-
<div class="row">
95-
<div class="col-md-12">
96-
<a class="btn btn-lg btn-success" href="/ja/docs/tutorials/kubernetes-basics/deploy-app/deploy-interactive/" role="button">対話型のチュートリアルを始める <span class="btn__next"></span></a>
97-
</div>
98-
</div>
99-
10083
</main>
10184

10285
</div>

0 commit comments

Comments
 (0)