Skip to content

Commit d438849

Browse files
authored
Merge branch 'kubernetes:main' into master
2 parents 8dfd425 + 0a2da8c commit d438849

File tree

293 files changed

+75943
-16697
lines changed

Some content is hidden

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

293 files changed

+75943
-16697
lines changed

api-ref-assets/api/swagger.json

Lines changed: 13900 additions & 13095 deletions
Large diffs are not rendered by default.

api-ref-assets/config/fields.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
- initContainers
77
- imagePullSecrets
88
- enableServiceLinks
9+
- os
910
- name: Volumes
1011
fields:
1112
- volumes
@@ -154,6 +155,7 @@
154155
- timeoutSeconds
155156
- failureThreshold
156157
- successThreshold
158+
- grpc
157159

158160
- definition: io.k8s.api.core.v1.SecurityContext
159161
field_categories:
@@ -313,6 +315,7 @@
313315
- revisionHistoryLimit
314316
- volumeClaimTemplates
315317
- minReadySeconds
318+
- persistentVolumeClaimRetentionPolicy
316319

317320
- definition: io.k8s.api.apps.v1.StatefulSetUpdateStrategy
318321
field_categories:
@@ -393,6 +396,9 @@
393396
- completedIndexes
394397
- conditions
395398
- uncountedTerminatedPods
399+
- name: Alpha level
400+
fields:
401+
- ready
396402

397403
- definition: io.k8s.api.batch.v1.CronJobSpec
398404
field_categories:
@@ -421,6 +427,22 @@
421427
- value
422428
- periodSeconds
423429

430+
- definition: io.k8s.api.autoscaling.v2.HorizontalPodAutoscalerSpec
431+
field_categories:
432+
- fields:
433+
- maxReplicas
434+
- scaleTargetRef
435+
- minReplicas
436+
- behavior
437+
- metrics
438+
439+
- definition: io.k8s.api.autoscaling.v2.HPAScalingPolicy
440+
field_categories:
441+
- fields:
442+
- type
443+
- value
444+
- periodSeconds
445+
424446
- definition: io.k8s.api.core.v1.ServiceSpec
425447
field_categories:
426448
- fields:

api-ref-assets/config/toc.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ parts:
2323
- PodSpec
2424
- Container
2525
- EphemeralContainer
26-
- Handler
26+
- LifecycleHandler
2727
- NodeAffinity
2828
- PodAffinity
2929
- PodAntiAffinity
@@ -60,6 +60,9 @@ parts:
6060
- name: HorizontalPodAutoscaler
6161
group: autoscaling
6262
version: v1
63+
- name: HorizontalPodAutoscaler
64+
group: autoscaling
65+
version: v2
6366
- name: HorizontalPodAutoscaler
6467
group: autoscaling
6568
version: v2beta2
@@ -217,10 +220,10 @@ parts:
217220
version: v1
218221
- name: FlowSchema
219222
group: flowcontrol.apiserver.k8s.io
220-
version: v1beta1
223+
version: v1beta2
221224
- name: PriorityLevelConfiguration
222225
group: flowcontrol.apiserver.k8s.io
223-
version: v1beta1
226+
version: v1beta2
224227
- name: Binding
225228
group: ""
226229
version: v1

assets/scss/_custom.scss

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $announcement-size-adjustment: 8px;
77
}
88

