Skip to content

Commit efb59b0

Browse files
authored
Merge branch 'kubernetes:main' into issue-51704
2 parents fa9151e + edc3e60 commit efb59b0

File tree

27 files changed

+665
-282
lines changed

27 files changed

+665
-282
lines changed
129 KB
Loading

assets/scss/_base.scss

Lines changed: 16 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -312,21 +312,15 @@ $ocean-nodes-h3-margin-bottom: 30px;
312312

313313
// Video thingy
314314
#video {
315-
width: 100%;
315+
width: 100vw;
316316
position: relative;
317317
overflow: hidden;
318-
background-position: center center;
319-
background-size: cover;
320318

321-
& > .light-text {
322-
display: none;
323-
// position: absolute;
324-
// top: 50%;
325-
// left: 75%;
326-
width: 500px;
319+
& > .video-text-optional {
320+
width: 30vw;
327321
padding-top: 2rem;
328-
// transform: translate(-50%, -50%);
329322
color: white;
323+
margin-right: 70vw;
330324
}
331325

332326
h2 {
@@ -366,59 +360,22 @@ $ocean-nodes-h3-margin-bottom: 30px;
366360
}
367361

368362
#desktopShowVideoButton {
369-
position: relative;
370-
font-size: 24px;
363+
font-size: 1.8rem;
371364
background-color: white;
372365
border-radius: 8px;
373-
color: $primary;
374-
padding: 15px 30px 15px 80px;
375-
margin-bottom: 35px;
376-
377-
&:before {
378-
content: "";
379-
position: absolute;
380-
@include pureCenter(40px);
381-
width: 0;
382-
height: 0;
383-
border-style: solid;
384-
border-width: 10px 0 10px 20px;
385-
border-color: transparent transparent transparent $primary;
386-
}
366+
color: $secondary;
367+
padding: 1.5rem;
368+
margin-bottom: 1rem;
387369

388370
&:hover::before {
389371
border-color: transparent transparent transparent $dark-grey;
390372
}
391373
}
392374

393375
#desktopShowVideoButton:hover{
394-
color: $dark-grey;
376+
color: $primary;
395377
transition: 150ms;
396378
}
397-
398-
#mobileShowVideoButton {
399-
@include pureCenter;
400-
width: 80px;
401-
height: 80px;
402-
border-radius: 50%;
403-
background-color: transparent;
404-
border: 5px solid rgba(255, 255, 255, 0.2);
405-
overflow: visible;
406-
407-
&:after {
408-
@include pureCenter;
409-
left: 40px;
410-
content: "";
411-
width: 0;
412-
height: 0;
413-
border-style: solid;
414-
border-width: 20px 0 20px 30px;
415-
border-color: transparent transparent transparent #ffffff;
416-
}
417-
}
418-
}
419-
420-
#video:has(#desktopKCButton) {
421-
height: 580px;
422379
}
423380

424381
#videoPlayer {
@@ -427,8 +384,13 @@ $ocean-nodes-h3-margin-bottom: 30px;
427384
display: none;
428385

429386
iframe {
430-
@include pureCenter;
431-
@include maintain-aspect-ratio;
387+
width: 100%;
388+
max-height: 100vh;
389+
aspect-ratio: 16 / 9;
390+
position: fixed;
391+
top: 50%;
392+
left:50%;
393+
transform: translate(-50%, -50%);
432394
}
433395

434396
#closeButton {

assets/scss/_custom.scss

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,31 @@ body.td-home main[role="main"] > section:first-of-type .content p:first-child {
9696
}
9797
}
9898

99+
section#upcoming-events {
100+
color: $white;
101+
background: $secondary;
102+
text-align: center;
103+
padding-top: 4rem;
104+
padding-bottom: 2rem;
105+
h2, h3, h4, h5, h6 {
106+
font-weight: bold;
107+
}
108+
> div {
109+
margin: 1.5em;
110+
padding: 0.5em 0 0.5em 0;
111+
a, a:hover {
112+
color: $white;
113+
background: transparent;
114+
font-size: 1.5rem;
115+
text-decoration: underline;
116+
strong {
117+
color: $white;
118+
background: transparent;
119+
}
120+
}
121+
}
122+
}
123+
99124
.section-feature#kubeweekly {
100125

101126
a.kubeweekly-signup, a.kubeweekly-signup:hover {
@@ -400,6 +425,68 @@ footer {
400425
}
401426
}
402427

