feat(tailscale): tailscale drep refactoring

README.md

@@ -1,5 +1,8 @@
-helm charts
+## helm charts
 
+```shell
 helm repo add devcm https://devcm-repo.github.io/helm-charts
+```
 
-pgedge
+### charts
+- tailscale-derp

charts/tailscale-derp/Chart.yaml

@@ -1,13 +1,13 @@
 apiVersion: v2
 name: tailscale-derp
 description: Tailscale DERP Relay Server Helm Chart
-home: https://github.com/sspreitzer/helm-tailscale/tree/main/charts/tailscale-derp
+home: https://devcm-repo.github.io/helm-charts/
 sources:
-  - https://github.com/sspreitzer/helm-tailscale.git
+  - https://github.com/devcm-repo/helm-charts
 maintainers:
   - name: dev.cm
     email: [email protected]
     url: https://github.com/devcm-repo
 icon: https://tailscale.com/files/apple-touch-icon.png
-version: 1.44.0
+version: 0.0.2
-appVersion: 1.44.0
+appVersion: 1.68.0

charts/tailscale-derp/README.md

@@ -5,7 +5,7 @@ This Helm Chart is a Tailscale container deployment for a tailnet relay server (
 ## Installing the Helm Chart
 
 ```shell
-helm repo add tailscale https://spreitzer.ch/helm-tailscale
+helm repo add tailscale https://devcm-repo.github.io/helm-charts
 helm install tailscale-derp tailscale/tailscale-derp
 ```
 
@@ -14,15 +14,10 @@ helm install tailscale-derp tailscale/tailscale-derp
 A working configuration:
 
 ```yaml
-service:
+hostname: derp.dev.cm
-  annotations:
-    service.beta.kubernetes.io/azure-dns-label-name: my-derp-01
-
-hostname: my-derp-01.switzerlandnorth.cloudapp.azure.com
 
 nodeSelector:
-  topology.kubernetes.io/region: switzerlandnorth
+  topology.kubernetes.io/region: cn-hk
-  topology.kubernetes.io/zone: switzerlandnorth-1
 ```
 
 ## Helm Chart Values
@@ -33,6 +28,9 @@ nodeSelector:
 | `image.pullPolicy` | Kubernetes pullPolicy to use for starting the container image. | `IfNotPresent` |
 | `service.type` | Kubernetes Service type. | `LoadBalancer` |
 | `service.annotations` | A map/dict of Kubernetes Service annotations. | `{}` |
-| `hostname` | DERP hostname to use. Must be the same as of the derpMap in the tailnet ACL. | `derp.example.com` |
 | `nodeSelector` | A map/dict of Kubernetes Pod nodeSelector node labels. | `{}` |
 | `affinity` | A map/dict of Kubernetes Pod affinity rules. | `{}` |
+| `tailscale.hostname` | Tailscale hostname | `Release.Name` |
+| `tailscale.auth_key` | Tailscale auth_key | `''` |
+| `drep.hostname` | Derp server hostname | `'derp.examples.com'` |
+| `drep.verify_clients` | Derp server will enable authentication | `true` |

charts/tailscale-derp/templates/deployment.yml

@@ -21,11 +21,20 @@ spec:
       affinity: {{- toYaml .Values.affinity | nindent 8 }}
       {{- end }}
       containers:
-      - name: "{{ .Release.Name }}-{{ .Chart.Name }}"
+        name: "{{ .Release.Name }}-{{ .Chart.Name }}"
-        image: "{{ .Values.image.name }}:v{{ .Chart.AppVersion }}"
+          image: "{{ .Values.image.name }}:v{{ .Chart.AppVersion }}"
-        ports:
+          ports:
-        - containerPort: 80
+            - containerPort: 80
-        - containerPort: 443
+            - containerPort: 443
-        - containerPort: 3478
+            - containerPort: 3478
-        args:
+          env:
-        - "--hostname={{ .Values.hostname }}"
+            - name: TAILSCALE_HOSTNAME
+              value: "{{ or .Values.tailscale.hostname .Release.Name }}"
+            - name: TAILSCALE_AUTH_KEY
+              value: "{{ .Values.tailscale.auth_key }}"
+            - name: TAILSCALE_DERP_HOSTNAME
+              value: "{{ .Values.drep.hostname }}"
+            - name: TAILSCALE_DERP_ADDR
+              value: "{{ .Values.drep.addr }}"
+            - name: TAILSCALE_DERP_VERIFY_CLIENTS
+              value: "{{ .Values.drep.verify_clients }}"

charts/tailscale-derp/templates/service.yml

@@ -10,12 +10,12 @@ spec:
   selector:
     app: "{{ .Release.Name }}-{{ .Chart.Name }}"
   ports:
-  - name: http
+    - name: http
-    port: 80
+      port: 80
-    targetPort: 80
+      targetPort: 80
-  - name: https
+    - name: https
-    port: 443
+      port: 443
-    targetPort: 443
+      targetPort: 443
-  - name: stun
+    - name: stun
-    port: 3478
+      port: 3478
-    targetPort: 3478
+      targetPort: 3478

charts/tailscale-derp/values.yaml

@@ -1,12 +1,20 @@
 image:
-  name: docker.io/sspreitzer/tailscale-derp
+  name: docker.io/devcm/tailscale-derp
   pullPolicy: IfNotPresent
 
 service:
-  type: LoadBalancer
+  type: ClusterIP
   annotations: {}
 
-hostname: 'derp.example.com'
-
 nodeSelector: {}
+
 affinity: {}
+
+tailscale:
+# hostname: ''
+  auth_key: ''
+
+drep:
+  hostname: derp.examples.com
+# addr: ''
+  verify_clients: true