Support annotation service-tags: $POD_NAME #931
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
Support the annotation ``` consul.hashicorp.com/service-tags: $POD_NAME ``` Where $POD_NAME will be replaced with the Pod's name. This mimics support we had before the endpoints controller where environment variable were interpolated for tags. This PR only supports $POD_NAME for now because it's the only environment variable we've been asked to support.
lkysow
commented
Dec 14, 2021
| @@ -416,15 +416,7 @@ func (r *EndpointsController) createServiceRegistrations(pod corev1.Pod, service | |||
| meta[strings.TrimPrefix(k, annotationMeta)] = v | |||
| } | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
refactored this into a consulTags function
| @@ -433,9 +425,7 @@ func (r *EndpointsController) createServiceRegistrations(pod corev1.Pod, service | |||
| Address: pod.Status.PodIP, | |||
| Meta: meta, | |||
| Namespace: r.consulNamespace(pod.Namespace), | |||
| } | |||
| if len(tags) > 0 { | |||
There was a problem hiding this comment.
I didn't see why we were doing this if check rather than just assigning to the struct field.
lkysow
commented
Dec 14, 2021
Comment on lines
+889
to
+890
| pod1.Annotations[annotationTags] = "abc,123,$POD_NAME" | ||
| pod1.Annotations[annotationConnectTags] = "def,456,$POD_NAME" |
There was a problem hiding this comment.
testing both the supported and deprecated tags just for completeness
lkysow
requested review from
a team,
ndhanushkodi and
kschoche
and removed request for
a team
ndhanushkodi
approved these changes
Dec 14, 2021
|
Tested it out as well. |
2 tasks
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.
Support the annotation
Where $POD_NAME will be replaced with the Pod's name.
This mimics support we had before the endpoints controller
where environment variable were interpolated for tags.
This PR only supports $POD_NAME for now because it's the only
environment variable we've been asked to support.
How I've tested this PR: unit tests
How I expect reviewers to test this PR: code
Checklist: