Add service annotations #1526
Add service annotations #1526
Conversation
| @@ -48,6 +48,7 @@ func collectorService(jaeger *v1.Jaeger, selector map[string]string) *corev1.Ser | |||
| Name: GetNameForCollectorService(jaeger), | |||
| Namespace: jaeger.Namespace, | |||
| Labels: util.Labels(GetNameForCollectorService(jaeger), "service-collector", *jaeger), | |||
| Annotations: jaeger.Spec.Collector.Annotations, | |||
There was a problem hiding this comment.
Add the Collector service Annotations
| @@ -143,3 +143,13 @@ func TestCollectorServiceLoadBalancer(t *testing.T) { | |||
| // Only the non-headless service will receive the type | |||
| assert.Equal(t, svc[1].Spec.Type, corev1.ServiceTypeLoadBalancer) | |||
| } | |||
| func TestCollectorServiceAnnotations(t *testing.T) { | |||
There was a problem hiding this comment.
The test case of collector
pkg/service/query.go
Outdated
| @@ -14,6 +14,9 @@ func NewQueryService(jaeger *v1.Jaeger, selector map[string]string) *corev1.Serv | |||
| trueVar := true | |||
|
|
|||
| annotations := map[string]string{} | |||
| if jaeger.Spec.Query.Annotations !=nil{ | |||
There was a problem hiding this comment.
Add the Query service Annotations
| @@ -109,3 +109,20 @@ func TestQueryServiceSpecifiedNodePortWithIngress(t *testing.T) { | |||
| assert.Equal(t, intstr.FromInt(16686), svc.Spec.Ports[0].TargetPort) | |||
| assert.Equal(t, svc.Spec.Type, corev1.ServiceTypeNodePort) | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
The test case of query
Signed-off-by: herbguo <herbguo@163.com>
|
@rubenvp8510 could you please take a look and review the PR. |
|
Ahh the ci thing was also failing. calling |
Signed-off-by: herbguo <herbguo@gmail.com>
I have performed the fix operation, waiting for the review. |
Codecov Report
@@ Coverage Diff @@
## main #1526 +/- ##
=======================================
Coverage 88.21% 88.21%
=======================================
Files 100 100
Lines 6372 6375 +3
=======================================
+ Hits 5621 5624 +3
Misses 553 553
Partials 198 198
Continue to review full report at Codecov.
|
Which problem is this PR solving?
When I use the jaeger operator, I need to add the annotations of the jaeger-query or jaeger-collector service. But the jaeger-operator do not supply the function. So I alter the code to supply this.
Short description of the changes
For the issue
Closes #1534
Closes #1096