Forráskód Böngészése

syncthing/enterprise: update test train (#1988)

Stavros Kois 1 éve
szülő
commit
0d20738ece

+ 3 - 3
library/ix-dev/test/syncthing/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../../../common
-  version: 1.1.1
-digest: sha256:a7dbe3e4d42dbcd4325776e5e01a1d630c7f185f79e7ebf22b1b9cc80f56eed7
-generated: "2023-09-04T19:34:56.105136152+03:00"
+  version: 1.2.6
+digest: sha256:956cef64e364b567d2e5327a00e60b68f3ef765e003d6c35afc143bb81ecc26b
+generated: "2024-01-02T19:23:50.344200237+02:00"

+ 4 - 4
library/ix-dev/test/syncthing/Chart.yaml

@@ -3,9 +3,9 @@ description: Syncthing is a continuous file synchronization program.
 annotations:
   title: Syncthing
 type: application
-version: 1.0.13
+version: 1.1.5
 apiVersion: v2
-appVersion: '1.23.3'
+appVersion: '1.27.0'
 kubeVersion: '>=1.16.0-0'
 maintainers:
   - name: truenas
@@ -14,9 +14,9 @@ maintainers:
 dependencies:
   - name: common
     repository: file://../../../common
-    version: 1.1.1
+    version: 1.2.6
 home: https://syncthing.net/
-icon: https://syncthing.net/img/logo-horizontal.svg
+icon: https://media.sys.truenas.net/apps/syncthing/icons/icon.svg
 sources:
   - https://syncthing.net/
   - https://github.com/syncthing/syncthing

BIN
library/ix-dev/test/syncthing/charts/common-1.1.1.tgz


BIN
library/ix-dev/test/syncthing/charts/common-1.2.6.tgz


+ 5 - 2
library/ix-dev/test/syncthing/item.yaml

@@ -1,8 +1,11 @@
-icon_url: https://syncthing.net/img/logo-horizontal.svg
+icon_url: https://media.sys.truenas.net/apps/syncthing/icons/icon.svg
 categories:
   - storage
 screenshots:
-  - https://syncthing.net/img/screenshot.png
+  - https://media.sys.truenas.net/apps/syncthing/screenshots/screenshot1.png
+  - https://media.sys.truenas.net/apps/syncthing/screenshots/screenshot2.png
+  - https://media.sys.truenas.net/apps/syncthing/screenshots/screenshot3.png
+  - https://media.sys.truenas.net/apps/syncthing/screenshots/screenshot4.png
 tags:
   - sync
   - file-sharing

+ 72 - 2
library/ix-dev/test/syncthing/questions.yaml

@@ -31,6 +31,74 @@ questions:
       $ref:
         - definitions/timezone
 
+  - variable: syncthingConfig
+    label: ""
+    group: Syncthing Configuration
+    schema:
+      type: dict
+      attrs:
+        # Boolean flags are currently
+        # not exposed to the user
+        - variable: natTraversal
+          label: NAT Traversal
+          schema:
+            type: boolean
+            default: false
+            hidden: true
+        - variable: localDiscovery
+          label: Local Discovery
+          schema:
+            type: boolean
+            default: false
+            hidden: true
+        - variable: globalDiscovery
+          label: Global Discovery
+          schema:
+            type: boolean
+            default: false
+            hidden: true
+        - variable: telemetry
+          label: Telemetry
+          schema:
+            type: boolean
+            default: false
+            hidden: true
+        - variable: relaying
+          label: Relaying
+          schema:
+            type: boolean
+            default: false
+            hidden: true
+        - variable: announceLANAddresses
+          label: Announce LAN Addresses
+          schema:
+            type: boolean
+            default: false
+            hidden: true
+
+        - variable: additionalEnvs
+          label: Additional Environment Variables
+          description: Configure additional environment variables for Syncthing.
+          schema:
+            type: list
+            default: []
+            items:
+              - variable: env
+                label: Environment Variable
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: name
+                      label: Name
+                      schema:
+                        type: string
+                        required: true
+                    - variable: value
+                      label: Value
+                      schema:
+                        type: string
+                        required: true
+
   - variable: syncthingID
     label: ""
     group: User and Group Configuration
@@ -131,6 +199,7 @@ questions:
                 schema:
                   type: string
                   required: true
+                  immutable: true
                   default: "ixVolume"
                   enum:
                     - value: "hostPath"
@@ -155,7 +224,6 @@ questions:
                   show_if: [["type", "=", "hostPath"]]
                   immutable: true
                   required: true
-
         - variable: additionalStorages
           label: Additional Storage
           description: Additional storage for Syncthing.
@@ -176,11 +244,13 @@ questions:
                     - variable: type
                       label: Type
                       description: |
-                        Host Path: Is a path that already exists on the system.
+                        Host Path: Is a path that already exists on the system.</br>
+                        SMB Share: Mounts a persistent volume claim to a SMB share.
                       schema:
                         type: string
                         required: true
                         default: "hostPath"
+                        immutable: true
                         enum:
                           - value: "hostPath"
                             description: Host Path (Path that already exists on the system)

+ 2 - 1
library/ix-dev/test/syncthing/templates/_configure.tpl

@@ -26,7 +26,7 @@ configmap:
         done
 
         function setConfig() {
-          syncthing cli --home "$configDir" config $@
+          syncthing cli --home "$configDir" config "$@"
         }
 
         # Now we can use the syncthing cli (wrapper around the API) to set the defaults.
@@ -50,6 +50,7 @@ configmap:
         setConfig defaults folder send-xattrs set -- 1
         setConfig defaults folder sync-xattrs set -- 1
         setConfig defaults folder ignore-perms set -- 1
+        setConfig defaults folder path set -- ""
   syncthing-truenas-logo:
     enabled: true
     data:

+ 7 - 0
library/ix-dev/test/syncthing/templates/_syncthing.tpl

@@ -40,6 +40,13 @@ workload:
             STNOUPGRADE: "true"
           fixedEnv:
             PUID: {{ .Values.syncthingID.user }}
+          {{ with .Values.syncthingConfig.additionalEnvs }}
+          envList:
+            {{ range $env := . }}
+            - name: {{ $env.name }}
+              value: {{ $env.value }}
+            {{ end }}
+          {{ end }}
           probes:
             liveness:
               enabled: true

+ 4 - 3
library/ix-dev/test/syncthing/values.yaml

@@ -1,6 +1,6 @@
 image:
   repository: syncthing/syncthing
-  tag: '1.23.3'
+  tag: '1.27.0'
   pullPolicy: IfNotPresent
 
 resources:
@@ -8,9 +8,10 @@ resources:
     cpu: 4000m
     memory: 8Gi
 
-# Currently not exposed in the UI
-# But can be exposed in the future
 syncthingConfig:
+  additionalEnvs: []
+  # Currently not exposed in the UI
+  # But can be exposed in the future
   natTraversal: false
   localDiscovery: false
   globalDiscovery: false