428+
.td-home section#video {
429+
display: block;
430+
clear: both;
431+
min-height: 24rem;
432+
}
433+
434+
435+
.td-home section#video.section-with-bgimage {
436+
background: #13110f; // match video
437+
background-position: 65% center, left center;
438+
background-repeat: no-repeat, repeat;
439+
background-size: auto 100%, cover;
440+
.video-text-optional {
441+
padding-left: calc(max(10vw, 5rem));
442+
443+
button::before, button::after {
444+
color: $secondary;
445+
padding-left: 0.5rem;
446+
padding-right: 0.5rem;
447+
}
448+
button:dir(ltr)::before {
449+
content: "▶︎ ";
450+
}
451+
button:dir(rtl)::after {
452+
content: " ▶︎";
453+
}
454+
455+
h2, h3, h4, h5, h6, p {
456+
visibility: hidden; // the background has the same works
457+
font-size: inherit;
458+
}
459+
}
460+
}
461+
462+
@media only screen and (max-width: 1024px) {
463+
.td-home section#video.section-with-bgimage {
464+
background-size: contain, cover;
465+
.video-text-optional {
466+
padding: 0.5rem;
467+
padding-top: 40%;
468+
width: 100%;
469+
}
470+
button {
471+
min-width: calc(min(90vw,20rem));
472+
font-size: 1.2rem;
473+
margin-bottom: 3em;
474+
}
475+
}
476+
}
477+
478+
@media (max-width: 10cm) {
479+
.td-home section#video {
480+
display: none;
481+
}
482+
}
483+
484+
@media only screen and (max-width: 640px) and (orientation: portrait) {
485+
.td-home section#video {
486+
display: none;
487+
}
488+
}
489+
403490
/* COMMUNITY */
404491

405492
body.cid-community {

assets/scss/_reset.scss

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,6 @@
2929
height: 100vh;
3030
}
3131

32-
@mixin pureCenter($left: 50%, $top: 50%) {
33-
position: absolute;
34-
top: $top;
35-
left: $left;
36-
transform: translate(-50%, -50%);
37-
}
38-
3932
@mixin maintain-aspect-ratio(
4033
$width-factor: 16,
4134
$height-factor: 9,

assets/scss/_tablet.scss

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -118,21 +118,6 @@ $vendor-strip-font-size: 16px;
118118
}
119119
}
120120

121-
#video {
122-
display: block;
123-
124-
& > .light-text {
125-
display: block;
126-
float: right;
127-
text-align: left;
128-
margin: 0 5% 15px 0;
129-
}
130-
131-
&:dir(rtl) > .light-text {
132-
text-align: right;
133-
}
134-
}
135-
136121
#mobileShowVideoButton {
137122
display: none;
138123
}

content/en/_index.html

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,27 @@
3838

3939
{{< /blocks/section >}}
4040

41-
{{< blocks/section id="video" background-image="kub_video_banner_homepage" >}}
42-
<div class="light-text">
43-
<h2>The Challenges of Migrating 150+ Microservices to Kubernetes</h2>
44-
<p>By Sarah Wells, Technical Director for Operations and Reliability, Financial Times</p>
45-
<button id="desktopShowVideoButton" onclick="kub.showVideo()">Watch Video</button>
46-
47-
<h3>Attend upcoming KubeCon + CloudNativeCon events</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>
41+
{{< blocks/section id="video" background-image="video_banner_homepage_XNZvGHlpJ_4" >}}
42+
<div class="video-text-optional">
43+
<h2>The Absolute Beginner's Guide To Cloud Native</h2>
44+
<p class="presenter-byline">by Kyle Penfound, Dagger &amp; Cortney Nickerson, Kubeshop</p>
45+
<button id="desktopShowVideoButton" onclick="kub.showVideo()">Watch Video</button>
5146
</div>
5247
<div id="videoPlayer">
53-
<iframe data-url="https://www.youtube.com/embed/H06qrNmGqyE?autoplay=1" frameborder="0" allowfullscreen></iframe>
48+
<iframe data-url="https://www.youtube.com/embed/XNZvGHlpJ_4?autoplay=1" frameborder="0" allowfullscreen></iframe>
5449
<button id="closeButton"></button>
5550
</div>
5651
{{< /blocks/section >}}
52+
{{< blocks/section id="upcoming-events" >}}
53+
<h2>Attend upcoming KubeCon + CloudNativeCon events</h3>
54+
<!-- TODO: change this to a shortcode that auto-updates from a schedule -->
55+
<div>
56+
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/" class="desktopKCButton"><strong>North America</strong> (Atlanta, Nov 10-13)</a>
57+
</div>
58+
<div>
59+
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe-2026/" class="desktopKCButton"><strong>Europe</strong> (Amsterdam, Mar 23-26, 2026)</a>
60+
</div>
61+
{{< /blocks/section >}}
5762

5863
{{< blocks/kubernetes-features >}}
5964

