This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 56569d91ef1112bfaa0ae7cd58ec4861f63d1a35
Author: Antonin Stefanutti <anto...@stefanutti.fr>
AuthorDate: Fri May 29 17:47:12 2020 +0200
fix(prometheus): Do not name Prometheus container port
Knative enforces specific values used for content negotiation.
The Prometheus port is not to be exposed anyway when Knative profile
is enabled, as Knative also enforces a single container port.
---
pkg/trait/prometheus.go | 10 +++++-----
pkg/trait/prometheus_test.go | 1 -
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/pkg/trait/prometheus.go b/pkg/trait/prometheus.go
index 94bb988..8a6dd8f 100644
--- a/pkg/trait/prometheus.go
+++ b/pkg/trait/prometheus.go
@@ -170,7 +170,6 @@ func (t *prometheusTrait) Apply(e *Environment) (err error)
{
func (t *prometheusTrait) getContainerPort() *corev1.ContainerPort {
containerPort := corev1.ContainerPort{
- Name: prometheusPortName,
ContainerPort: int32(t.Port),
Protocol: corev1.ProtocolTCP,
}
@@ -179,10 +178,11 @@ func (t *prometheusTrait) getContainerPort()
*corev1.ContainerPort {
func (t *prometheusTrait) getServicePort() *corev1.ServicePort {
servicePort := corev1.ServicePort{
- Name: prometheusPortName,
- Port: int32(t.Port),
- Protocol: corev1.ProtocolTCP,
- TargetPort: intstr.FromString(prometheusPortName),
+ Name: prometheusPortName,
+ Port: int32(t.Port),
+ Protocol: corev1.ProtocolTCP,
+ // Avoid relying on named port, as Knative enforces specific
values used for content negotiation
+ TargetPort: intstr.FromInt(t.Port),
}
return &servicePort
}
diff --git a/pkg/trait/prometheus_test.go b/pkg/trait/prometheus_test.go
index 53a8179..30a676f 100644
--- a/pkg/trait/prometheus_test.go
+++ b/pkg/trait/prometheus_test.go
@@ -68,7 +68,6 @@ func TestApplyNominalPrometheusTraitDoesSucceed(t *testing.T)
{
ports := container.Ports
assert.Len(t, ports, 1)
- assert.Equal(t, "prometheus", ports[0].Name)
assert.Equal(t, int32(9779), ports[0].ContainerPort)
assert.Equal(t, corev1.ProtocolTCP, ports[0].Protocol)
