feat(pvc): enhance PVC configuration and update chart version to 0.0.6

README.md

@@ -6,3 +6,4 @@ helm repo add devcm https://devcm-repo.github.io/helm-charts
 
 ### charts
 - tailscale-derp
+- rustdesk-server

charts/rustdesk-server/Chart.yaml

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

charts/rustdesk-server/templates/deployment.yml

@@ -65,6 +65,8 @@ spec:
               value: "{{ .Values.rustdeskApi.server }}"
             - name: RUSTDESK_API_RUSTDESK_API_SERVER
               value: "https://{{ .Values.rustdeskApi.server }}"
+            - name : RUSTDESK_API_RUSTDESK_WS_HOST
+              value: "wss://{{ .Values.rustdeskApi.server }}"
             {{- if .Values.rustdeskServer.extraEnvs }}
             {{- range .Values.rustdeskServer.extraEnvs }}
             - name: {{ .name }}

charts/rustdesk-server/templates/ingress.yaml

@@ -28,12 +28,12 @@ spec:
               service:
                 name: "{{ .Release.Name }}-{{ .Chart.Name }}"
                 port:
-                  number: {{ .Values.rustdeskApi.ports.websocketId }}
+                  number: {{ .Values.rustdeskServer.ports.websocketId }}
           - path: /ws/relay
             pathType: Prefix
             backend:
               service:
                 name: "{{ .Release.Name }}-{{ .Chart.Name }}"
                 port:
-                  number: {{ .Values.rustdeskApi.ports.websocketRelay }}
+                  number: {{ .Values.rustdeskServer.ports.websocketRelay }}
 {{- end }}

charts/rustdesk-server/templates/pvc.yml

@@ -1,8 +1,16 @@
 {{- if .Values.persistence.enabled }}
+{{- $pvcName := printf "%s-%s-data" .Release.Name .Chart.Name }}
+{{- if or (not .Values.persistence.checkExisting) (not (lookup "v1" "PersistentVolumeClaim" .Release.Namespace $pvcName)) }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: "{{ .Release.Name }}-{{ .Chart.Name }}-data"
+  name: {{ $pvcName }}
+  {{- if .Values.persistence.data.annotations }}
+  annotations:
+    {{- range $key, $value := .Values.persistence.data.annotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.data.accessMode }}
@@ -13,3 +21,4 @@ spec:
   storageClassName: {{ .Values.persistence.data.storageClass }}
   {{- end }}
 {{- end }}
+{{- end }}

charts/rustdesk-server/templates/service.yml

@@ -15,10 +15,10 @@ spec:
       targetPort: 21114
       protocol: TCP
     - name: websocket-id
-      port: {{ .Values.rustdeskApi.ports.websocketId }}
+      port: {{ .Values.rustdeskServer.ports.websocketId }}
       targetPort: 21118
       protocol: TCP
     - name: websocket-relay
-      port: {{ .Values.rustdeskApi.ports.websocketRelay }}
+      port: {{ .Values.rustdeskServer.ports.websocketRelay }}
       targetPort: 21119
       protocol: TCP

charts/rustdesk-server/values.yaml

@@ -9,26 +9,29 @@ affinity: {}
 
 persistence:
   enabled: true
+  checkExisting: true
   data:
     storageClass: ""
     size: 2Gi
     accessMode: ReadWriteOnce
+    annotations:
+      helm.sh/resource-policy: keep
 
 rustdeskServer:
   encryptedOnly: true
   mustLogin: false
-  server: "rustdesk-relay.example.com"
+  server: "rustdesk-server.example.com"
   ports:
     signal: 21115
     id: 21116
     relay: 21117
+    websocketId: 21118
+    websocketRelay: 21119
 
 rustdeskApi:
   server: "rustdesk-api.example.com"
   ports:
     api: 21114
-    websocketId: 21118
-    websocketRelay: 21119
   service:
     type: ClusterIP
     annotations: {}

charts/tailscale-derp/Chart.yaml

@@ -9,5 +9,5 @@ maintainers:
     email: admin@dev.cm
     url: https://github.com/devcm-repo
 icon: https://tailscale.com/files/apple-touch-icon.png
-version: 0.0.6
+version: 0.0.7
 appVersion: 1.82.0