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.

Sign up for GitHub

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

Jump to bottom

Automated cherry pick of #120281: Feature-gate SidecarContainers code in pkg/kubelet/kuberuntime #120440

Merged
merged 2 commits into from
Sep 6, 2023
Merged

Automated cherry pick of #120281: Feature-gate SidecarContainers code in pkg/kubelet/kuberuntime #120440

merged 2 commits into from
Sep 6, 2023

Conversation

gjkim42
Copy link
Member

@gjkim42 gjkim42 commented Sep 6, 2023 •
edited by liggitt

Cherry pick of #120281 on release-1.28.

#120281: Feature-gate SidecarContainers code in pkg/kubelet/kuberuntime

For details on the cherry pick process, see the cherry pick requests page.

Fixed a 1.28 regression around restarting init containers in the right order relative to normal containers

xref: #120247 (comment)

@gjkim42
Add an e2e test for the pod sandbox changed scenario
958c303 
This adds an e2e test to ensure that a pod should restart its containers
in right order after the pod sandbox is changed.
@gjkim42
Feature-gate SidecarContainers code in pkg/kubelet/kuberuntime
b5fd7e9
@k8s-ci-robot k8s-ci-robot added this to the v1.28 milestone Sep 6, 2023
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Sep 6, 2023
@gjkim42 gjkim42 mentioned this pull request Sep 6, 2023
Merged
@k8s-ci-robot k8s-ci-robot added area/kubelet area/test sig/node Categorizes an issue or PR as relevant to SIG Node. sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Sep 6, 2023
@gjkim42
Copy link
Member Author

gjkim42 commented Sep 6, 2023

/priority critical-urgent
/kind regression
/kind bug

/assign @dims @SergeyKanzhelev @mrunalp

@k8s-ci-robot k8s-ci-robot added the priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. label Sep 6, 2023
@k8s-ci-robot k8s-ci-robot added kind/regression Categorizes issue or PR as related to a regression from a prior release. kind/bug Categorizes issue or PR as related to a bug. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Sep 6, 2023
@gjkim42
Copy link
Member Author

gjkim42 commented Sep 6, 2023

/test pull-kubernetes-node-kubelet-serial-containerd
/test pull-kubernetes-node-e2e-containerd-sidecar-containers

@k8s-ci-robot
Copy link
Contributor

@gjkim42: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test pull-cadvisor-e2e-kubernetes
  • /test pull-kubernetes-conformance-kind-ga-only-parallel
  • /test pull-kubernetes-coverage-unit
  • /test pull-kubernetes-dependencies
  • /test pull-kubernetes-dependencies-go-canary
  • /test pull-kubernetes-e2e-gce
  • /test pull-kubernetes-e2e-gce-100-performance
  • /test pull-kubernetes-e2e-gce-canary
  • /test pull-kubernetes-e2e-gce-cos
  • /test pull-kubernetes-e2e-gce-cos-canary
  • /test pull-kubernetes-e2e-gce-cos-no-stage
  • /test pull-kubernetes-e2e-gce-network-proxy-http-connect
  • /test pull-kubernetes-e2e-kind
  • /test pull-kubernetes-e2e-kind-ipv6
  • /test pull-kubernetes-integration
  • /test pull-kubernetes-integration-go-canary
  • /test pull-kubernetes-integration-go-compatibility
  • /test pull-kubernetes-kubemark-e2e-gce-scale
  • /test pull-kubernetes-node-e2e-containerd
  • /test pull-kubernetes-typecheck
  • /test pull-kubernetes-unit
  • /test pull-kubernetes-unit-go-canary
  • /test pull-kubernetes-unit-go-compatibility
  • /test pull-kubernetes-update
  • /test pull-kubernetes-verify
  • /test pull-kubernetes-verify-go-canary

The following commands are available to trigger optional jobs:

  • /test check-dependency-stats
  • /test pull-e2e-gce-cloud-provider-disabled
  • /test pull-kubernetes-conformance-kind-ipv6-parallel
  • /test pull-kubernetes-cross
  • /test pull-kubernetes-e2e-autoscaling-hpa-cm
  • /test pull-kubernetes-e2e-autoscaling-hpa-cpu
  • /test pull-kubernetes-e2e-capz-azure-disk
  • /test pull-kubernetes-e2e-capz-azure-disk-vmss
  • /test pull-kubernetes-e2e-capz-azure-file
  • /test pull-kubernetes-e2e-capz-azure-file-vmss
  • /test pull-kubernetes-e2e-capz-conformance
  • /test pull-kubernetes-e2e-capz-windows-1-28
  • /test pull-kubernetes-e2e-containerd-gce
  • /test pull-kubernetes-e2e-gce-correctness
  • /test pull-kubernetes-e2e-gce-device-plugin-gpu
  • /test pull-kubernetes-e2e-gce-network-proxy-grpc
  • /test pull-kubernetes-e2e-gce-serial
  • /test pull-kubernetes-e2e-gci-gce-autoscaling
  • /test pull-kubernetes-e2e-kind-dual-canary
  • /test pull-kubernetes-e2e-kind-ipvs-dual-canary
  • /test pull-kubernetes-e2e-kind-kms
  • /test pull-kubernetes-e2e-kind-multizone
  • /test pull-kubernetes-e2e-kops-aws
  • /test pull-kubernetes-kubemark-e2e-gce-big
  • /test pull-kubernetes-node-arm64-e2e-containerd-ec2
  • /test pull-kubernetes-node-arm64-e2e-containerd-serial-ec2
  • /test pull-kubernetes-node-arm64-ubuntu-serial-gce
  • /test pull-kubernetes-node-e2e-containerd-ec2
  • /test pull-kubernetes-node-e2e-containerd-kubetest2
  • /test pull-kubernetes-node-e2e-containerd-serial-ec2
  • /test pull-kubernetes-node-kubelet-serial-pod-disruption-conditions
  • /test pull-kubernetes-verify-strict-lint
  • /test pull-publishing-bot-validate

