Skip to content

Commit 1544bd7

Browse files
carloryclaude
andcommitted
Merge upstream/dev-1.36 into follow-up-kk-135676
Resolve merge conflict in labels-annotations-taints/_index.md by keeping both CSI annotations (from this branch) and deployment annotations (from upstream) in alphabetical order. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2 parents 4ad3801 + 06f2285 commit 1544bd7

File tree

509 files changed

+25259
-6112
lines changed

Some content is hidden

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

509 files changed

+25259
-6112
lines changed

OWNERS_ALIASES

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@ aliases:
22
sig-docs-blog-owners: # Approvers for blog content
33
- lmktfy
44
- graz-dev
5-
- mrbobbytables
65
- natalisucks
76
- nate-double-u
87
sig-docs-blog-reviewers: # Reviewers for blog content
98
- Gauravpadam
109
- graz-dev
1110
- lmktfy
12-
- mrbobbytables
1311
- natalisucks
1412
- nate-double-u
1513
sig-docs-website-owners: # Admins for overall website
@@ -25,6 +23,7 @@ aliases:
2523
- tengqm
2624
sig-docs-localization-owners: # Admins for localization content
2725
- a-mccarthy
26+
- dipesh-rawat
2827
- divya-mohan0209
2928
- natalisucks
3029
- nate-double-u
@@ -34,6 +33,7 @@ aliases:
3433
- tengqm
3534
sig-docs-localization-reviewers: # PR reviews for localization changes
3635
- a-mccarthy
36+
- dipesh-rawat
3737
- divya-mohan0209
3838
- natalisucks
3939
- nate-double-u
@@ -66,8 +66,8 @@ aliases:
6666
- reylejano
6767
- salaxander
6868
- SayakMukhopadhyay
69+
- sayanchowdhury # RT 1.36 Docs Lead
6970
- tengqm
70-
- Urvashi0109 # RT 1.35 Doc Lead
7171
sig-docs-en-reviews: # PR reviews for English content
7272
- dipesh-rawat
7373
- divya-mohan0209
@@ -86,13 +86,11 @@ aliases:
8686
- electrocucaracha
8787
- krol3
8888
- raelga
89-
- ramrodo
9089
sig-docs-es-reviews: # PR reviews for Spanish content
9190
- electrocucaracha
9291
- jossemarGT
9392
- krol3
9493
- raelga
95-
- ramrodo
9694
sig-docs-fr-owners: # Admins for French content
9795
- perriea
9896
- rekcah78
@@ -153,15 +151,18 @@ aliases:
153151
- yoonian
154152
- ysyukr
155153
sig-docs-ko-reviews: # PR reviews for Korean content
154+
- developowl
156155
- gochist
157156
- ianychoi
158157
- jihoon-seo
159158
- jmyung
160159
- jongwooo
161160
- seokho-son
161+
- wonyongg
162162
- yoonian
163163
- ysyukr
164164
sig-docs-leads: # Website chairs and tech leads
165+
- dipesh-rawat
165166
- divya-mohan0209
166167
- katcosgrove
167168
- natalisucks
@@ -200,6 +201,7 @@ aliases:
200201
- jcjesus
201202
- mrerlison
202203
- stormqueen1990
204+
- paulofponciano
203205
sig-docs-vi-owners: # Admins for Vietnamese content
204206
- truongnh1992
205207
- khanhtc1202

README.md

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -141,45 +141,8 @@ To update the reference pages for a new Kubernetes release follow these steps:
141141

142142
## Troubleshooting
143143