99
main {
10-
img {
10+
*:not(figure) > img {
1111
max-width: 100%;
1212
}
1313

@@ -601,7 +601,7 @@ body.td-documentation {
601601
#announcement {
602602
> * {
603603
color: inherit;
604-
background: inherit;
604+
background: transparent;
605605
}
606606

607607
a {
@@ -698,6 +698,26 @@ body.td-documentation {
698698
}
699699
}
700700

701+
figure {
702+
> figcaption {
703+
padding-top: 1em;
704+
margin-bottom: 3em;
705+
}
706+
}
707+
708+
// Clamp size for release logos
709+
figure.release-logo {
710+
> figcaption {
711+
font-size: 1.8em;
712+
}
713+
> img {
714+
max-width: 100%;
715+
max-height: calc(max(40em,min(80vh,70em)));
716+
height: auto;
717+
width: auto;
718+
}
719+
}
720+
701721

702722
// Match Docsy-imposed max width on text body
703723
@media (min-width: 1200px) {

config.toml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@ time_format_default = "January 02, 2006 at 3:04 PM PST"
139139
description = "Production-Grade Container Orchestration"
140140
showedit = true
141141

142-
latest = "v1.22"
142+
latest = "v1.23"
143143

144-
fullversion = "v1.22.0"
145-
version = "v1.22"
144+
fullversion = "v1.23.0"
145+
version = "v1.23"
146146
githubbranch = "main"
147147
docsbranch = "main"
148148
deprecated = false
@@ -179,40 +179,40 @@ js = [
179179
]
180180

181181
[[params.versions]]
182-
fullversion = "v1.22.0"
183-
version = "v1.22"
184-
githubbranch = "v1.22.0"
182+
fullversion = "v1.23.0"
183+
version = "v1.23"
184+
githubbranch = "v1.23.0"
185185
docsbranch = "main"
186186
url = "https://kubernetes.io"
187187

188188
[[params.versions]]
189-
fullversion = "v1.21.4"
189+
fullversion = "v1.22.4"
190+
version = "v1.22"
191+
githubbranch = "v1.22.4"
192+
docsbranch = "release-1.22"
193+
url = "https://v1-22.docs.kubernetes.io"
194+
195+
[[params.versions]]
196+
fullversion = "v1.21.7"
190197
version = "v1.21"
191-
githubbranch = "v1.21.4"
198+
githubbranch = "v1.21.7"
192199
docsbranch = "release-1.21"
193200
url = "https://v1-21.docs.kubernetes.io"
194201

195202
[[params.versions]]
196-
fullversion = "v1.20.10"
203+
fullversion = "v1.20.13"
197204
version = "v1.20"
198-
githubbranch = "v1.20.10"
205+
githubbranch = "v1.20.13"
199206
docsbranch = "release-1.20"
200207
url = "https://v1-20.docs.kubernetes.io"
201208

202209
[[params.versions]]
203-
fullversion = "v1.19.14"
210+
fullversion = "v1.19.16"
204211
version = "v1.19"
205-
githubbranch = "v1.19.14"
212+
githubbranch = "v1.19.16"
206213
docsbranch = "release-1.19"
207214
url = "https://v1-19.docs.kubernetes.io"
208215

209-
[[params.versions]]
210-
fullversion = "v1.18.20"
211-
version = "v1.18"
212-
githubbranch = "v1.18.20"
213-
docsbranch = "release-1.18"
214-
url = "https://v1-18.docs.kubernetes.io"
215-
216216
# User interface configuration
217217
[params.ui]
218218
# Enable to show the side bar menu in its compact state.

content/en/_index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ <h2>The Challenges of Migrating 150+ Microservices to Kubernetes</h2>
4343
<button id="desktopShowVideoButton" onclick="kub.showVideo()">Watch Video</button>
4444
<br>
4545
<br>
46-
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/?utm_source=kubernetes.io&utm_medium=nav&utm_campaign=kccncna21" button id="desktopKCButton">Attend KubeCon North America on October 11-15, 2021</a>
46+
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe-2022/?utm_source=kubernetes.io&utm_medium=nav&utm_campaign=kccnceu22" button id="desktopKCButton">Attend KubeCon Europe on May 17-20, 2022</a>
4747
<br>
4848
<br>
4949
<br>
5050
<br>
51-
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe-2022/?utm_source=kubernetes.io&utm_medium=nav&utm_campaign=kccnceu22" button id="desktopKCButton">Attend KubeCon Europe on May 17-20, 2022</a>
51+
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/?utm_source=kubernetes.io&utm_medium=nav&utm_campaign=kccncna21" button id="desktopKCButton">Attend KubeCon North America on October 24-28, 2022</a>
5252
</div>
5353
<div id="videoPlayer">
5454
<iframe data-url="https://www.youtube.com/embed/H06qrNmGqyE?autoplay=1" frameborder="0" allowfullscreen></iframe>

content/en/blog/_posts/2018-10-01-health-checking-grpc.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ title: 'Health checking gRPC servers on Kubernetes'
44
date: 2018-10-01
55
---
66

7+
_Built-in gRPC probes were introduced in Kubernetes 1.23. To learn more, see [Configure Liveness, Readiness and Startup Probes](/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-a-grpc-liveness-probe)._
8+
79
**Author**: [Ahmet Alp Balkan](https://twitter.com/ahmetb) (Google)
810

911
[gRPC](https://grpc.io) is on its way to becoming the lingua franca for

content/en/blog/_posts/2021-09-13-read-write-once-pod-access-mode-alpha.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ metadata:
2828
name: shared-cache
2929
spec:
3030
accessModes:
31-
- ReadWriteMany # Allow many pods to access shared-cache simultaneously.
31+
- ReadWriteMany # Allow many nodes to access shared-cache simultaneously.
3232
resources:
3333
requests:
3434
storage: 1Gi

0 commit comments

Comments
 (0)