Skip to content

Commit e86b7bd

Browse files
authored
MINOR: kubernetes-ingress add service port named admin (#294)
Re-adding the kubernetes-ingress service port that was named prometheus but rename it as admin as it exposes KIC metrics and pprof. To sum up: Exposed on kubernetes-ingress service port named 'admin': - KIC Prometheus metrics under: /metrics - Pprof under: /debug/pprof Exposed on kubernetes-ingress service port named 'stat': - HAProxy Prometheus metrics under: /metrics
1 parent 0d840c0 commit e86b7bd

File tree

5 files changed

+20
-4
lines changed

5 files changed

+20
-4
lines changed

kubernetes-ingress/templates/controller-daemonset.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ spec:
120120
{{- if .Values.controller.logging.level }}
121121
- --log={{ .Values.controller.logging.level }}
122122
{{- end }}
123-
{{- if .Values.controller.service.enablePorts.prometheus }}
123+
{{- if .Values.controller.service.enablePorts.admin }}
124124
- --prometheus
125+
- --pprof
125126
{{- end }}
126127
{{- range .Values.controller.extraArgs }}
127128
- {{ . }}

kubernetes-ingress/templates/controller-deployment.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ spec:
120120
{{- if .Values.controller.logging.level }}
121121
- --log={{ .Values.controller.logging.level }}
122122
{{- end }}
123-
{{- if .Values.controller.service.enablePorts.prometheus }}
123+
{{- if .Values.controller.service.enablePorts.admin }}
124124
- --prometheus
125+
- --pprof
125126
{{- end }}
126127
{{- if eq .Values.controller.sync.mode "fetch" }}
127128
{{- if .Values.controller.sync.fetchParams.period }}

kubernetes-ingress/templates/controller-proxy-deployment.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ spec:
120120
{{- if .Values.controller.logging.level }}
121121
- --log={{ .Values.controller.logging.level }}
122122
{{- end }}
123-
{{- if .Values.controller.service.enablePorts.prometheus }}
123+
{{- if .Values.controller.service.enablePorts.admin }}
124124
- --prometheus
125+
- --pprof
125126
{{- end }}
126127
- --proxy-server-mode
127128
- --k8s-api-sync-type=k8s

kubernetes-ingress/templates/controller-service.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,15 @@ spec:
8484
nodePort: {{ .Values.controller.service.nodePorts.stat }}
8585
{{- end }}
8686
{{- end }}
87+
{{- if .Values.controller.service.enablePorts.admin }}
88+
- name: admin
89+
port: {{ .Values.controller.service.ports.admin }}
90+
protocol: TCP
91+
targetPort: {{ .Values.controller.service.targetPorts.admin }}
92+
{{- if .Values.controller.service.nodePorts.admin }}
93+
nodePort: {{ .Values.controller.service.nodePorts.admin }}
94+
{{- end }}
95+
{{- end }}
8796
{{- range .Values.controller.service.tcpPorts }}
8897
- name: {{ .name | trunc 15 | trimSuffix "-" }}
8998
port: {{ .port }}

kubernetes-ingress/values.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ controller:
121121
http: 8080
122122
https: 8443
123123
stat: 1024
124+
admin: 6060
124125

125126
## Controller Container liveness/readiness probe configuration
126127
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
@@ -401,13 +402,15 @@ controller:
401402
# http: 31080
402403
# https: 31443
403404
# stat: 31024
405+
# admin: 31060
404406

405407
## Service ports to use for http, https and stat
406408
## ref: https://kubernetes.io/docs/concepts/services-networking/service/
407409
ports:
408410
http: 80
409411
https: 443
410412
stat: 1024
413+
admin: 6060
411414

412415
## The controller service ports for http, https and stat can be disabled by
413416
## setting below to false - this could be useful when only deploying haproxy
@@ -418,7 +421,7 @@ controller:
418421
https: true
419422
quic: true
420423
stat: true
421-
prometheus: true
424+
admin: true
422425

423426
## Target port mappings for http, https and stat
424427
## ref: https://kubernetes.io/docs/concepts/services-networking/service/
@@ -427,6 +430,7 @@ controller:
427430
https: https
428431
quic: quic
429432
stat: stat
433+
admin: admin
430434

431435
## Additional tcp ports to expose
432436
## This is especially useful for TCP services:

0 commit comments

Comments
 (0)