Skip to content

Commit 727ba4e

Browse files
authored
Merge pull request #30145 from jlbutler/merged-main-dev-1.23
Merged main dev 1.23
2 parents 0af4dd9 + 4e755b2 commit 727ba4e

File tree

403 files changed

+11254
-7492
lines changed

Some content is hidden

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

403 files changed

+11254
-7492
lines changed

.github/workflows/OWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
# When modifying this file, consider the security implications of
44
# allowing listed reviewers / approvals to modify or remove any
55
# configured GitHub Actions.
6+
#
7+
options:
8+
no_parent_owners: true
69

710
reviewers:
811
- sig-docs-leads

LICENSE

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ exhaustive, and do not form part of our licenses.
3333
material not subject to the license. This includes other CC-
3434
licensed material, or material used under an exception or
3535
limitation to copyright. More considerations for licensors:
36-
wiki.creativecommons.org/Considerations_for_licensors
36+
wiki.creativecommons.org/Considerations_for_licensors
3737

3838
Considerations for the public: By using one of our public
3939
licenses, a licensor grants the public permission to use the
@@ -48,9 +48,9 @@ exhaustive, and do not form part of our licenses.
4848
rights in the material. A licensor may make special requests,
4949
such as asking that all changes be marked or described.
5050
Although not required by our licenses, you are encouraged to
51-
respect those requests where reasonable. More_considerations
52-
for the public:
53-
wiki.creativecommons.org/Considerations_for_licensees
51+
respect those requests where reasonable. More considerations
52+
for the public:
53+
wiki.creativecommons.org/Considerations_for_licensees
5454

5555
=======================================================================
5656

@@ -378,7 +378,7 @@ Section 8 -- Interpretation.
378378
Creative Commons is not a party to its public
379379
licenses. Notwithstanding, Creative Commons may elect to apply one of
380380
its public licenses to material it publishes and in those instances
381-
will be considered the "Licensor." The text of the Creative Commons
381+
will be considered the Licensor. The text of the Creative Commons
382382
public licenses is dedicated to the public domain under the CC0 Public
383383
Domain Dedication. Except for the limited purpose of indicating that
384384
material is shared under a Creative Commons public license or as
@@ -393,3 +393,4 @@ the avoidance of doubt, this paragraph does not form part of the
393393
public licenses.
394394

395395
Creative Commons may be contacted at creativecommons.org.
396+

OWNERS_ALIASES

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ aliases:
1818
- annajung
1919
- bradtopol
2020
- celestehorgan
21+
- divya-mohan0209
2122
- jimangel
2223
- jlbutler
2324
- kbhawkey
@@ -31,6 +32,7 @@ aliases:
3132
- bradtopol
3233
- celestehorgan
3334
- daminisatya
35+
- divya-mohan0209
3436
- jimangel
3537
- kbhawkey
3638
- onlydole
@@ -79,6 +81,7 @@ aliases:
7981
- anubha-v-ardhan
8082
- divya-mohan0209
8183
- mittalyashu
84+
- verma-kunal
8285
sig-docs-id-owners: # Admins for Indonesian content
8386
- ariscahyadi
8487
- danninov
@@ -133,6 +136,7 @@ aliases:
133136
- yoonian
134137
- ysyukr
135138
sig-docs-leads: # Website chairs and tech leads
139+
- divya-mohan0209
136140
- jimangel
137141
- kbhawkey
138142
- onlydole

README-hi.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
## डॉक्स में योगदान देना
99

