Skip to content
This repository has been archived by the owner on Oct 7, 2020. It is now read-only.

[release-1.4] Add all securityContext fields in injected containers #629

Merged
merged 1 commit into from
Dec 28, 2019
Merged

[release-1.4] Add all securityContext fields in injected containers #629

merged 1 commit into from
Dec 28, 2019

Conversation

rlenglet
Copy link
Contributor

This is a manual cherry-pick of #628.

Fixes istio/istio#17318

@rlenglet rlenglet added the cherrypick/release-1.3 Set this label on a PR to auto-merge it to the release-1.3 branch label Dec 28, 2019
@rlenglet rlenglet requested a review from a team December 28, 2019 22:39
@googlebot googlebot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Dec 28, 2019
@istio-testing istio-testing added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 28, 2019
@istio-testing istio-testing merged commit bfbbc7d into release-1.4 Dec 28, 2019
@istio-testing istio-testing deleted the add-all-security-context-fields-release-1.4 branch December 28, 2019 23:07
@istio-testing
Copy link

In response to a cherrypick label: #629 failed to apply on top of branch "release-1.3":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	istio-control/istio-autoinject/files/injection-template.yaml
Falling back to patching base and 3-way merge...
Auto-merging istio-control/istio-autoinject/files/injection-template.yaml
CONFLICT (content): Merge conflict in istio-control/istio-autoinject/files/injection-template.yaml
Patch failed at 0001 Add all securityContext fields in injected containers

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@howardjohn howardjohn howardjohn approved these changes

Assignees
No one assigned
Labels
cherrypick/release-1.3 Set this label on a PR to auto-merge it to the release-1.3 branch cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rlenglet @istio-testing @howardjohn @googlebot