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

Handle injected sidecars more correctly #1688

Merged
merged 1 commit into from
Dec 5, 2019

Conversation

imjasonh
Copy link
Member

@imjasonh imjasonh commented Dec 4, 2019

Before this change, sidecars that are injected into the Pod by external
Mutating Admission Controllers would not be guaranteed to be Ready
before starting the first step, and would not be correctly stopped when
steps finish.

This is because we only considered containers with names starting with
"sidecar-" as sidecars, and injected sidecars might have another name.

Instead, with this change, we look for any non-step container, which
must (currently) indicate a sidecar container, when waiting for or
stopping sidecars.

An added test covers this new behavior, which would have failed before
this change.

In general, we could use better e2e test coverage for injected sidecars (#1687)

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

See the contribution guide for more details.

Double check this list of stuff that's easy to miss:

Reviewer Notes

If API changes are included, additive changes must be approved by at least two OWNERS and backwards incompatible changes must be approved by more than 50% of the OWNERS, and they must first be added in a backwards compatible way.

Release Notes

Improved support for injected sidecar containers

Before this change, sidecars that are injected into the Pod by external
Mutating Admission Controllers would not be guaranteed to be Ready
before starting the first step, and would not be correctly stopped when
steps finish.

This is because we only considered containers with names starting with
"sidecar-" as sidecars, and injected sidecars might have another name.

Instead, with this change, we look for any *non-step* container, which
must (currently) indicate a sidecar container, when waiting for or
stopping sidecars.

An added test covers this new behavior, which would have failed before
this change.
@tekton-robot tekton-robot requested review from dlorenc and a user December 4, 2019 21:30
@googlebot googlebot added the cla: yes Trying to make the CLA bot happy with ppl from different companies work on one commit label Dec 4, 2019
@tekton-robot tekton-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 4, 2019
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 5, 2019
@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vdemeester

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

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 5, 2019
@tekton-robot tekton-robot merged commit 04fc509 into tektoncd:master Dec 5, 2019
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. cla: yes Trying to make the CLA bot happy with ppl from different companies work on one commit lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants