wip

Docker/Dockerfile

@@ -11,6 +11,7 @@ WORKDIR /app
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY --from=builder /go/bin/derper .
+COPY --from=builder /go/bin/derpprobe .
 COPY Docker/entrypoint.sh /app/entrypoint.sh
 
 RUN apt-get update && \

chart/tailscale-derp/templates/cert.yaml

@@ -7,9 +7,9 @@ metadata:
   name: {{ .Release.Name }}-cert
   namespace: {{ .Release.Namespace }}
 spec:
-  commonName: '{{ (.Values.tls).domain }}'
+  commonName: '{{ tpl ((.Values.tls).domain) . }}'
   dnsNames:
-  - '{{ (.Values.tls).domain }}'
+  - '{{ tpl ((.Values.tls).domain) . }}'
   issuerRef:
     kind: ClusterIssuer
     name: {{ (.Values.tls).clusterIssuer | default "letsencrypt-prod" }}

chart/tailscale-derp/templates/deployment.yaml

@@ -5,6 +5,8 @@ metadata:
   labels:
     {{- include "tailscale-derp.labels" . | nindent 4 }}
 spec:
+  strategy:
+    type: Recreate
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
@@ -19,8 +21,6 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
-      strategy:
-        type: Recreate
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

chart/tailscale-derp/templates/service.yaml

@@ -6,7 +6,7 @@ metadata:
   name: {{ include "tailscale-derp.fullname" . }}
   labels:
     {{- include "tailscale-derp.labels" . | nindent 4 }}
-  annotations: {{- ((.Values).service).annotations | toYaml | nindent 4}}
+  annotations: {{- tpl (((.Values).service).annotations | toYaml ) . | nindent 4}}
 spec:
   internalTrafficPolicy: {{ .Values.service.internalTrafficPolicy }}
   externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
@@ -26,7 +26,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  annotations: {{- (((.Values).service).directAttach).annotations | toYaml | nindent 4}}
+  annotations: {{- tpl ((((.Values).service).directAttach).annotations | toYaml) . | nindent 4}}
   labels:
     {{- include "tailscale-derp.labels" . | nindent 4 }}
   name: {{ include "tailscale-derp.fullname" . }}-direct