10-
आप अपने GitHub खाते में इस रिपॉजिटरी की एक copy बनाने के लिए स्क्रीन के ऊपरी-दाएँ क्षेत्र में **Fork** बटन पर क्लिक करें। इस copy को *Fork* कहा जाता है। अपने fork में कोई भी परिवर्तन करना चाहते हैं, और जब आप उन परिवर्तनों को हमारे पास भेजने के लिए तैयार हों, तो अपने fork पर जाएं और हमें इसके बारे में बताने के लिए एक नया pull request बनाएं।
10+
आप अपने GitHub खाते में इस रिपॉजिटरी की एक copy बनाने के लिए स्क्रीन के ऊपरी-दाएँ क्षेत्र में **Fork** बटन पर क्लिक करें। इस copy को *Fork* कहा जाता है। अपने fork में परिवर्तन करने के बाद जब आप उनको हमारे पास भेजने के लिए तैयार हों, तो अपने fork पर जाएं और हमें इसके बारे में बताने के लिए एक नया pull request बनाएं।
1111

1212
एक बार जब आपका pull request बन जाता है, तो एक कुबरनेट्स समीक्षक स्पष्ट, कार्रवाई योग्य प्रतिक्रिया प्रदान करने की जिम्मेदारी लेगा। pull request के मालिक के रूप में, **यह आपकी जिम्मेदारी है कि आप कुबरनेट्स समीक्षक द्वारा प्रदान की गई प्रतिक्रिया को संबोधित करने के लिए अपने pull request को संशोधित करें।**
1313

@@ -23,9 +23,12 @@
2323

2424
## `README.md`'s स्थानीयकरण कुबरनेट्स प्रलेखन
2525

26-
आप पर हिंदी स्थानीयकरण के maintainers तक पहुँच सकते हैं:
26+
आप हिंदी स्थानीयकरण के मैन्टेनरों तक पहुँच सकते हैं:
2727

