Make use of sidecar inject label across repos #41163
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
howardjohn
reviewed
Sep 26, 2022
| // If pod has the sidecar container set, then, the pod is in the mesh | ||
| if hasIstioProxy(containers) { | ||
| return true | ||
| } | ||
|
|
||
| // If Pod has labels, return the injection label value |
There was a problem hiding this comment.
The check on L55 is more robust
There was a problem hiding this comment.
Confused, shouldn't labels be respected over annotations
| // enabled is true when deployment d PodSpec has either the annotation 'sidecar.istio.io/inject: "true"' | ||
| // ok is true when the PodSpec doesn't have the 'sidecar.istio.io/inject' annotation present. | ||
| // enabled is true when deployment d PodSpec has either the label/annotation 'sidecar.istio.io/inject: "true"' | ||
| // ok is true when the PodSpec doesn't have the 'sidecar.istio.io/inject' label/annotation present. | ||
| func getPodSidecarInjectionStatus(annos map[string]string) (enabled bool, ok bool) { |
There was a problem hiding this comment.
nit: annos is not a great name anymore
| v, ok := annos[annotation.SidecarInject.Name] | ||
| return v == "true", ok | ||
| v, ok := annos[label.SidecarInject.Name] | ||
| return strings.EqualFold(v, "true"), ok |
There was a problem hiding this comment.
I am not sure, actually in some other places we compare with EqualFold.
Can you confirm?
There was a problem hiding this comment.
Also ParseBool is used
|
The label selector in the k8s webhook is definitely not EqualFold so there
may be some inconsistencies between different areas.
…On Mon, Sep 26, 2022, 6:58 PM Zhonghu Xu ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In pkg/config/analysis/analyzers/util/in_mesh.go
<#41163 (comment)>:
> func getPodSidecarInjectionStatus(annos map[string]string) (enabled bool, ok bool) {
- v, ok := annos[annotation.SidecarInject.Name]
- return v == "true", ok
+ v, ok := annos[label.SidecarInject.Name]
+ return strings.EqualFold(v, "true"), ok
I am not sure, actually in some other places we compare with EqualFold.
Can you confirm?
—
Reply to this email directly, view it on GitHub
<#41163 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAEYGXKPQTDEO63Q4DDSOC3WAJICVANCNFSM6AAAAAAQVTEORQ>
.
You are receiving this because your review was requested.Message ID:
***@***.***>
|
hzxuzhonghu
added
the
release-notes-none
|
@istio/wg-user-experience-maintainers |
|
/retest |
howardjohn
approved these changes
Sep 28, 2022
| // If pod has the sidecar container set, then, the pod is in the mesh | ||
| if hasIstioProxy(containers) { | ||
| return true | ||
| } | ||
|
|
||
| // If Pod has labels, return the injection label value |
|
kindly ping @istio/wg-user-experience-maintainers |
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.
Please provide a description of this PR:
To help us figure out who should review this PR, please put an X in all the areas that this PR affects.
Please check any characteristics that apply to this pull request.