144-
### error: failed to transform resource: TOCSS: failed to transform "scss/main.scss" (text/x-scss): this feature is not available in your current Hugo version
145-
146-
Hugo is shipped in two set of binaries for technical reasons. The current website runs based on the **Hugo Extended** version only. In the [release page](https://github.com/gohugoio/hugo/releases) look for archives with `extended` in the name. To confirm, run `hugo version` and look for the word `extended`.
147-
148-
### Troubleshooting macOS for too many open files
149-
150-
If you run `make serve` on macOS and receive the following error:
151-
152-
```bash
153-
ERROR 2020/08/01 19:09:18 Error: listen tcp 127.0.0.1:1313: socket: too many open files
154-
make: *** [serve] Error 1
155-
```
156-
157-
Try checking the current limit for open files:
158-
159-
`launchctl limit maxfiles`
160-
161-
Then run the following commands (adapted from <https://gist.github.com/tombigel/d503800a282fcadbee14b537735d202c>):
162-
163-
```shell
164-
#!/bin/sh
165-
166-
# These are the original gist links, linking to my gists now.
167-
# curl -O https://gist.githubusercontent.com/a2ikm/761c2ab02b7b3935679e55af5d81786a/raw/ab644cb92f216c019a2f032bbf25e258b01d87f9/limit.maxfiles.plist
168-
# curl -O https://gist.githubusercontent.com/a2ikm/761c2ab02b7b3935679e55af5d81786a/raw/ab644cb92f216c019a2f032bbf25e258b01d87f9/limit.maxproc.plist
169-
170-
curl -O https://gist.githubusercontent.com/tombigel/d503800a282fcadbee14b537735d202c/raw/ed73cacf82906fdde59976a0c8248cce8b44f906/limit.maxfiles.plist
171-
curl -O https://gist.githubusercontent.com/tombigel/d503800a282fcadbee14b537735d202c/raw/ed73cacf82906fdde59976a0c8248cce8b44f906/limit.maxproc.plist
172-
173-
sudo mv limit.maxfiles.plist /Library/LaunchDaemons
174-
sudo mv limit.maxproc.plist /Library/LaunchDaemons
175-
176-
sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist
177-
sudo chown root:wheel /Library/LaunchDaemons/limit.maxproc.plist
178-
179-
sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
180-
```
181-
182-
This works for Catalina as well as Mojave macOS.
144+
If you experience any issues with running website locally, please refer
145+
to the [Troubleshooting section](https://kubernetes.io/docs/contribute/new-content/preview-locally/#troubleshooting) of the contributing documentation.
183146

184147
## Get involved with SIG Docs
185148

SECURITY_CONTACTS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE
1111
# INSTRUCTIONS AT https://kubernetes.io/security/
1212

13+
dipesh-rawat
1314
divya-mohan0209
1415
katcosgrove
1516
lmktfy

assets/js/custom-search.js

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
1-
document.querySelector('html').classList.add('search');
2-
3-
document.addEventListener('DOMContentLoaded', function() {
4-
let searchTerm = new URLSearchParams(window.location.search).get('q');
5-
let fetchingElem = document.getElementById('bing-results-container');
6-
7-
if (!searchTerm) {
8-
if (fetchingElem) fetchingElem.style.display = 'none';
9-
}
10-
});
11-
1+
// This is copied from google implementation in the Docsy search layout
122
window.renderGoogleSearchResults = () => {
13-
const cx = '013288817511911618469:elfqqbqldzg';
3+
const cx = '013288817511911618469:elfqqbqldzg'; // Todo: move this to a site variable or a build variable
144
const gcse = document.createElement('script');
155
gcse.type = 'text/javascript';
166
gcse.async = true;
@@ -22,10 +12,7 @@ window.renderGoogleSearchResults = () => {
2212
window.renderPageFindSearchResults = () => {
2313
let urlParams = new URLSearchParams(window.location.search);
2414
let searchTerm = urlParams.get("q") || "";
25-
let sidebarSearch = document.querySelector('#search-results-search');
26-
if (sidebarSearch) {
27-
sidebarSearch.remove();
28-
}
15+
2916
document.getElementById('search').style.display = 'block';
3017
let pagefind = new PagefindUI({ element: "#search", showImages: false });
3118
if (searchTerm) {
@@ -104,6 +91,7 @@ async function loadSearch() {
10491
}
10592
}
10693

94+
// The following is based on Docsy's assets/js/search.js
10795
(function ($) {
10896
"use strict";
10997

assets/scss/_custom.scss

Lines changed: 28 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,19 @@ footer .row > .order-3 { flex: 0 0 16.6667%; max-width: 16.6667%; }
420420
}
421421
}
422422

423+
section.section-feature#kubeweekly {
424+
background-color: $dark-bg-color-2;
425+
color: $dark-text-color-1;
426+
427+
.kubeweekly-inner form p {
428+
color: $white;
429+
}
430+
431+
a.kubeweekly-signup, a.kubeweekly-signup:hover {
432+
color: $white;
433+
}
434+
}
435+
423436
.search-bar {
424437
background-color: #d3d3d3;
425438
color: #ffffff;
@@ -445,11 +458,22 @@ footer .row > .order-3 { flex: 0 0 16.6667%; max-width: 16.6667%; }
445458
}
446459
}
447460

461+
@media (prefers-color-scheme: dark) {
462+
.td-main .td-search__input.form-control.dark-theme-focus {
463+
&, &::placeholder {
464+
background-color: #d3d3d3;
465+
}
466+
}
467+
.td-search__input.form-control.dark-theme-focus:focus {
468+
color: #222;
469+
}
470+
}
471+
448472
.td-home section#video {
449473
display: block;
450474
clear: both;
451475
min-height: 24rem;
452-
}
476+
}
453477

454478

455479
.td-home section#video.section-with-bgimage {
@@ -471,7 +495,7 @@ footer .row > .order-3 { flex: 0 0 16.6667%; max-width: 16.6667%; }
471495
button:dir(rtl)::after {
472496
content: " ▶︎";
473497
}
474-
498+
475499
h2, h3, h4, h5, h6, p {
476500
visibility: hidden; // the background has the same works
477501
font-size: inherit;
@@ -485,7 +509,7 @@ footer .row > .order-3 { flex: 0 0 16.6667%; max-width: 16.6667%; }
485509
.video-text-optional {
486510
padding: 0.5rem;
487511
padding-top: 40%;
488-
width: 100%;
512+
width: 100%;
489513
}
490514
button {
491515
min-width: calc(min(90vw,20rem));
@@ -1820,100 +1844,6 @@ div.alert > em.javascript-required {
18201844
background: #326de6;
18211845
}
18221846

1823-
1824-
// Adjust Search-bar search-icon
1825-
.search-bar {
1826-
display: flex;
1827-
align-items: center;
1828-
background-color: #fff;
1829-
border: 1px solid #4c4c4c;
1830-
border-radius: 20px;
1831-
vertical-align: middle;
1832-
flex-grow: 1;
1833-
overflow-x: hidden;
1834-
width: auto;
1835-
1836-
&:focus-within {
1837-
outline: 1.5px solid rgba(47, 135, 223, 0.7);
1838-
border: 1px solid rgba(47, 135, 223, 0.7);
1839-
}
1840-
}
1841-
1842-
.search-bar i.search-icon {
1843-
padding: .5em .5em .5em .75em;
1844-
opacity: .75;
1845-
}
1846-
1847-
.search-input {
1848-
flex: 1;
1849-
border: none;
1850-
outline: none;
1851-
padding: .5em 0 .5em 0;
1852-
}
1853-
1854-
// PageFind Styles
1855-
1856-
#search .pagefind-ui form input {
1857-
background-color: #fff;
1858-
border: 1px solid #4c4c4c;
1859-
border-radius: 20px;
1860-
overflow-x: hidden;
1861-
width: auto;
1862-
padding: 6px 10px !important;
1863-
margin: 20px 10px 20px 0;
1864-
1865-
&:focus-within {
1866-
outline: 1.5px solid rgba(47, 135, 223, 0.7);
1867-
border: 1px solid rgba(47, 135, 223, 0.7);
1868-
}
1869-
}
1870-
1871-
#search .pagefind-ui ol.pagefind-ui__results {
1872-
padding-left: 0;
1873-
}
1874-
1875-
#search .pagefind-ui .pagefind-ui__result-nested {
1876-
padding-left: 2em;
1877-
}
1878-
1879-
#search .pagefind-ui.pagefind-ui__result-nested::before {
1880-
content: "\2937 ";
1881-
color: $primary;
1882-
}
1883-
1884-
#search .pagefind-ui ol > li {
1885-
list-style-type: none;
1886-
border-top: 1.5px solid rgba(47, 135, 223, 0.7);
1887-
padding: 10px;
1888-
}
1889-
1890-
#search .pagefind-ui button {
1891-
color: #fff;
1892-
background-color: $primary;
1893-
border-radius: 0.2em;
1894-
border: 0.1rem solid $medium-grey;
1895-
padding: 0.3em;
1896-
}
1897-
1898-
#search .pagefind-ui__result-tags {
1899-
font-size: 14px;
1900-
font-weight: 400;
1901-
}
1902-
1903-
#search a.pagefind-ui__result-link {
1904-
font-weight: 700;
1905-
font-size: 1.15rem;
1906-
}
1907-
1908-
body.td-search {
1909-
width: 100%; // avoid confusion with other .td-search elements that have a width set
1910-
1911-
#search {
1912-
margin-top: 1rem;
1913-
margin-bottom: 3rem;
1914-
}
1915-
}
1916-
19171847
/* CSS for 'figure' full-screen display */
19181848

19191849
/* Define styles for full-screen overlay */
@@ -1991,7 +1921,7 @@ body.td-home section.case-studies {
19911921
text-align: center;
19921922
width: clamp(6rem, 20%, 50vw);
19931923
picture, picture img {
1994-
height: 4.8rem;
1924+
height: 4.8rem;
19951925
text-align: center;
19961926
}
19971927
> a {

0 commit comments

Comments
 (0)