Skip to content

Commit 207d496

Browse files
authored
Merge pull request #51624 from Urvashi0109/merged-main-dev-1.34
Merged main dev 1.34
2 parents f2d62b9 + d49bcfe commit 207d496

File tree

84 files changed

+3647
-1019
lines changed

Some content is hidden

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

84 files changed

+3647
-1019
lines changed

OWNERS_ALIASES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
aliases:
22
sig-docs-blog-owners: # Approvers for blog content
33
- lmktfy
4+
- graz-dev
45
- mrbobbytables
56
- natalisucks
67
- nate-double-u
78
sig-docs-blog-reviewers: # Reviewers for blog content
89
- Gauravpadam
10+
- graz-dev
911
- lmktfy
1012
- mrbobbytables
1113
- natalisucks

assets/js/sidebar-tree.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
let splitInstance = null;
2+
3+
function enableSplitter(mediaQuery) {
4+
if (mediaQuery.matches) {
5+
if (!splitInstance) {
6+
splitInstance = Split(["#sidebarnav", "#maindoc"], {
7+
sizes: [20, 80],
8+
minSize: 100,
9+
});
10+
}
11+
} else {
12+
if (splitInstance) {
13+
splitInstance.destroy();
14+
splitInstance = null;
15+
}
16+
}
17+
}
18+
19+
const screenWidthMediaQuery = window.matchMedia("(min-width: 768px)");
20+
21+
const eleNav = document.getElementById("sidebarnav");
22+
if (eleNav !== null) {
23+
enableSplitter(screenWidthMediaQuery);
24+
screenWidthMediaQuery.addListener(enableSplitter);
25+
}

assets/scss/_custom.scss

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -50,35 +50,6 @@ body {
5050
}
5151
}
5252

53-
/* Gutter for sidebar splitter */
54-
.gutter {
55-
background-color: #eee;
56-
background-repeat: no-repeat;
57-
background-position: 50%;
58-
}
59-
60-
.gutter.gutter-horizontal {
61-
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAeCAYAAADkftS9AAAAIklEQVQoU2M4c+bMfxAGAgYYmwGrIIiDjrELjpo5aiZeMwF+yNnOs5KSvgAAAABJRU5ErkJggg==');
62-
cursor: col-resize;
63-
}
64-
65-
#sidebarnav,
66-
#maindoc {
67-
max-width: 100%;
68-
}
69-
70-
#maindoc {
71-
overflow-wrap: break-word;
72-
}
73-
74-
@media (max-width: 768px) {
75-
#sidebarnav {
76-
padding-left: 15px;
77-
padding-right: 15px;
78-
}
79-
80-
}
81-
8253
/* Complex table layout support */
8354

8455
.td-content, body.td-content {
@@ -1381,42 +1352,6 @@ body.cid-code-of-conduct main {
13811352
}
13821353
}
13831354

1384-
// search & sidebar
1385-
.td-sidebar {
1386-
@media only screen and (min-width: 768px) {
1387-
padding-top: 1.5rem !important;
1388-
1389-
.td-sidebar__inner {
1390-
top: 8.5rem;
1391-
1392-
@media only screen and (min-width: 1075px) {
1393-
top: 6.5rem;
1394-
}
1395-
}
1396-
}
1397-
}
1398-
1399-
.td-sidebar-nav {
1400-
& > .td-sidebar-nav__section {
1401-
padding-top: .5rem;
1402-
padding-left: 1.5rem;
1403-
}
1404-
}
1405-
1406-
.td-sidebar__inner {
1407-
form.td-sidebar__search {
1408-
1409-
.td-sidebar__toggle {
1410-
&:hover {
1411-
color: #000000;
1412-
}
1413-
1414-
color: $primary;
1415-
margin: 1rem;
1416-
}
1417-
}
1418-
}
1419-
14201355
.no-underline {
14211356
text-decoration: none !important;
14221357
}
@@ -1425,16 +1360,6 @@ body.cid-code-of-conduct main {
14251360
display: none !important;
14261361
}
14271362