content/en/blog/_posts/2025-08-27-Kubernetes-v1-34-Release/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ Explore upcoming Kubernetes and cloud native events, including KubeCon \+ CloudN
561561

562562
- [**KCD - Kubernetes Community Days: Porto**](https://community.cncf.io/events/details/cncf-kcd-porto-presents-kcd-porto-2025/): Nov 3, 2025 | Porto, Portugal
563563
- [**KubeCon + CloudNativeCon North America 2025**](https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/): Nov 10-13, 2025 | Atlanta, USA
564-
- [**KCD - Kubernetes Community Days: Hangzhou**](https://sessionize.com/kcd-hangzhou-and-oicd-2025/): Nov 14, 2025 | Hangzhou, China
564+
- [**KCD - Kubernetes Community Days: Hangzhou**](https://sessionize.com/kcd-hangzhou-and-oicd-2025/): Nov 15, 2025 | Hangzhou, China
565565

566566
**December 2025**
567567

content/en/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ will be added to each container status, within the `.status` for each Pod. The `
194194
field
195195
reports health information for each device assigned to the container.
196196

197-
For a failed Pod, or or where you suspect a fault, you can use this status to understand whether
197+
For a failed Pod, or where you suspect a fault, you can use this status to understand whether
198198
the Pod behavior may be associated with device failure. For example, if an accelerator is reporting
199199
an over-temperature event, the `allocatedResourcesStatus` field may be able to report this.
200200

@@ -511,4 +511,4 @@ Here are some examples of device plugin implementations:
511511
* Learn about the [Topology Manager](/docs/tasks/administer-cluster/topology-manager/)
512512
* Read about using [hardware acceleration for TLS ingress](/blog/2019/04/24/hardware-accelerated-ssl/tls-termination-in-ingress-controllers-using-kubernetes-device-plugins-and-runtimeclass/)
513513
with Kubernetes
514-
* Read more about [Extended Resource allocation by DRA](/docs/concepts/scheduling-eviction/dynamic-resource-allocation/#extended-resource)
514+
* Read more about [Extended Resource allocation by DRA](/docs/concepts/scheduling-eviction/dynamic-resource-allocation/#extended-resource)

content/en/docs/concepts/scheduling-eviction/dynamic-resource-allocation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ users:
103103

104104
DRA uses the following Kubernetes API kinds to provide the core allocation
105105
functionality. All of these API kinds are included in the
106-
`resource.k8s.io/v1beta1`
106+
`resource.k8s.io/v1`
107107
{{< glossary_tooltip text="API group" term_id="api-group" >}}.
108108

109109
DeviceClass

content/en/docs/concepts/storage/volumes.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -317,9 +317,6 @@ You must configure FC SAN Zoning to allocate and mask those LUNs (volumes) to th
317317
beforehand so that Kubernetes hosts can access them.
318318
{{< /note >}}
319319

320-
See the [fibre channel example](https://github.com/kubernetes/examples/tree/master/staging/volumes/fibre_channel)
321-
for more details.
322-
323320
### gcePersistentDisk (deprecated) {#gcepersistentdisk}
324321

325322
In Kubernetes {{< skew currentVersion >}}, all operations for the in-tree `gcePersistentDisk` type
@@ -663,8 +660,6 @@ and then serve it in parallel from as many Pods as you need. Unfortunately,
663660
iSCSI volumes can only be mounted by a single consumer in read-write mode.
664661
Simultaneous writers are not allowed.
665662

666-
See the [iSCSI example](https://github.com/kubernetes/examples/tree/master/volumes/iscsi) for more details.
667-
668663
### local
669664

670665
A `local` volume represents a mounted local storage device such as a disk,
@@ -774,9 +769,6 @@ use [/etc/nfsmount.conf](https://man7.org/linux/man-pages/man5/nfsmount.conf.5.h
774769
You can also mount NFS volumes via PersistentVolumes which do allow you to set mount options.
775770
{{< /note >}}
776771

777-
See the [NFS example](https://github.com/kubernetes/examples/tree/master/staging/volumes/nfs)
778-
for an example of mounting NFS volumes with PersistentVolumes.
779-
780772
### persistentVolumeClaim {#persistentvolumeclaim}
781773

782774
A `persistentVolumeClaim` volume is used to mount a
@@ -825,8 +817,6 @@ Make sure you have an existing PortworxVolume with name `pxvol`
825817
before using it in the Pod.
826818
{{< /note >}}
827819

828-
For more details, see the
829-
[Portworx volume](https://github.com/kubernetes/examples/tree/master/staging/volumes/portworx/README.md) examples.
830820

831821
#### Portworx CSI migration
832822
{{< feature-state feature_gate_name="CSIMigrationPortworx" >}}

0 commit comments

Comments
 (0)