From 560bcdbe701d051de85e21d4e9cf989aacdc92d7 Mon Sep 17 00:00:00 2001 From: Jonathan Rockway Date: Mon, 24 Feb 2020 05:49:47 -0500 Subject: [PATCH] sidecar: when injecting, expose the admin port so that prometheus can scrape it Signed-off-by: Jonathan Rockway --- pkg/inject/sidecar.go | 7 ++++++- pkg/inject/sidecar_test.go | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/inject/sidecar.go b/pkg/inject/sidecar.go index b53637be73..3be7e923bb 100644 --- a/pkg/inject/sidecar.go +++ b/pkg/inject/sidecar.go @@ -25,7 +25,7 @@ var ( // PrometheusDefaultAnnotations is a map containing annotations for prometheus to be inserted at sidecar in case it doesn't have any PrometheusDefaultAnnotations = map[string]string{ "prometheus.io/scrape": "true", - "prometheus.io/port": "5778", + "prometheus.io/port": "14271", } ) @@ -138,6 +138,7 @@ func container(jaeger *v1.Jaeger, dep *appsv1.Deployment) corev1.Container { configRest := util.GetPort("--http-server.host-port=", args, 5778) jgCompactTrft := util.GetPort("--processor.jaeger-compact.server-host-port=", args, 6831) jgBinaryTrft := util.GetPort("--processor.jaeger-binary.server-host-port=", args, 6832) + adminPort := util.GetPort("--admin-http-port=", args, 14271) if len(util.FindItem("--jaeger.tags=", args)) == 0 { agentTags := fmt.Sprintf("%s=%s,%s=%s,%s=%s,%s=%s,%s=%s", @@ -205,6 +206,10 @@ func container(jaeger *v1.Jaeger, dep *appsv1.Deployment) corev1.Container { Name: "jg-binary-trft", Protocol: corev1.ProtocolUDP, }, + { + ContainerPort: adminPort, + Name: "admin-http", + }, }, Resources: commonSpec.Resources, } diff --git a/pkg/inject/sidecar_test.go b/pkg/inject/sidecar_test.go index c5d53c2f12..96fbf163ac 100644 --- a/pkg/inject/sidecar_test.go +++ b/pkg/inject/sidecar_test.go @@ -176,11 +176,12 @@ func TestSidecarDefaultPorts(t *testing.T) { assert.Len(t, dep.Spec.Template.Spec.Containers, 2) assert.Contains(t, dep.Spec.Template.Spec.Containers[1].Image, "jaeger-agent") - assert.Len(t, dep.Spec.Template.Spec.Containers[1].Ports, 4) + assert.Len(t, dep.Spec.Template.Spec.Containers[1].Ports, 5) assert.Contains(t, dep.Spec.Template.Spec.Containers[1].Ports, corev1.ContainerPort{ContainerPort: 5775, Name: "zk-compact-trft", Protocol: corev1.ProtocolUDP}) assert.Contains(t, dep.Spec.Template.Spec.Containers[1].Ports, corev1.ContainerPort{ContainerPort: 5778, Name: "config-rest"}) assert.Contains(t, dep.Spec.Template.Spec.Containers[1].Ports, corev1.ContainerPort{ContainerPort: 6831, Name: "jg-compact-trft", Protocol: corev1.ProtocolUDP}) assert.Contains(t, dep.Spec.Template.Spec.Containers[1].Ports, corev1.ContainerPort{ContainerPort: 6832, Name: "jg-binary-trft", Protocol: corev1.ProtocolUDP}) + assert.Contains(t, dep.Spec.Template.Spec.Containers[1].Ports, corev1.ContainerPort{ContainerPort: 14271, Name: "admin-http"}) } func TestSkipInjectSidecar(t *testing.T) {