1428-
.td-sidebar-link__page {
1429-
&#m-docs-search {
1430-
display: none;
1431-
}
1432-
1433-
&#m-docs-test {
1434-
display: none;
1435-
}
1436-
}
1437-
14381363
//Tutorials
14391364
main.content {
14401365
position: inherit;

assets/scss/_k8s_sidebar-tree.scss

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
.td-sidebar-nav {
2+
.td-sidebar-link.tree-root {
3+
display: none;
4+
}
5+
6+
#navbarDropdownMenuLink {
7+
display: none;
8+
}
9+
}
10+
11+
/* Gutter for sidebar splitter */
12+
.gutter {
13+
background-color: #eee;
14+
background-repeat: no-repeat;
15+
background-position: 50%;
16+
17+
&.gutter-horizontal {
18+
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAeCAYAAADkftS9AAAAIklEQVQoU2M4c+bMfxAGAgYYmwGrIIiDjrELjpo5aiZeMwF+yNnOs5KSvgAAAABJRU5ErkJggg==');
19+
cursor: col-resize;
20+
}
21+
}
22+
23+
#sidebarnav,
24+
#maindoc {
25+
max-width: 100%;
26+
}
27+
28+
#maindoc {
29+
overflow-wrap: break-word;
30+
}
31+
32+
@include media-breakpoint-down(sm) {
33+
#sidebarnav {
34+
padding-left: 15px;
35+
padding-right: 15px;
36+
}
37+
}
38+
39+
// search & sidebar
40+
.td-sidebar {
41+
@include media-breakpoint-up(sm){
42+
padding-top: 1.5rem !important;
43+
44+
.td-sidebar__inner {
45+
top: 8.5rem;
46+
47+
@media only screen and (min-width: 1075px) {
48+
top: 6.5rem;
49+
}
50+
}
51+
}
52+
}
53+
54+
.td-sidebar-nav {
55+
& > .td-sidebar-nav__section {
56+
padding-top: .5rem;
57+
padding-left: 1.5rem;
58+
}
59+
}
60+
61+
.td-sidebar__inner form.td-sidebar__search {
62+
.td-sidebar__toggle {
63+
&:hover {
64+
color: #000000;
65+
}
66+
67+
color: $primary;
68+
}
69+
}
70+
71+
.td-sidebar-link__page {
72+
&#m-docs-test {
73+
display: none;
74+
}
75+
}

assets/scss/_styles_project.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Add styles or import other files. */
99
// Base styles
1010
@import "k8s_community";
1111
@import "k8s_nav";
12+
@import "k8s_sidebar-tree";
1213

1314
//Media queries
1415
@import "base";

content/bn/_index.html

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,11 @@
4343
<h2>150+ মাইক্রোসার্ভিস কুবারনেটিসে স্থানান্তরিত করার চ্যালেঞ্জ</h2>
4444
<p>সারাহ ওয়েলস দ্বারা, অপারেশনস এবং নির্ভরযোগ্যতার জন্য প্রযুক্তিগত পরিচালক, ফিনান্সিয়াল টাইমস</p>
4545
<button id="desktopShowVideoButton" onclick="kub.showVideo()">ভিডিও দেখুন</button>
46-
<br>
47-
<br>
48-
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/" button id="desktopKCButton">12-15 নভেম্বর KubeCon + CloudNativeCon North America তে যোগ দিন</a>
49-
<br>
50-
<br>
51-
<br>
52-
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-india/" button id="desktopKCButton">11-12 ডিসেম্বর KubeCon + CloudNativeCon India তে যোগ দিন</a>
53-
<br>
54-
<br>
55-
<br>
56-
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/" button id="desktopKCButton">1-4 এপ্রিল, 2025-এ KubeCon + CloudNativeCon Europe তে যোগ দিন</a>
46+
47+
<h3>আসন্ন KubeCon + CloudNativeCon ইভেন্টগুলিতে যোগ দিন</h3>
48+
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-india/" class="desktopKCButton"><strong>India</strong> (Hyderabad, Aug 6-7)</a>
49+
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/" class="desktopKCButton"><strong>North America</strong> (Atlanta, Nov 10-13)</a>
50+
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe-2026/" class="desktopKCButton"><strong>Europe</strong> (Amsterdam, Mar 23-26, 2026)</a>
5751
</div>
5852
<div id="videoPlayer">
5953
<iframe data-url="https://www.youtube.com/embed/H06qrNmGqyE?autoplay=1" frameborder="0" allowfullscreen></iframe>
@@ -64,3 +58,5 @@ <h2>150+ মাইক্রোসার্ভিস কুবারনেটি
6458
{{< blocks/kubernetes-features >}}
6559

6660
{{< blocks/case-studies >}}
61+
62+
{{< kubeweekly id="kubeweekly" >}}

content/bn/examples/application/mysql/mysql-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
app: mysql
2626
spec:
2727
containers:
28-
- image: mysql:5.6
28+
- image: mysql:9
2929
name: mysql
3030
env:
3131
# Use secret in real usage

content/en/blog/_posts/2019-01-15-container-storage-interface-ga.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The GA milestone indicates that Kubernetes users may depend on the feature and i
1717

1818
Although prior to CSI Kubernetes provided a powerful volume plugin system, it was challenging to add support for new volume plugins to Kubernetes: volume plugins were “in-tree” meaning their code was part of the core Kubernetes code and shipped with the core Kubernetes binaries—vendors wanting to add support for their storage system to Kubernetes (or even fix a bug in an existing volume plugin) were forced to align with the Kubernetes release process. In addition, third-party storage code caused reliability and security issues in core Kubernetes binaries and the code was often difficult (and in some cases impossible) for Kubernetes maintainers to test and maintain.
1919