Use /test all to run the following jobs that were automatically triggered:

  • pull-kubernetes-conformance-kind-ga-only-parallel
  • pull-kubernetes-conformance-kind-ipv6-parallel
  • pull-kubernetes-dependencies
  • pull-kubernetes-e2e-gce
  • pull-kubernetes-e2e-kind
  • pull-kubernetes-e2e-kind-ipv6
  • pull-kubernetes-integration
  • pull-kubernetes-integration-go-compatibility
  • pull-kubernetes-node-e2e-containerd
  • pull-kubernetes-typecheck
  • pull-kubernetes-unit
  • pull-kubernetes-unit-go-compatibility
  • pull-kubernetes-verify

In response to this:

/test pull-kubernetes-node-kubelet-serial-containerd
/test pull-kubernetes-node-e2e-containerd-sidecar-containers

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@bart0sh bart0sh added this to Triage in SIG Node PR Triage Sep 6, 2023
@bart0sh
Copy link
Contributor

bart0sh commented Sep 6, 2023

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Sep 6, 2023
@bart0sh bart0sh moved this from Triage to Needs Approver in SIG Node PR Triage Sep 6, 2023
@pacoxu
Copy link
Member

pacoxu commented Sep 6, 2023 •
edited

/cc @kubernetes/release-managers
/approve

@tzneal
Copy link
Contributor

tzneal commented Sep 6, 2023

/cc

@saschagrunert
Copy link
Member

This PR needs to be approved before @kubernetes/release-managers can apply the label.

@dims
Copy link
Member

dims commented Sep 6, 2023

/approve
/lgtm

@dims dims closed this Sep 6, 2023
SIG Node PR Triage automation moved this from Needs Approver to Done Sep 6, 2023
@dims dims reopened this Sep 6, 2023
SIG Node PR Triage automation moved this from Done to Triage Sep 6, 2023
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 6, 2023
@dims
Copy link
Member

dims commented Sep 6, 2023

whoops! sorry clicked on the wrong button

@saschagrunert saschagrunert added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Sep 6, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims, gjkim42, pacoxu, saschagrunert, SergeyKanzhelev

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

@tzneal
Copy link
Contributor

tzneal commented Sep 6, 2023

/retest

@k8s-ci-robot k8s-ci-robot merged commit 1296fd3 into kubernetes:release-1.28 Sep 6, 2023
13 of 15 checks passed
SIG Node CI/Test Board automation moved this from Triage to Done Sep 6, 2023
SIG Node PR Triage automation moved this from Triage to Done Sep 6, 2023
@gjkim42 gjkim42 deleted the automated-cherry-pick-of-#120281-upstream-release-1.28 branch September 6, 2023 17:22
@bhavi-koduru bhavi-koduru mentioned this pull request Sep 6, 2023
Merged
@brandond brandond mentioned this pull request Sep 8, 2023
Closed
@liggitt liggitt added the kind/feature Categorizes issue or PR as related to a new feature. label Sep 27, 2023
@fangpenlin fangpenlin mentioned this pull request Oct 1, 2023
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saschagrunert saschagrunert saschagrunert approved these changes

@SergeyKanzhelev SergeyKanzhelev SergeyKanzhelev approved these changes

@matthyx matthyx Awaiting requested review from matthyx

@sjenning sjenning Awaiting requested review from sjenning

@tzneal tzneal Awaiting requested review from tzneal

Assignees

@dims dims

@mrunalp mrunalp

@SergeyKanzhelev SergeyKanzhelev

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet area/test cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. kind/feature Categorizes issue or PR as related to a new feature. kind/regression Categorizes issue or PR as related to a regression from a prior release. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node CI/Test Board
Done
SIG Node PR Triage
Archived in project
[sig-release] Bug Triage
Archived in project
SIG Node PR Triage
Done
Milestone
v1.28
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@gjkim42 @k8s-ci-robot @bart0sh @pacoxu @tzneal @saschagrunert @dims @SergeyKanzhelev @mrunalp @liggitt