Skip to content

Commit 9c5f87d

Browse files
authored
Merge pull request #48640 from hacktivist123/merged-main-dev-1.32
Merged main dev 1.32
2 parents 34f1f34 + db99d83 commit 9c5f87d

File tree

27 files changed

+1031
-279
lines changed

27 files changed

+1031
-279
lines changed

content/bn/community/static/cncf-code-of-conduct.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,5 @@ CNCF সনদের সাথে সামঞ্জস্যপূর্ণ,
8181
## স্বীকারোক্তি (Acknowledgements)
8282

8383
এই আচরণবিধিটি অবদানকারী চুক্তি থেকে অভিযোজিত
84-
(http://contributor-covenant.org), সংস্করণ 2.0 এখানে উপলব্ধ
85-
http://contributor-covenant.org/version/2/0/code_of_conduct/
84+
(https://contributor-covenant.org), সংস্করণ 2.0 এখানে উপলব্ধ
85+
https://contributor-covenant.org/version/2/0/code_of_conduct/

content/en/blog/_posts/2024-10-28-k8s-upstream-training-japan-spotlight/index.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ slug: k8s-upstream-training-japan-spotlight
55
date: 2024-10-28
66
canonicalUrl: https://www.k8s.dev/blog/2024/10/28/k8s-upstream-training-japan-spotlight/
77
author: >
8-
[Junya Okabe](https://github.com/Okabe-Junya) (University of Tsukuba)
8+
[Junya Okabe](https://github.com/Okabe-Junya) (University of Tsukuba) /
99
Organizing team of Kubernetes Upstream Training in Japan
1010
---
1111

12-
## About our team
13-
1412
We are organizers of [Kubernetes Upstream Training in Japan](https://github.com/kubernetes-sigs/contributor-playground/tree/master/japan).
1513
Our team is composed of members who actively contribute to Kubernetes, including individuals who hold roles such as member, reviewer, approver, and chair.
1614

content/en/docs/concepts/workloads/pods/pod-lifecycle.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ assigning a Pod to a specific node is called _binding_, and the process of selec
3939
which node to use is called _scheduling_.
4040
Once a Pod has been scheduled and is bound to a node, Kubernetes tries
4141
to run that Pod on the node. The Pod runs on that node until it stops, or until the Pod
42-
is [terminated](#pod-termination); if Kubernetes isn't able start the Pod on the selected
42+
is [terminated](#pod-termination); if Kubernetes isn't able to start the Pod on the selected
4343
node (for example, if the node crashes before the Pod starts), then that particular Pod
4444
never starts.
4545

content/en/docs/concepts/workloads/pods/sidecar-containers.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@ maintain sidecar containers without affecting the primary application.
9797
Sidecar containers share the same network and storage namespaces with the primary
9898
container. This co-location allows them to interact closely and share resources.
9999

100+
From Kubernetes perspective, sidecars graceful termination is less important.
101+
When other containers took all alloted graceful termination time, sidecar containers
102+
will receive the `SIGTERM` following with `SIGKILL` faster than may be expected.
103+
So exit codes different from `0` (`0` indicates successful exit), for sidecar containers are normal
104+
on Pod termination and should be generally ignored by the external tooling.
105+
100106
## Differences from init containers
101107

102108
Sidecar containers work alongside the main container, extending its functionality and

content/en/docs/contribute/participate/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ and editorial review of their PR.
9393

9494
## How merging works
9595

96-
When a pull request is merged to the branch used to publish content, that content is published to http://kubernetes.io. To ensure that
96+
When a pull request is merged to the branch used to publish content, that content is published to https://kubernetes.io. To ensure that
9797
the quality of our published content is high, we limit merging pull requests to
9898
SIG Docs approvers. Here's how it works.
9999

content/en/docs/contribute/review/reviewing-prs.md

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,48 @@ When reviewing, use the following as a starting point.
163163
- Do the changes show up in the Netlify preview? Be particularly vigilant about lists, code
164164
blocks, tables, notes and images.
165165

166+
### Blog
167+
168+
- Early feedback on blog posts is welcome via a Google Doc or HackMD. Please request input early from the [#sig-docs-blog Slack channel](https://kubernetes.slack.com/archives/CJDHVD54J).
169+
- Before reviewing blog PRs, be familiar with [Submitting blog posts and case studies](/docs/contribute/new-content/blogs-case-studies/).
170+
- We are willing to mirror any blog article that was published to https://kubernetes.dev/blog/ (the contributor blog) provided that:
171+
- the mirrored article has the same publication date as the original (it should have the same publication time too, but you can also set a time stamp up to 12 hours later for special cases)
172+
- for PRs that arrive the original article was merged to https://kubernetes.dev/, there haven't been
173+
(and won't be) any articles published to the main blog between time that the original and mirrored article
174+
[will] publish.
175+
This is because we don't want to add articles to people's feeds, such as RSS, except at the very end of their feed.
176+
- the original article doesn't contravene any strongly recommended review guidelines or community norms.
177+
- You should set the canonical URL for the mirrored article, to the URL of the original article
178+
(you can use a preview to predict the URL and fill this in ahead of actual publication). Use the `canonicalUrl`
179+
field in [front matter](https://gohugo.io/content-management/front-matter/) for this.
180+
- Consider the target audience and whether the blog post is appropriate for kubernetes.io
181+
For example, if the target audience are Kubernetes contributors only then kubernetes.dev
182+
may be more appropriate,
183+
or if the blog post is on general platform engineering then it may be more suitable on another site.
184+
185+
This consideration applies to mirrored articles too; although we are willing to consider all valid
186+
contributor articles for mirroring if a PR is opened, we don't mirror all of them.
187+
188+
- We only mark blog articles as maintained (`evergreen: true` in front matter) if the Kubernetes project
189+
is happy to commit to maintaining them indefinitely. Some blog articles absolutely merit this, and we
190+
always mark our release announcements evergreen. Check with other contributors if you are not sure
191+
how to review on this point.
192+
- The [content guide](/docs/contribute/style/content-guide/) applies unconditionally to blog articles
193+
and the PRs that add them. Bear in mind that some restrictions in the guide state that they are only relevant to documentation; those restrictions don't apply to blog articles.
194+
- The [style guide](/docs/contribute/style/style-guide/) largely also applies to blog PRs, but we make some exceptions.
195+
196+
- it is OK to use “we“ in a blog article that has multiple authors, or where the article introduction clearly indicates that the author is writing on behalf of a specific group.
197+
- we avoid using Kubernetes shortcodes for callouts (such as `{{</* caution */>}}`)
198+
- statements about the future are OK, albeit we use them with care in official announcements on
199+
behalf of Kubernetes
200+
- code samples don't need to use the `{{</* code_sample */>}}` shortcode, and often it is better if they do not
201+
- we are OK to have authors write an article in their own writing style, so long as most readers
202+
would follow the point being made
203+
- The [diagram guide](/docs/contribute/style/diagram-guide/) is aimed at Kubernetes documentation,
204+
not blog articles. It is still good to align with it but:
205+
- we prefer SVG over raster diagram formats, and also over Mermaid (you can still capture the Mermaid source in a comment)
206+
- there is no need to caption diagrams as Figure 1, Figure 2 etc
207+
166208
### Other
167209

168210
- Watch out for [trivial edits](https://www.kubernetes.dev/docs/guide/pull-requests/#trivial-edits);
@@ -181,5 +223,4 @@ This lets the author know that this part of your feedback is non-critical.
181223
If you are considering a pull request for approval and all the remaining feedback is
182224
marked as a nit, you can merge the PR anyway. In that case, it's often useful to open
183225
an issue about the remaining nits. Consider whether you're able to meet the requirements
184-
for marking that new issue as a [Good First Issue](https://www.kubernetes.dev/docs/guide/help-wanted/#good-first-issue);
185-
if you can, these are a good source.
226+
for marking that new issue as a [Good First Issue](https://www.kubernetes.dev/docs/guide/help-wanted/#good-first-issue); if you can, these are a good source.

content/en/docs/reference/command-line-tools-reference/feature-gates/recursive-read-only-mounts.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ stages:
99
- stage: alpha
1010
defaultValue: false
1111
fromVersion: "1.30"
12+
toVersion: "1.30"
13+
- stage: beta
14+
defaultValue: true
15+
fromVersion: "1.31"
1216
---
1317
Enables support for recursive read-only mounts.
1418
For more details, see [read-only mounts](/docs/concepts/storage/volumes/#read-only-mounts).

content/en/docs/reference/glossary/pod-disruption-budget.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Pod Disruption Budget
44
full-link: /docs/concepts/workloads/pods/disruptions/
55
date: 2019-02-12
66
short_description: >
7-
An object that limits the number of {{< glossary_tooltip text="Pods" term_id="pod" >}} of a replicated application, that are down simultaneously from voluntary disruptions.
7+
An object that limits the number of Pods of a replicated application that are down simultaneously from voluntary disruptions.
88
99
aka:
1010
- PDB
@@ -17,8 +17,8 @@ tags:
1717

1818
A [Pod Disruption Budget](/docs/concepts/workloads/pods/disruptions/) allows an
1919
application owner to create an object for a replicated application, that ensures
20-
a certain number or percentage of Pods with an assigned label will not be voluntarily
21-
evicted at any point in time.
20+
a certain number or percentage of {{< glossary_tooltip text="Pods" term_id="pod" >}}
21+
with an assigned label will not be voluntarily evicted at any point in time.
2222

2323
<!--more-->
2424

0 commit comments

Comments
 (0)