20-
CSI was developed as a standard for exposing arbitrary block and file storage storage systems to containerized workloads on Container Orchestration Systems (COs) like Kubernetes. With the adoption of the Container Storage Interface, the Kubernetes volume layer becomes truly extensible. Using CSI, third-party storage providers can write and deploy plugins exposing new storage systems in Kubernetes without ever having to touch the core Kubernetes code. This gives Kubernetes users more options for storage and makes the system more secure and reliable.
20+
CSI was developed as a standard for exposing arbitrary block and file storage systems to containerized workloads on Container Orchestration Systems (COs) like Kubernetes. With the adoption of the Container Storage Interface, the Kubernetes volume layer becomes truly extensible. Using CSI, third-party storage providers can write and deploy plugins exposing new storage systems in Kubernetes without ever having to touch the core Kubernetes code. This gives Kubernetes users more options for storage and makes the system more secure and reliable.
2121

2222
## What’s new?
2323

content/en/blog/_posts/XXXXX-pqc-in-k8s.md renamed to content/en/blog/_posts/2025-07-18-pqc-in-k8s.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
layout: blog
33
title: "Post-Quantum Cryptography in Kubernetes"
44
slug: pqc-in-k8s
5-
date: XXXX
6-
canonicalUrl: XXXX
5+
date: 2025-07-18
6+
canonicalUrl: https://www.kubernetes.dev/blog/2025/07/18/pqc-in-k8s/
77
author: "Fabian Kammel (ControlPlane)"
8-
draft: true
8+
draft: false
99
---
1010

1111
The world of cryptography is on the cusp of a major shift with the advent of

content/en/docs/concepts/architecture/nodes.md

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -296,63 +296,6 @@ the kubelet can use topology hints when making resource assignment decisions.
296296
See [Control Topology Management Policies on a Node](/docs/tasks/administer-cluster/topology-manager/)
297297
for more information.
298298

299-
## Swap memory management {#swap-memory}
300-
301-
{{< feature-state feature_gate_name="NodeSwap" >}}
302-
303-
To enable swap on a node, the `NodeSwap` feature gate must be enabled on
304-
the kubelet (default is true), and the `--fail-swap-on` command line flag or `failSwapOn`
305-
[configuration setting](/docs/reference/config-api/kubelet-config.v1beta1/)
306-
must be set to false.
307-
To allow Pods to utilize swap, `swapBehavior` should not be set to `NoSwap` (which is the default behavior) in the kubelet config.
308-
309-
{{< warning >}}
310-
When the memory swap feature is turned on, Kubernetes data such as the content
311-
of Secret objects that were written to tmpfs now could be swapped to disk.
312-
{{< /warning >}}
313-
314-
A user can also optionally configure `memorySwap.swapBehavior` in order to
315-
specify how a node will use swap memory. For example,
316-
317-
```yaml
318-
memorySwap:
319-
swapBehavior: LimitedSwap
320-
```
321-
322-
- `NoSwap` (default): Kubernetes workloads will not use swap.
323-
- `LimitedSwap`: The utilization of swap memory by Kubernetes workloads is subject to limitations.
324-
Only Pods of Burstable QoS are permitted to employ swap.
325-
326-
If configuration for `memorySwap` is not specified and the feature gate is
327-
enabled, by default the kubelet will apply the same behaviour as the
328-
`NoSwap` setting.
329-
330-
With `LimitedSwap`, Pods that do not fall under the Burstable QoS classification (i.e.
331-
`BestEffort`/`Guaranteed` Qos Pods) are prohibited from utilizing swap memory.
332-
To maintain the aforementioned security and node health guarantees, these Pods
333-
are not permitted to use swap memory when `LimitedSwap` is in effect.
334-
335-
Prior to detailing the calculation of the swap limit, it is necessary to define the following terms:
336-
337-
* `nodeTotalMemory`: The total amount of physical memory available on the node.
338-
* `totalPodsSwapAvailable`: The total amount of swap memory on the node that is available for use by Pods
339-
(some swap memory may be reserved for system use).
340-
* `containerMemoryRequest`: The container's memory request.
341-
342-
Swap limitation is configured as:
343-
`(containerMemoryRequest / nodeTotalMemory) * totalPodsSwapAvailable`.
344-
345-
It is important to note that, for containers within Burstable QoS Pods, it is possible to
346-
opt-out of swap usage by specifying memory requests that are equal to memory limits.
347-
Containers configured in this manner will not have access to swap memory.
348-
349-
Swap is supported only with **cgroup v2**, cgroup v1 is not supported.
350-
351-
For more information, and to assist with testing and provide feedback, please
352-
see the blog-post about [Kubernetes 1.28: NodeSwap graduates to Beta1](/blog/2023/08/24/swap-linux-beta/),
353-
[KEP-2400](https://github.com/kubernetes/enhancements/issues/4128) and its
354-
[design proposal](https://github.com/kubernetes/enhancements/blob/master/keps/sig-node/2400-node-swap/README.md).
355-
356299
## {{% heading "whatsnext" %}}
357300

358301
Learn more about the following:

0 commit comments

Comments
 (0)