feat(rustdesk-server): update home URL and version to 0.0.2

Signed-off-by: rohow <[email protected]>

README.md

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

charts/rustdesk-server/Chart.yaml

@@ -0,0 +1,14 @@
+apiVersion: v2
+name: rustdesk-server
+description: RustDesk Server Helm Chart
+home: https://devcm-repo.github.io/helm-charts/
+sources:
+  - https://github.com/devcm-repo/helm-charts
+maintainers:
+  - name: dev.cm
+    email: [email protected]
+    url: https://github.com/devcm-repo
+icon: https://rustdesk.com/favicon.ico
+version: 0.0.2
+appVersion: latest
+

charts/rustdesk-server/templates/deployment.yml

@@ -0,0 +1,90 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: "{{ .Release.Name }}-{{ .Chart.Name }}"
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      app: "{{ .Release.Name }}-{{ .Chart.Name }}"
+  template:
+    metadata:
+      labels:
+        app: "{{ .Release.Name }}-{{ .Chart.Name }}"
+    spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+        {{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: "{{ .Release.Name }}-{{ .Chart.Name }}"
+          image: "{{ .Values.image.name }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: api
+              containerPort: 21114
+              protocol: TCP
+            - name: websocket-id
+              containerPort: 21118
+              protocol: TCP
+            - name: websocket-relay
+              containerPort: 21119
+              protocol: TCP
+            - name: signal
+              containerPort: 21115
+              hostPort: {{ .Values.rustdeskServer.ports.signal }}
+              protocol: TCP
+            - name: id
+              containerPort: 21116
+              hostPort: {{ .Values.rustdeskServer.ports.id }}
+              protocol: TCP
+            - name: id-udp
+              containerPort: 21116
+              hostPort: {{ .Values.rustdeskServer.ports.id }}
+              protocol: UDP
+            - name: relay
+              containerPort: 21117
+              hostPort: {{ .Values.rustdeskServer.ports.relay }}
+              protocol: TCP
+          env:
+            - name: ENCRYPTED_ONLY
+              value: "{{ if .Values.rustdeskServer.encryptedOnly }}1{{ else }}0{{ end }}"
+            - name: MUST_LOGIN
+              value: "{{ if .Values.rustdeskServer.mustLogin }}Y{{ else }}N{{ end }}"
+            - name: RELAY
+              value: "{{ .Values.rustdeskServer.server }}:{{ .Values.rustdeskServer.ports.relay }}"
+            - name: RUSTDESK_API_RUSTDESK_ID_SERVER
+              value: "{{ .Values.rustdeskApi.server }}"
+            - name: RUSTDESK_API_RUSTDESK_RELAY_SERVER
+              value: "{{ .Values.rustdeskApi.server }}"
+            - name: RUSTDESK_API_RUSTDESK_API_SERVER
+              value: "https://{{ .Values.rustdeskApi.server }}"
+            {{- if .Values.rustdeskServer.extraEnvs }}
+            {{- range .Values.rustdeskServer.extraEnvs }}
+            - name: {{ .name }}
+              value: "{{ .value }}"
+            {{- end }}
+            {{- end }}
+          volumeMounts:
+            - name: data
+              mountPath: /data
+              subPath: server
+            - name: data
+              mountPath: /app/data
+              subPath: api
+
+      volumes:
+        - name: data
+        {{- if .Values.persistence.enabled }}
+          persistentVolumeClaim:
+            claimName: "{{ .Release.Name }}-{{ .Chart.Name }}-data"
+        {{- else }}
+          emptyDir: {}
+        {{- end }}
+

charts/rustdesk-server/templates/ingress.yaml

@@ -0,0 +1,39 @@
+{{- if .Values.rustdeskApi.ingress.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: "{{ .Release.Name }}-{{ .Chart.Name }}"
+  annotations:
+    {{- if .Values.rustdeskApi.ingress.annotations }}
+    {{- toYaml .Values.rustdeskApi.ingress.annotations | nindent 4 }}
+    {{- end }}
+spec:
+  {{- if .Values.rustdeskApi.ingress.className }}
+  ingressClassName: {{ .Values.rustdeskApi.ingress.className }}
+  {{- end }}
+  rules:
+    - host: {{ .Values.rustdeskApi.ingress.host }}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: "{{ .Release.Name }}-{{ .Chart.Name }}"
+                port:
+                  number: {{ .Values.rustdeskApi.ports.api }}
+          - path: /ws/id
+            pathType: Prefix
+            backend:
+              service:
+                name: "{{ .Release.Name }}-{{ .Chart.Name }}"
+                port:
+                  number: {{ .Values.rustdeskApi.ports.websocketId }}
+          - path: /ws/relay
+            pathType: Prefix
+            backend:
+              service:
+                name: "{{ .Release.Name }}-{{ .Chart.Name }}"
+                port:
+                  number: {{ .Values.rustdeskApi.ports.websocketRelay }}
+{{- end }}

charts/rustdesk-server/templates/pvc.yml

@@ -0,0 +1,15 @@
+{{- if .Values.persistence.enabled }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: "{{ .Release.Name }}-{{ .Chart.Name }}-data"
+spec:
+  accessModes:
+    - {{ .Values.persistence.data.accessMode }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.data.size }}
+  {{- if .Values.persistence.data.storageClass }}
+  storageClassName: {{ .Values.persistence.data.storageClass }}
+  {{- end }}
+{{- end }}

charts/rustdesk-server/templates/service.yml

@@ -0,0 +1,24 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: "{{ .Release.Name }}-{{ .Chart.Name }}"
+  {{- if not (empty .Values.rustdeskApi.service.annotations) }}
+  annotations: {{- toYaml .Values.rustdeskApi.service.annotations | nindent 4 }}
+  {{- end }}
+spec:
+  type: "{{ .Values.rustdeskApi.service.type }}"
+  selector:
+    app: "{{ .Release.Name }}-{{ .Chart.Name }}"
+  ports:
+    - name: api
+      port: {{ .Values.rustdeskApi.ports.api }}
+      targetPort: 21114
+      protocol: TCP
+    - name: websocket-id
+      port: {{ .Values.rustdeskApi.ports.websocketId }}
+      targetPort: 21118
+      protocol: TCP
+    - name: websocket-relay
+      port: {{ .Values.rustdeskApi.ports.websocketRelay }}
+      targetPort: 21119
+      protocol: TCP

charts/rustdesk-server/values.yaml

@@ -0,0 +1,39 @@
+image:
+  name: lejianwen/rustdesk-server-s6
+  tag: latest
+  pullPolicy: IfNotPresent
+
+nodeSelector: {}
+
+affinity: {}
+
+persistence:
+  enabled: true
+  data:
+    storageClass: ""
+    size: 2Gi
+    accessMode: ReadWriteOnce
+
+rustdeskServer:
+  encryptedOnly: true
+  mustLogin: false
+  server: "rustdesk-relay.example.com"
+  ports:
+    signal: 21115
+    id: 21116
+    relay: 21117
+
+rustdeskApi:
+  server: "rustdesk-api.example.com"
+  ports:
+    api: 21114
+    websocketId: 21118
+    websocketRelay: 21119
+  service:
+    type: ClusterIP
+    annotations: {}
+  ingress:
+    enabled: true
+    className: ""
+    host: "rustdesk-api.example.com"
+    annotations: {}

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.7
-appVersion: 1.44.0
+appVersion: 1.82.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,14 @@ 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` |
+| `hostNetwork` | This service will be disabled when hostNetwork is enableds. | `false` |
 | `nodeSelector` | A map/dict of Kubernetes Pod nodeSelector node labels. | `{}` |
+| `extraVolumes` | Extra volumes to add to the deployment. | `[]` |
+| `extraVolumeMounts` | Extra volume mounts to add to the container. Normally used with `extraVolumes`. | `[]` |
 | `affinity` | A map/dict of Kubernetes Pod affinity rules. | `{}` |
+| `derp.hostname` | Derp server hostname. | `'derp.examples.com'` |
+| `derp.verify_clients` | Derp server will enable authentication. | `true` |
+| `derp.certdir` | Start a derper with your own certificate. | `` |
+| `derp.http_port` | The port on which to serve HTTP. Set to -1 to disable. | `80` |
+| `derp.https_port` | The port on which to serve HTTPS. | `443` |
+| `derp.stun_port` | The UDP port on which to serve STUN. | `3478` |

charts/tailscale-derp/templates/deployment.yml

@@ -14,18 +14,63 @@ spec:
       labels:
         app: "{{ .Release.Name }}-{{ .Chart.Name }}"
     spec:
-      {{- if not (empty .Values.nodeSelector) }}
+      {{- if .Values.nodeSelector }}
-      nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }}
+      nodeSelector:
+        {{- toYaml .Values.nodeSelector | nindent 8 }}
       {{- end }}
-      {{- if not (empty .Values.affinity) }}
+      {{- if .Values.affinity }}
-      affinity: {{- toYaml .Values.affinity | nindent 8 }}
+      affinity:
+        {{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
+      {{ - if .Values.hostNetwork }}
+      hostNetwork: true
       {{ - end }}
       containers:
         - name: "{{ .Release.Name }}-{{ .Chart.Name }}"
           image: "{{ .Values.image.name }}:v{{ .Chart.AppVersion }}"
           ports:
-        - containerPort: 80
+            {{- if gt (int .Values.derp.http_port) -1 }}
-        - containerPort: 443
+            - name: http
-        - containerPort: 3478
+              hostPort: {{ .Values.derp.http_port }}
+              containerPort: {{ .Values.derp.http_port }}
+              protocol: TCP
+            {{- end }}
+            - name: https
+              hostPort: {{ .Values.derp.https_port }}
+              containerPort: {{ .Values.derp.https_port }}
+              protocol: TCP
+            - name: stun
+              hostPort: {{ .Values.derp.stun_port }}
+              containerPort: {{ .Values.derp.stun_port }}
+              protocol: UDP
           args:
-        - "--hostname={{ .Values.hostname }}"
+            - "--hostname={{ .Values.derp.hostname }}"
+            - "--verify-clients={{ .Values.derp.verify_clients }}"
+            {{- if .Values.derp.certdir }}
+            - "--certmode=manual"
+            - "--certdir={{ .Values.derp.certdir }}"
+            {{- end }}
+            {{- if .Values.derp.http_port }}
+            - "--http-port={{ .Values.derp.http_port }}"
+            {{- end }}
+            {{- if .Values.derp.https_port }}
+            - "--a=:{{ .Values.derp.https_port }}"
+            {{- end }}
+            {{- if .Values.derp.stun_port }}
+            - "--stun-port={{ .Values.derp.stun_port }}"
+            {{- end }}
+          volumeMounts:
+            {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
+            {{- if .Values.derp.verify_clients }}
+            - mountPath: /var/run/tailscale/tailscaled.sock
+              name: tailscale-socket
+            {{- end }}
+      volumes:
+        {{- toYaml .Values.extraVolumes | nindent 8 }}
+        {{- if .Values.derp.verify_clients }}
+        - hostPath:
+            path: /run/tailscale/tailscaled.sock
+            type: Socket
+          name: tailscale-socket
+        {{- end }}
+

charts/tailscale-derp/templates/service.yml

@@ -1,3 +1,4 @@
+{{- if not .Values.hostNetwork }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -10,12 +11,16 @@ spec:
   selector:
     app: "{{ .Release.Name }}-{{ .Chart.Name }}"
   ports:
+    {{- if gt (int .Values.derp.http_port) -1 }}
     - name: http
-    port: 80
+      port: {{ .Values.derp.http_port }}
-    targetPort: 80
+      targetPort: {{ .Values.derp.http_port }}
+    {{- end }}
     - name: https
-    port: 443
+      port: {{ .Values.derp.https_port }}
-    targetPort: 443
+      targetPort: {{ .Values.derp.https_port }}
     - name: stun
-    port: 3478
+      port: {{ .Values.derp.stun_port }}
-    targetPort: 3478
+      targetPort: {{ .Values.derp.stun_port }}
+      protocol: UDP
+{{- end }}

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'
+hostNetwork: false
 
 nodeSelector: {}
+
 affinity: {}
+
+derp:
+  hostname: derp.examples.com
+  verify_clients: false
+  http_port: 80
+  https_port: 443
+  stun_port: 3478

index.yaml

@@ -0,0 +1,2 @@
+apiVersion: v1
+entries: