Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Metrics Port to EventListener service #1191

Merged
merged 1 commit into from
Aug 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions pkg/reconciler/eventlistener/eventlistener.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,12 @@ const (
eventListenerServicePortName = "http-listener"
// eventListenerServiceTLSPortName defines service TLS port name for EventListener Service
eventListenerServiceTLSPortName = "https-listener"
// eventListenerContainerPort defines the port exposed by the EventListener Container
// eventListenerMetricsPortName defines the metrics port name by the EventListener Container
eventListenerMetricsPortName = "http-metrics"
// eventListenerContainerPort defines service port for EventListener Service
eventListenerContainerPort = 8080
// eventListenerMetricsPort defines metrics port for EventListener Service
eventListenerMetricsPort = 9000
// GeneratedResourcePrefix is the name prefix for resources generated in the
// EventListener reconciler
GeneratedResourcePrefix = "el"
Expand Down Expand Up @@ -186,13 +190,21 @@ func (r *Reconciler) reconcileService(ctx context.Context, logger *zap.SugaredLo
}

servicePort := getServicePort(el, r.config)
metricsPort := corev1.ServicePort{
Name: eventListenerMetricsPortName,
Protocol: corev1.ProtocolTCP,
Port: int32(9000),
TargetPort: intstr.IntOrString{
IntVal: int32(eventListenerMetricsPort),
},
}

service := &corev1.Service{
ObjectMeta: generateObjectMeta(el, r.config.StaticResourceLabels),
Spec: corev1.ServiceSpec{
Selector: GenerateResourceLabels(el.Name, r.config.StaticResourceLabels),
Type: serviceType,
Ports: []corev1.ServicePort{servicePort}},
Ports: []corev1.ServicePort{servicePort, metricsPort}},
}
existingService, err := r.serviceLister.Services(el.Namespace).Get(el.Status.Configuration.GeneratedResourceName)
switch {
Expand Down
7 changes: 7 additions & 0 deletions pkg/reconciler/eventlistener/eventlistener_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,13 @@ func makeService(ops ...func(*corev1.Service)) *corev1.Service {
TargetPort: intstr.IntOrString{
IntVal: int32(eventListenerContainerPort),
},
}, {
Name: eventListenerMetricsPortName,
Protocol: corev1.ProtocolTCP,
Port: int32(9000),
TargetPort: intstr.IntOrString{
IntVal: int32(eventListenerMetricsPort),
},
}},
},
}
Expand Down