Fix the custom injection on OpenShift #47898
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
istio-testing
added
the
size/M
hzxuzhonghu
reviewed
Nov 17, 2023
| @@ -49,6 +49,9 @@ spec: | |||
| securityContext: | |||
| allowPrivilegeEscalation: true | |||
| readOnlyRootFilesystem: false | |||
| # These should not be removed or ignored, should be honored | |||
| runAsUser: 1234 | |||
| runAsGroup: 1234 | |||
There was a problem hiding this comment.
Not sure why should we remove user's setting
There was a problem hiding this comment.
Indeed, this particular change in the test file was to guarantee we are not changing user values. This PR only changes it in a specific case: OpenShift.
jwendell
added
the
cherrypick/release-1.20
hzxuzhonghu
reviewed
Nov 17, 2023
linsun
approved these changes
Nov 17, 2023
|
Adding /hold for a day - in case others want to review. Just realized this PR is only out for < 1 day. |
howardjohn
reviewed
Nov 17, 2023
| // This is likely a scenario in OpenShift when the istio-proxy container with image: auto is parsed, if SecurityContext.RunAsUser | ||
| // does not exist, OpenShift automatically assigns a value which is based on an annotation in the namespace. Regardless if the user | ||
| // provided that value or if it was assigned by OpenShift, the correct value is the one in the template, as set by the `.ProxyUID` field. | ||
| if original.SecurityContext != nil && template.SecurityContext != nil && template.SecurityContext.RunAsUser != nil && |
There was a problem hiding this comment.
image: auto and securityContext are unrelated. A user can override the proxy container AND set image: some-explicit-proxy-image
There was a problem hiding this comment.
LGTM now although the function name is maybeconfusing
Use of custom injection (i.e., providing a custom `istio-proxy` container) is broken on OpenShift. This is because OpenShift sets the `RunAs` field to be the a pseudo-random value that varies by namespace. We rely on the `RunAs` field to be a well-known value, and it's calculated upon injection. We should stick with that value. `iptables` rules were created based on that value. Even if the user provides another value (i.e., it's not set by OpenShift, but b the user), that's wrong. We should ignore what's in the original pod and use the calculated one, for these two fields only.
jwendell
force-pushed
the
ignore-original-runasuser
branch
from
fdeffa6 to
bd3ca95
Compare
howardjohn
approved these changes
Nov 17, 2023
| // This is likely a scenario in OpenShift when the istio-proxy container with image: auto is parsed, if SecurityContext.RunAsUser | ||
| // does not exist, OpenShift automatically assigns a value which is based on an annotation in the namespace. Regardless if the user | ||
| // provided that value or if it was assigned by OpenShift, the correct value is the one in the template, as set by the `.ProxyUID` field. | ||
| if original.SecurityContext != nil && template.SecurityContext != nil && template.SecurityContext.RunAsUser != nil && |
There was a problem hiding this comment.
LGTM now although the function name is maybeconfusing
|
In response to a cherrypick label: new pull request created: #47914 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use of custom injection (i.e., providing a custom
istio-proxycontainer) is broken on OpenShift.This is because OpenShift sets the
RunAsfield to be the a pseudo-random value that varies by namespace. We rely on theRunAsfield to be a well-known value, and it's calculated upon injection. We should stick with that value.iptablesrules were created based on that value.Even if the user provides another value (i.e., it's not set by OpenShift, but b the user), that's wrong. We should ignore what's in the original pod and use the calculated one, for these two fields only.