Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main into dev-1.29 #44305

Merged
merged 21 commits into from
Dec 11, 2023

Conversation

sftim
Copy link
Contributor

@sftim sftim commented Dec 11, 2023

Account for the latest updates, including #43346.

austince and others added 20 commits October 25, 2023 16:52
- Finalizers are a string array
- Small grammar error
The "generate-csr" command is useful in cases users don't
wish to use the default certificate duration that kubeadm has
hardcoded to 1 year. The command can also be used when the
certificate rotation process is done manually, out of bounds
with an external CA.
Improve visibility for tutorial diagrams through color change
docs: Small fixes to the Resource deletion section of API Concept
Replace "Twitter" logo with "X" logo on Community page
Remove duplicate references to Docker Engine legacy container feature in "Service" page
Fix Broken voyager link in ingress-controllers.md
[zh-cn] sync secret cheatsheet php-apache.yaml
[pt] Update "Operator White Paper" link on operator.md page
* [zh-cn] Update KubeCon dates

* [zh-cn] Update KubeCon dates
…kubeadm-generate-csr

kubeadm: add section on how to use the "generate-csr" command
Add a new concept page for Sidecar containers
@k8s-ci-robot k8s-ci-robot added this to the 1.29 milestone Dec 11, 2023
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 11, 2023
Copy link

netlify bot commented Dec 11, 2023

👷 Deploy Preview for kubernetes-io-vnext-staging processing.

Name Link
🔨 Latest commit e57cf32
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/657742d2e4f24000086353f0

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 11, 2023
@sftim sftim requested a review from katcosgrove December 11, 2023 17:10
@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Dec 11, 2023
@sftim sftim marked this pull request as ready for review December 11, 2023 17:10
@k8s-ci-robot k8s-ci-robot added language/en Issues or PRs related to English language and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Dec 11, 2023
@k8s-ci-robot k8s-ci-robot added language/pt Issues or PRs related to Portuguese language language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Dec 11, 2023
@sftim

This comment was marked as duplicate.

Comment on lines -292 to -332
#### API for sidecar containers

{{< feature-state for_k8s_version="v1.29" state="beta" >}}

Enabled by default with Kubernetes 1.29, a feature gate named `SidecarContainers`
allows you to specify a `restartPolicy` for init containers which is independent of
the Pod and other init containers. Container [probes](/docs/concepts/workloads/pods/pod-lifecycle/#types-of-probe)
can also be added to control their lifecycle.

If an init container is created with its `restartPolicy` set to `Always`, it will
start and remain running during the entire life of the Pod, which is useful for
running supporting services separated from the main application containers.

If a `readinessProbe` is specified for this init container, its result will be used
to determine the `ready` state of the Pod.

Since these containers are defined as init containers, they benefit from the same
ordering and sequential guarantees as other init containers, allowing them to
be mixed with other init containers into complex Pod initialization flows.

Compared to regular init containers, sidecar-style init containers continue to
run and the next init container can begin starting once the kubelet has set
the `started` container status for the sidecar-style init container to true.
That status either becomes true because there is a process running in the
container and no startup probe defined, or
as a result of its `startupProbe` succeeding.

This feature can be used to implement the sidecar container pattern in a more
robust way, as the kubelet always restarts a sidecar container if it fails.

Here's an example of a Deployment with two containers, one of which is a sidecar:

{{% code_sample language="yaml" file="application/deployment-sidecar.yaml" %}}

This feature is also useful for running Jobs with sidecars, as the sidecar
container will not prevent the Job from completing after the main container
has finished.

Here's an example of a Job with two containers, one of which is a sidecar:

{{% code_sample language="yaml" file="application/job/job-sidecar.yaml" %}}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved per #43346

@sftim sftim force-pushed the 20231211_dev_1.29_merge_main branch from 9ed3f6b to e57cf32 Compare December 11, 2023 17:11
five minutes. Once a container has executed for 10 minutes without any problems, the
kubelet resets the restart backoff timer for that container.
[Sidecar containers and Pod lifecycle](/docs/concepts/workloads/pods/sidecar-containers/#sidecar-containers-and-pod-lifecycle)
explains the behaviour of `init containers` when specify `restartpolicy` field on it.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this needs a fix at some point

@sftim
Copy link
Contributor Author

sftim commented Dec 11, 2023

⚠️ Please check I didn't miss anything before approving this ⚠️

It was a bit rushed.

@katcosgrove
Copy link
Contributor

Looks clean, other than the nit we can address later.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 11, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 739f35aa8802ac051f0ff539adfd003cbbf2f97d

Copy link
Contributor

@natalisucks natalisucks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me, too
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: natalisucks

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 11, 2023
@k8s-ci-robot k8s-ci-robot merged commit cada199 into kubernetes:dev-1.29 Dec 11, 2023
6 checks passed
@sftim sftim deleted the 20231211_dev_1.29_merge_main branch December 11, 2023 23:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language language/pt Issues or PRs related to Portuguese language language/zh Issues or PRs related to Chinese language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.