Skip to content

inject: add debug image annotations to ProxyAnnotations list#15197

Open
mail2sudheerobbu-oss wants to merge 4 commits intolinkerd:mainfrom
mail2sudheerobbu-oss:fix/debug-image-annotations-proxy-list
Open

inject: add debug image annotations to ProxyAnnotations list#15197
mail2sudheerobbu-oss wants to merge 4 commits intolinkerd:mainfrom
mail2sudheerobbu-oss:fix/debug-image-annotations-proxy-list

Conversation

@mail2sudheerobbu-oss
Copy link
Copy Markdown

DebugImageAnnotation, DebugImageVersionAnnotation, and DebugImagePullPolicyAnnotation were missing from ProxyAnnotations. This caused namespace-level debug image annotations to not be inherited by pods (AppendNamespaceAnnotations only propagates annotations in the ProxyAnnotations list).

Fixes #13636

DebugImageAnnotation, DebugImageVersionAnnotation, and
DebugImagePullPolicyAnnotation were missing from ProxyAnnotations.
This caused namespace-level debug image annotations to not be
inherited by pods (AppendNamespaceAnnotations only propagates
annotations in the ProxyAnnotations list).

Fixes linkerd#13636

Signed-off-by: Sudheer Obbu <mail2sudheerobbu@gmail.com>
@mail2sudheerobbu-oss mail2sudheerobbu-oss requested a review from a team as a code owner April 21, 2026 18:37
@mail2sudheerobbu-oss
Copy link
Copy Markdown
Author

Hi @linkerd/maintainers 👋 — first-time contributor here, happy to be working on Linkerd!

This is a small focused fix for #13636: DebugImageAnnotation, DebugImageVersionAnnotation, and DebugImagePullPolicyAnnotation were absent from the ProxyAnnotations list in pkg/inject/inject.go. Since AppendNamespaceAnnotations only propagates annotations that appear in that list, namespace-level debug image settings were silently dropped and never inherited by pods.

The fix is a 3-line addition to ProxyAnnotations. No logic changes, no new dependencies. DCO passes and the branch merges cleanly with main.

Happy to add a test or make any other changes if needed. Thanks for your time! 🙏

Comment thread pkg/inject/inject.go Outdated
Comment on lines +84 to +86
k8s.DebugImageAnnotation,
k8s.DebugImageVersionAnnotation,
k8s.DebugImagePullPolicyAnnotation,
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is not correctly formatted, needs more indentation.

…tions

The three DebugImage annotation entries were indented with a single tab,
inconsistent with all other entries in the ProxyAnnotations slice which
use double-tab indentation.

Signed-off-by: Sudheer Obbu <mail2sudheerobbu@gmail.com>
@mail2sudheerobbu-oss
Copy link
Copy Markdown
Author

Fixed! The three DebugImage annotation entries in pkg/inject/inject.go lines 84–86 were indented with a single tab instead of the double-tab used by all other entries in the ProxyAnnotations slice. Pushed commit 70d4156 to correct the indentation. Thanks for the catch!

@mail2sudheerobbu-oss
Copy link
Copy Markdown
Author

@unleashed — just a heads-up that the indentation issue you flagged is fixed in commit 70d4156. The three DebugImage entries in ProxyAnnotations are now double-tab indented to match all other entries in the slice. Happy to make any further adjustments if needed — thanks for the review!

@mail2sudheerobbu-oss
Copy link
Copy Markdown
Author

@unleashed — the indentation issue you flagged has been fixed in commit 70d4156. Could you take another look when you get a chance? Thank you!

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Annotations for setting debug image and debug image version not taking effect

2 participants