Update: Refactoring Cloudflare Tunnel chart (#547)

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>

charts/cloudflare-tunnel/Chart.yaml

@@ -3,7 +3,7 @@ apiVersion: v2
 name: cloudflare-tunnel
 description: Creation of a cloudflared deployment - a reverse tunnel for an environment
 type: application
-version: 0.1.0
+version: 0.2.0
 appVersion: "2023.5.1"
 icon: https://www.vectorlogo.zone/logos/cloudflare/cloudflare-icon.svg
 home: https://github.com/nlamirault/portefaix-hub
@@ -33,4 +33,6 @@ annotations:
     url: https://keybase.io/nlamirault/pgp_keys.asc
   artifacthub.io/changes: |
     - kind: added
-      description: Bootstrap chart from Cloudflare chart
+      description: Expose metrics port
+    - kind: fixed
+      description: ServiceMonitor selector labels indentation

charts/cloudflare-tunnel/README.md

@@ -1,6 +1,6 @@
 # cloudflare-tunnel
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2023.5.1](https://img.shields.io/badge/AppVersion-2023.5.1-informational?style=flat-square)
+![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2023.5.1](https://img.shields.io/badge/AppVersion-2023.5.1-informational?style=flat-square)
 
 Creation of a cloudflared deployment - a reverse tunnel for an environment
 
@@ -35,6 +35,7 @@ Creation of a cloudflared deployment - a reverse tunnel for an environment
 | image.repository | string | `"cloudflare/cloudflared"` |  |
 | image.tag | string | `""` |  |
 | imagePullSecrets | list | `[]` |  |
+| metrics.port | int | `2000` | The port on which to expose the metrics and ready endpoints |
 | nameOverride | string | `""` |  |
 | nodeSelector | object | `{}` |  |
 | podAnnotations | object | `{}` |  |

charts/cloudflare-tunnel/templates/configmap.yaml

@@ -13,7 +13,7 @@ data:
     warp-routing:
       enabled: {{ .Values.cloudflare.enableWarp }}
     # Serves the metrics server under /metrics and the readiness server under /ready
-    metrics: 0.0.0.0:2000
+    metrics: 0.0.0.0:{{ .Values.metrics.port }}
     # Specifies the protocol used to establish a connection between cloudflared and the Cloudflare global network
     protocol: {{ default "auto" .Values.cloudflare.protocol }}
     # Autoupdates applied in a k8s pod will be lost when the pod is removed or restarted, so

charts/cloudflare-tunnel/templates/deployment.yaml

@@ -48,10 +48,13 @@ spec:
               # Cloudflared has a /ready endpoint which returns 200 if and only if
               # it has an active connection to the edge.
               path: /ready
-              port: 2000
+              port: {{ .Values.metrics.port }}
             failureThreshold: 1
             initialDelaySeconds: 10
             periodSeconds: 10
+          ports:
+          - containerPort: {{ .Values.metrics.port }}
+            name: http-metrics
           volumeMounts:
             - name: config
               mountPath: /etc/cloudflared/config

charts/cloudflare-tunnel/templates/service.yaml

@@ -7,8 +7,8 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: 2000
-      targetPort: 2000
+    - port: {{ .Values.metrics.port }}
+      targetPort: {{ .Values.metrics.port }}
       protocol: TCP
       name: metrics
   selector:

charts/cloudflare-tunnel/values.yaml

@@ -29,6 +29,10 @@ cloudflare:
     # - hostname: hello.example.com
     #   service: hello_world
 
+metrics:
+  # -- The port on which to expose the metrics and ready endpoints
+  port: 2000
+
 image:
   repository: cloudflare/cloudflared
   pullPolicy: IfNotPresent