28+
* Anubhav Vardhan ([Slack](https://kubernetes.slack.com/archives/D0261C0A3R8), [Twitter](https://twitter.com/anubha_v_ardhan), [GitHub](https://github.com/anubha-v-ardhan))
29+
* Divya Mohan ([Slack](https://kubernetes.slack.com/archives/D027R7BE804), [Twitter](https://twitter.com/Divya_Mohan02), [GitHub](https://github.com/divya-mohan0209))
2830
* Yashu Mittal ([Twitter](https://twitter.com/mittalyashu77), [GitHub](https://github.com/mittalyashu))
31+
2932
* [Slack channel](https://kubernetes.slack.com/messages/kubernetes-docs-hi)
3033

3134
## स्थानीय रूप से डॉकर का उपयोग करके साइट चलाना

SECURITY_CONTACTS

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

13+
divya-mohan0209
1314
jimangel
14-
sftim
15+
sftim

assets/scss/_custom.scss

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,11 +338,35 @@ main {
338338
border-left-color: #d9534f;
339339
}
340340

341+
341342
h1:first-of-type + blockquote.callout {
342343
margin-top: 1.5em;
343344
}
344345
}
345346

347+
// Special color for third party content disclaimers
348+
.alert.third-party-content { border-left-color: #222 };
349+
350+
// Highlight disclaimer when targeted as a fragment
351+
352+
#third-party-content-disclaimer {
353+
color: #000;
354+
background: #f8f9fa;
355+
transition: all 0.5s ease;
356+
}
357+
358+
@keyframes disclaimer-highlight {
359+
from { background: #f8f922; color: #000; }
360+
50% { background: #f8f944; color: #000; }
361+
to { background: #f8f9cb; color: #000; }
362+
}
363+
364+
#third-party-content-disclaimer:target {
365+
color: #000;
366+
animation: disclaimer-highlight 1.25s ease;
367+
background: #f8f9cb;
368+
}
369+
346370
.deprecation-warning {
347371
padding: 20px;
348372
margin: 20px 0;
@@ -354,6 +378,12 @@ body.td-home .deprecation-warning, body.td-blog .deprecation-warning, body.td-do
354378
border-radius: 3px;
355379
}
356380

381+
382+
.td-documentation .td-content > .highlight {
383+
max-width: initial;
384+
width: 100%;
385+
}
386+
357387
body.td-home #deprecation-warning {
358388
max-width: 1000px;
359389
margin-top: 2.5rem;
@@ -635,10 +665,59 @@ body.td-documentation {
635665
}
636666
}
637667

668+
// Match Docsy-imposed max width on text body
669+
@media (min-width: 1200px) {
670+
body.td-blog main .td-content > figure {
671+
max-width: 80%;
672+
}
673+
}
674+
638675
.td-content {
639676
table code {
640677
background-color: inherit !important;
641678
color: inherit !important;
642679
font-size: inherit !important;
643680
}
644681
}
682+
683+
/* Force size constraints on figures */
684+
figure {
685+
&.diagram-small img {
686+
max-height: clamp(20mm,12em,80vh);
687+
margin-left: auto;
688+
margin-right: auto;
689+
display: block;
690+
}
691+
&.diagram-medium img {
692+
max-height: clamp(25mm,20em,80vh);
693+
margin-left: auto;
694+
margin-right: auto;
695+
display: block;
696+
}
697+
&.diagram-large img {
698+
max-width: clamp(0vw, 95vw, 100%);
699+
max-height: calc(80vh - 8rem);
700+
}
701+
}
702+
703+
@media only screen and (min-width: 768px) {
704+
figure {
705+
&.diagram-small, &.diagram-medium {
706+
max-width: 80%;
707+
}
708+
&.diagram-large {
709+
max-width: 100%;
710+
width: 100%;
711+
}
712+
&.diagram-small img {
713+
max-width: clamp(30rem, 45ch, 100mm);
714+
}
715+
&.diagram-medium img {
716+
max-width: clamp(50rem, 20ch, 160mm);
717+
}
718+
&.diagram-large img {
719+
max-width: clamp(25vw, 95vw, 100%);
720+
max-height: calc(100vh - 10rem);
721+
}
722+
}
723+
}

cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ options:
88
substitution_option: ALLOW_LOOSE
99
steps:
1010
# It's fine to bump the tag to a recent version, as needed
11-
- name: "gcr.io/k8s-testimages/gcb-docker-gcloud:v20190906-745fed4"
11+
- name: "gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20210917-12df099d55"
1212
entrypoint: make
1313
env:
1414
- DOCKER_CLI_EXPERIMENTAL=enabled

config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ id = "UA-00000000-0"
123123
[params]
124124
copyright_k8s = "The Kubernetes Authors"
125125
copyright_linux = "Copyright © 2020 The Linux Foundation ®."
126+
126127
# privacy_policy = "https://policies.google.com/privacy"
127128

128129
# First one is picked as the Twitter card image if not set on page.

content/de/_index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ <h2>Die Herausforderungen bei der Migration von über 150 Microservices auf Kube
4242
<button id="desktopShowVideoButton" onclick="kub.showVideo()">Video ansehen</button>
4343
<br>
4444
<br>
45-
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/?utm_source=kubernetes.io&utm_medium=nav&utm_campaign=kccnceu20" button id="desktopKCButton">Besuche die KubeCon - 13-16 August 2020 in Amsterdam</a>
45+
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/?utm_source=kubernetes.io&utm_medium=nav&utm_campaign=kccncna21" button id="desktopKCButton">Besuche die KubeCon North America vom 11. bis 15. Oktober 2021</a>
4646
<br>
4747
<br>
4848
<br>
4949
<br>
50-
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/?utm_source=kubernetes.io&utm_medium=nav&utm_campaign=kccncna20" button id="desktopKCButton">Besuche die KubeCon - 17-20 November 2020 in Boston</a>
50+
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe-2022/?utm_source=kubernetes.io&utm_medium=nav&utm_campaign=kccnceu22" button id="desktopKCButton">Besuche die KubeCon Europe vom 17. bis 20. Mai 2022</a>
5151
</div>
5252
<div id="videoPlayer">
5353
<iframe data-url="https://www.youtube.com/embed/H06qrNmGqyE?autoplay=1" frameborder="0" allowfullscreen></iframe>

0 commit comments

Comments
 (0)