RELEASE/MAJOR: kubernetes-ingress: Tag release 1.33.0

Changes in kubernetes-ingress:
- Use Ingress Controller 1.10.7 version for base image
- Enable new Prometheus endpoint on tcp/6060 by default

Author: dkorunic

kubernetes-ingress/Chart.yaml

@@ -16,8 +16,8 @@ apiVersion: v2
 name: kubernetes-ingress
 description: A Helm chart for HAProxy Kubernetes Ingress Controller
 type: application
-version: 1.32.4
-appVersion: 1.10.6
+version: 1.33.0
+appVersion: 1.10.7
 kubeVersion: ">=1.22.0-0"
 keywords:
   - ingress
@@ -32,4 +32,5 @@ maintainers:
 engine: gotpl
 annotations:
   artifacthub.io/changes: |
-    - Use Ingress Controller 1.10.6 version for base image
+    - Use Ingress Controller 1.10.7 version for base image
+    - Enable new Prometheus endpoint on tcp/6060 by default

kubernetes-ingress/templates/controller-daemonset.yaml

@@ -112,6 +112,9 @@ spec:
 {{- if .Values.controller.logging.level }}
           - --log={{ .Values.controller.logging.level }}
 {{- end }}
+{{- if .Values.controller.service.enablePorts.prometheus }}
+          - --prometheus
+{{- end }}
 {{- range .Values.controller.extraArgs }}
           - {{ . }}
 {{- end }}

kubernetes-ingress/templates/controller-deployment.yaml

@@ -113,6 +113,9 @@ spec:
 {{- if .Values.controller.logging.level }}
           - --log={{ .Values.controller.logging.level }}
 {{- end }}
+{{- if .Values.controller.service.enablePorts.prometheus }}
+          - --prometheus
+{{- end }}
 {{- range .Values.controller.extraArgs }}
           - {{ . }}
 {{- end }}

kubernetes-ingress/templates/controller-service.yaml

@@ -76,6 +76,15 @@ spec:
       nodePort: {{ .Values.controller.service.nodePorts.stat }}
     {{- end }}
   {{- end }}
+  {{- if .Values.controller.service.enablePorts.prometheus }}
+    - name: prometheus
+      port: {{ .Values.controller.service.ports.prometheus }}
+      protocol: TCP
+      targetPort: {{ .Values.controller.service.targetPorts.prometheus }}
+    {{- if .Values.controller.service.nodePorts.prometheus }}
+      nodePort: {{ .Values.controller.service.nodePorts.prometheus }}
+    {{- end }}
+  {{- end }}
   {{- range .Values.controller.service.tcpPorts }}
     - name: {{ .name }}-tcp
       port: {{ .port }}

kubernetes-ingress/values.yaml

@@ -375,13 +375,15 @@ controller:
     #  http: 31080
     #  https: 31443
     #  stat: 31024
+    #  prometheus: 36060
 
     ## Service ports to use for http, https and stat
     ## ref: https://kubernetes.io/docs/concepts/services-networking/service/
     ports:
       http: 80
       https: 443
       stat: 1024
+      prometheus: 6060
 
     ## The controller service ports for http, https and stat can be disabled by
     ## setting below to false - this could be useful when only deploying haproxy
@@ -391,13 +393,15 @@ controller:
       http: true
       https: true
       stat: true
+      prometheus: true
 
     ## Target port mappings for http, https and stat
     ## ref: https://kubernetes.io/docs/concepts/services-networking/service/
     targetPorts:
       http: http
       https: https
       stat: stat
+      prometheus: prometheus
 
     ## Additional tcp ports to expose
     ## This is especially useful for TCP services: