feat(deployment): add pod annotations support and update chart version to 0.0.10

charts/rustdesk-server/Chart.yaml

@@ -9,6 +9,5 @@ maintainers:
     email: admin@dev.cm
     url: https://github.com/devcm-repo
 icon: https://rustdesk.com/favicon.ico
-version: 0.0.4
+version: 0.0.7
 appVersion: latest
-

charts/rustdesk-server/templates/deployment.yml

@@ -11,6 +11,10 @@ spec:
       app: "{{ .Release.Name }}-{{ .Chart.Name }}"
   template:
     metadata:
+      annotations:
+        {{- if .Values.rustdeskServer.podAnnotations }}
+        {{- toYaml .Values.rustdeskServer.podAnnotations | nindent 8 }}
+        {{- end }}
       labels:
         app: "{{ .Release.Name }}-{{ .Chart.Name }}"
     spec:

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/values.yaml

@@ -9,10 +9,13 @@ affinity: {}
 
 persistence:
   enabled: true
+  checkExisting: true
   data:
     storageClass: ""
     size: 2Gi
     accessMode: ReadWriteOnce
+    annotations:
+      helm.sh/resource-policy: keep
 
 rustdeskServer:
   encryptedOnly: true

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.7
-appVersion: 1.82.0
+version: 0.0.10
+appVersion: v1.90.6

charts/tailscale-derp/templates/deployment.yml

@@ -11,6 +11,10 @@ spec:
       app: "{{ .Release.Name }}-{{ .Chart.Name }}"
   template:
     metadata:
+      annotations:
+        {{- if .Values.podAnnotations }}
+        {{- toYaml .Values.podAnnotations | nindent 8 }}
+        {{- end }}
       labels:
         app: "{{ .Release.Name }}-{{ .Chart.Name }}"
     spec:
@@ -22,12 +26,12 @@ spec:
       affinity:
         {{- toYaml .Values.affinity | nindent 8 }}
       {{- end }}
-      {{ - if .Values.hostNetwork }}
+      {{- if .Values.hostNetwork }}
       hostNetwork: true
-      {{ - end }}
+      {{- end }}
       containers:
         - name: "{{ .Release.Name }}-{{ .Chart.Name }}"
-          image: "{{ .Values.image.name }}:v{{ .Chart.AppVersion }}"
+          image: "{{ .Values.image.name }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           ports:
             {{- if gt (int .Values.derp.http_port) -1 }}
             - name: http