fix(charts): fix template with metrics port enabled

Author: pascaliske

charts/cloudflared/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 type: application
 name: cloudflared
 description: A Helm chart for cloudflared DNS over HTTPS tunnel.
-version: 0.0.3
+version: 0.0.4
 appVersion: "2021.8.7"

charts/cloudflared/templates/deployment.yaml

@@ -34,15 +34,15 @@ spec:
             {{- if $val.enabled }}
             - name: {{ $key | quote }}
               containerPort: {{ $val.port }}
-              protocol: {{ $val.protocol | default "TCP" }}
+              protocol: {{ default "TCP" $val.protocol | quote }}
             {{- end }}
             {{- end }}
           env:
             {{- range $i, $val := .Values.env }}
             - name: {{ $val.name | quote }}
               value: {{ $val.value | quote }}
             {{- end }}
-          {{- if .Values.ports.metrics.enabled -}}
+          {{- if and .Values.ports.metrics .Values.ports.metrics.enabled }}
           livenessProbe:
             httpGet:
               path: /metrics

charts/cloudflared/templates/service.yaml

@@ -20,7 +20,7 @@ spec:
     - name: {{ $key | quote }}
       port: {{ $val.port }}
       targetPort: {{ $key | quote }}
-      protocol: {{ $val.protocol | default "TCP" }}
+      protocol: {{ default "TCP" $val.protocol | quote }}
     {{- end }}
     {{- end }}
   selector:

charts/cloudflared/templates/tests/test-connection.yaml

@@ -11,5 +11,5 @@ spec:
     - name: wget
       image: busybox
       command: ['wget']
-      args: ['{{ include "cloudflared.fullname" . }}:{{ .Values.ports.dns.port }}']
+      args: ['{{ include "cloudflared.fullname" . }}:{{ .Values.ports.metrics.port }}']
   restartPolicy: Never