Merge pull request #27 from truenas/ui-changes

Update charts to make sure they render nicely with dynamic chart release forms
2026-02-13 23:35:36 +08:00 · 2021-01-28 18:35:01 +05:00
parent 95e89114b5 06a75d2c16
commit acbbe63c11
41 changed files with 97 additions and 103 deletions
--- a/test/ipfs/1.0.1/.helmignore
+++ b/test/ipfs/1.0.1/.helmignore
--- a/test/ipfs/1.0.1/Chart.yaml
+++ b/test/ipfs/1.0.1/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Global, Versioned, peer-to-peer filesystem.
 name: ipfs
-version: 1.0.0
+version: 1.0.1
 appVersion: master
 keywords:
 - storage
--- a/test/ipfs/1.0.1/README.md
+++ b/test/ipfs/1.0.1/README.md
--- a/test/ipfs/1.0.1/app-readme.md
+++ b/test/ipfs/1.0.1/app-readme.md
--- a/test/ipfs/1.0.1/questions.yaml
+++ b/test/ipfs/1.0.1/questions.yaml
@@ -83,12 +83,10 @@ questions:
                label: "Name"
                schema:
                  type: string
-                  required: true
              - variable: value
                label: "Value"
                schema:
                  type: string
-                  required: true

  - variable: service
    description: "IPFS Service Configuration"
@@ -102,7 +100,7 @@ questions:
          label: "Swarm Port to use for IPFS (Public)"
          schema:
            type: int
-            min: 4000
+            min: 9000
            max: 65535
            default: 9401
            required: true
@@ -110,7 +108,7 @@ questions:
          label: "API Port to use for IPFS (local)"
          schema:
            type: int
-            min: 4000
+            min: 9000
            max: 65535
            default: 9501
            required: true
@@ -118,7 +116,7 @@ questions:
          label: "Gateway Port to use for IPFS (local)"
          schema:
            type: int
-            min: 4000
+            min: 9000
            max: 65535
            default: 9880
            required: true
@@ -138,7 +136,7 @@ questions:
            type: hostpath

  - variable: ipfsDataVolume
-    label: "Configure iXVolume"
+    label: "IPFS Data Volume Defaults"
    group: "Storage"
    schema:
      type: dict
@@ -154,7 +152,7 @@ questions:
            editable: false
            default: "/data/ipfs"
        - variable: datasetName
-          label: "Dataset Name"
+          label: "IPFS Data Dataset Name"
          schema:
            type: string
            default: "ix-ipfs-data"
@@ -174,7 +172,7 @@ questions:
            type: hostpath

  - variable: ipfsStagingVolume
-    label: "Configure iXVolume"
+    label: "IPFS Staging Volume Defaults"
    group: "Storage"
    schema:
      type: dict
@@ -190,7 +188,7 @@ questions:
            editable: false
            default: "/export"
        - variable: datasetName
-          label: "Dataset Name"
+          label: "IPFS Staging Dataset Name"
          schema:
            type: string
            default: "ix-ipfs-staging"
--- a/test/ipfs/1.0.1/templates/NOTES.txt
+++ b/test/ipfs/1.0.1/templates/NOTES.txt
--- a/test/ipfs/1.0.1/templates/_helpers.tpl
+++ b/test/ipfs/1.0.1/templates/_helpers.tpl
--- a/test/ipfs/1.0.1/templates/_storage.tpl
+++ b/test/ipfs/1.0.1/templates/_storage.tpl
--- a/test/ipfs/1.0.1/templates/deployment.yaml
+++ b/test/ipfs/1.0.1/templates/deployment.yaml
@@ -103,10 +103,17 @@ spec:
              containerPort: 9501
            - name: gateway
              containerPort: 9880
-            {{- range $key, $val := .Values.environment }}
-            - name: {{ $key }}
-              value: {{ $val | quote }}
+          {{- if .Values.environment }}
+          env:
+            {{- range $envVariable := .Values.environment }}
+            {{- if and $envVariable.name $envVariable.value }}
+            - name: {{ $envVariable.name }}
+              value: {{ $envVariable.value | quote }}
+            {{- else }}
+              {{- fail "Please specify name/value for environment variable" }}
+            {{- end }}
            {{- end}}
+          {{- end }}
      volumes:
        - name: data
        {{- if .Values.emptyDirVolumes }}
--- a/test/ipfs/1.0.1/templates/service.yaml
+++ b/test/ipfs/1.0.1/templates/service.yaml
--- a/test/ipfs/1.0.1/templates/serviceaccount.yaml
+++ b/test/ipfs/1.0.1/templates/serviceaccount.yaml
--- a/test/ipfs/1.0.1/test_values.yaml
+++ b/test/ipfs/1.0.1/test_values.yaml
--- a/test/ipfs/1.0.1/values.yaml
+++ b/test/ipfs/1.0.1/values.yaml
--- a/test/minio/1.0.1/.helmignore
+++ b/test/minio/1.0.1/.helmignore
--- a/test/minio/1.0.1/Chart.yaml
+++ b/test/minio/1.0.1/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: High Performance, Kubernetes Native Object Storage
 name: minio
-version: 1.0.0
+version: 1.0.1
 appVersion: master
 keywords:
 - storage
--- a/test/minio/1.0.1/README.md
+++ b/test/minio/1.0.1/README.md
--- a/test/minio/1.0.1/app-readme.md
+++ b/test/minio/1.0.1/app-readme.md
--- a/test/minio/1.0.1/questions.yaml
+++ b/test/minio/1.0.1/questions.yaml
@@ -81,6 +81,7 @@ questions:
  - variable: accessKey
    label: "Access Key"
    group: "Minio Configuration"
+    description: "Enter the S3 access ID"
    schema:
      type: string
      private: true
@@ -91,6 +92,7 @@ questions:
  - variable: secretKey
    label: "Secret Key"
    group: "Minio Configuration"
+    description: "Enter the S3 secret access key"
    schema:
      type: string
      private: true
@@ -102,9 +104,22 @@ questions:
    label: "Minio image environment"
    group: "Minio Configuration"
    schema:
-      type: dict
-      additional_attrs: true
-      attrs: []
+      type: list
+      default: []
+      items:
+        - variable: environmentVariable
+          label: "Environment Variable"
+          schema:
+            type: dict
+            attrs:
+              - variable: name
+                label: "Name"
+                schema:
+                  type: string
+              - variable: value
+                label: "Value"
+                schema:
+                  type: string

  - variable: service
    description: "Minio Service Configuration"
@@ -137,7 +152,7 @@ questions:
            type: hostpath

  - variable: minioDataVolume
-    label: "Configure iXVolume"
+    label: "Minio Data Volume Defaults"
    group: "Storage"
    schema:
      type: dict
@@ -146,14 +161,14 @@ questions:
      show_if: [["minioHostPathEnabled", "=", false]]
      attrs:
        - variable: mountPath
-          label: "Mount Path"
+          label: "Minio Data Mount Path"
          description: "Path where the volume will be mounted inside the pod"
          schema:
            type: path
            editable: false
            default: "/export"
        - variable: datasetName
-          label: "Dataset Name"
+          label: "Minio Dataset Name"
          schema:
            type: string
            default: "ix-minio"
--- a/test/minio/1.0.1/templates/NOTES.txt
+++ b/test/minio/1.0.1/templates/NOTES.txt
--- a/test/minio/1.0.1/templates/_helpers.tpl
+++ b/test/minio/1.0.1/templates/_helpers.tpl
--- a/test/minio/1.0.1/templates/_storage.tpl
+++ b/test/minio/1.0.1/templates/_storage.tpl
--- a/test/minio/1.0.1/templates/deployment.yaml
+++ b/test/minio/1.0.1/templates/deployment.yaml
@@ -50,9 +50,13 @@ spec:
                secretKeyRef:
                  name: {{ template "minio.secretName" . }}
                  key: secretkey
-            {{- range $key, $val := .Values.environment }}
-            - name: {{ $key }}
-              value: {{ $val | quote }}
+            {{- range $envVariable := .Values.environment }}
+            {{- if and $envVariable.name $envVariable.value }}
+            - name: {{ $envVariable.name }}
+              value: {{ $envVariable.value | quote }}
+            {{- else }}
+              {{- fail "Please specify name/value for environment variable" }}
+            {{- end }}
            {{- end}}
      volumes:
        - name: export
--- a/test/minio/1.0.1/templates/secrets.yaml
+++ b/test/minio/1.0.1/templates/secrets.yaml
--- a/test/minio/1.0.1/templates/service.yaml
+++ b/test/minio/1.0.1/templates/service.yaml
--- a/test/minio/1.0.1/templates/serviceaccount.yaml
+++ b/test/minio/1.0.1/templates/serviceaccount.yaml
--- a/test/minio/1.0.1/test_values.yaml
+++ b/test/minio/1.0.1/test_values.yaml
@@ -11,7 +11,7 @@ extraArgs: []
 updateStrategy: RollingUpdate

 service:
-  nodePort: 32000
+  nodePort: 32001

 environment:
  ## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html
--- a/test/minio/1.0.1/values.yaml
+++ b/test/minio/1.0.1/values.yaml
--- a/test/nextcloud/1.1.0/questions.yaml
+++ b/test/nextcloud/1.1.0/questions.yaml
@@ -74,12 +74,14 @@ questions:
              - "definitions/nodeIP"
        - variable: username
          label: "Username"
+          description: "Name of the Nextcloud admin user"
          schema:
            type: string
            default: "admin"
            required: true
        - variable: password
          label: "Password"
+          description: "Password for the Nextcloud admin user"
          schema:
            type: string
            private: true
@@ -87,6 +89,7 @@ questions:
            required: true
        - variable: datadir
          label: "Nextcloud data directory"
+          description: "Configures the data directory where nextcloud stores all files from the users"
          schema:
            type: path
            default: "/var/www/html/data"
@@ -133,7 +136,7 @@ questions:
            type: hostpath

  - variable: nextcloudDataVolume
-    label: "Configure iXVolume"
+    label: "Nextcloud Data Volume Defaults"
    group: "Storage"
    schema:
      type: dict
@@ -142,21 +145,21 @@ questions:
      show_if: [["nextcloudDataHostPathEnabled", "=", false]]
      attrs:
        - variable: mountPath
-          label: "Mount Path"
+          label: "Nextcloud Data Mount Path"
          description: "Path where the volume will be mounted inside the pod"
          schema:
            type: path
            editable: false
            default: "/var/www"
        - variable: datasetName
-          label: "Dataset Name"
+          label: "Nextcloud Dataset Name"
          schema:
            type: string
            default: "ix-nextcloud_data"
            editable: false

  - variable: postgresBackupVolume
-    label: "Postgres Backup Volume"
+    label: "Postgres Backup Volume Defaults"
    group: "Storage"
    schema:
      type: dict
@@ -164,20 +167,20 @@ questions:
        - "normalize/ixVolume"
      attrs:
        - variable: mountPath
-          label: "Mount Path"
+          label: "Postgres Backup Mount Path"
          schema:
            type: path
            editable: false
            default: "/postgres_backups"
        - variable: datasetName
-          label: "Dataset Name"
+          label: "Postgres Backup Dataset Name"
          schema:
            type: string
            default: "ix-postgres_backups"
            editable: false

  - variable: postgresDataVolume
-    label: "Postgresql Data Volume"
+    label: "Postgresql Data Volume Defaults"
    group: "Storage"
    schema:
      type: dict
@@ -185,13 +188,13 @@ questions:
        - "normalize/ixVolume"
      attrs:
        - variable: mountPath
-          label: "Mount Path"
+          label: "Postgres Mount Path"
          schema:
            type: path
            editable: false
            default: "/var/lib/postgresql/data"
        - variable: datasetName
-          label: "Dataset Name"
+          label: "Postgres Dataset Name"
          schema:
            type: string
            default: "ix-postgres_data"
--- a/test/plex/1.0.1/.helmignore
+++ b/test/plex/1.0.1/.helmignore
--- a/test/plex/1.0.1/Chart.yaml
+++ b/test/plex/1.0.1/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 1.20.2.3402
 description: Plex Media Server
 name: plex
-version: 1.0.0
+version: 1.0.1
 keywords:
  - plex
 home: https://plex.tv/
--- a/test/plex/1.0.1/README.md
+++ b/test/plex/1.0.1/README.md
--- a/test/plex/1.0.1/app-readme.md
+++ b/test/plex/1.0.1/app-readme.md
--- a/test/plex/1.0.1/questions.yaml
+++ b/test/plex/1.0.1/questions.yaml
@@ -70,44 +70,11 @@ questions:
  - variable: claimToken
    label: "Plex Claim Token"
    group: "Plex Configuration"
+    description: "The claim token for the server to obtain a real server token. If not provided, server is will not be automatically logged in. If server is already logged in, this parameter is ignored. You can obtain a claim token to login your server to your plex account by visiting https://www.plex.tv/claim."
    schema:
      type: string
      default: ""

-  - variable: advertiseIp
-    label: "Plex Advertise IP"
-    group: "Plex Configuration"
-    schema:
-      type: string
-
-  - variable: extraEnv
-    label: "Environment variables for plex"
-    group: "Plex Configuration"
-    schema:
-      type: dict
-      additional_attrs: true
-      attrs: []
-
-  - variable: proxy
-    label: "Configure Proxy environment variable"
-    group: "Plex Configuration"
-    schema:
-      type: dict
-      attrs:
-        - variable: enabled
-          label: "Enable Proxy"
-          schema:
-            type: boolean
-            default: false
-        - variable: http
-          label: "HTTP Proxy"
-          schema:
-            type: string
-        - variable: https
-          label: "HTTPS Proxy"
-          schema:
-            type: string
-
  - variable: hostNetwork
    label: "Configure Host Network"
    group: "Networking"
@@ -115,6 +82,27 @@ questions:
      type: boolean
      default: false

+  - variable: environmentVariables
+    label: "Environment Variables for Plex"
+    group: "Plex Configuration"
+    schema:
+      type: list
+      default: []
+      items:
+        - variable: environmentVariable
+          label: "Environment Variable"
+          schema:
+            type: dict
+            attrs:
+              - variable: name
+                label: "Name"
+                schema:
+                  type: string
+              - variable: value
+                label: "Value"
+                schema:
+                  type: string
+
  - variable: timezone
    label: "Plex container timezone"
    group: "Plex Configuration"
@@ -168,7 +156,7 @@ questions:
            required: true

  - variable: transcodeVolume
-    label: "Configure iXVolume"
+    label: "Transcode Volume Defaults"
    group: "Storage"
    schema:
      type: dict
@@ -184,7 +172,7 @@ questions:
            editable: false
            default: "/transcode"
        - variable: datasetName
-          label: "Dataset Name"
+          label: "Transcode Dataset Name"
          schema:
            type: string
            default: "ix-plex_transcode"
@@ -205,7 +193,7 @@ questions:
            required: true

  - variable: dataVolume
-    label: "Configure data iXVolume"
+    label: "Data Volume Defaults"
    group: "Storage"
    schema:
      type: dict
@@ -221,7 +209,7 @@ questions:
            editable: false
            default: "/data"
        - variable: datasetName
-          label: "Dataset Name"
+          label: "Data Dataset Name"
          schema:
            type: string
            default: "ix-plex_data"
@@ -242,7 +230,7 @@ questions:
            required: true

  - variable: configVolume
-    label: "Configure iXVolume"
+    label: "Configuration Volume Defaults"
    group: "Storage"
    schema:
      type: dict
@@ -258,7 +246,7 @@ questions:
            editable: false
            default: "/config"
        - variable: datasetName
-          label: "Dataset Name"
+          label: "Configuration Dataset Name"
          schema:
            type: string
            default: "ix-plex_config"
--- a/test/plex/1.0.1/templates/NOTES.txt
+++ b/test/plex/1.0.1/templates/NOTES.txt
--- a/test/plex/1.0.1/templates/_helpers.tpl
+++ b/test/plex/1.0.1/templates/_helpers.tpl
--- a/test/plex/1.0.1/templates/_storage.tpl
+++ b/test/plex/1.0.1/templates/_storage.tpl
--- a/test/plex/1.0.1/templates/deployment.yaml
+++ b/test/plex/1.0.1/templates/deployment.yaml
@@ -67,29 +67,15 @@ spec:
            valueFrom:
              fieldRef:
                fieldPath: metadata.namespace
-  {{- if .Values.proxy.enabled }}
-    {{- if .Values.proxy.http }}
-          - name: "HTTP_PROXY"
-            value: "{{.Values.proxy.http}}"
-    {{- end }}
-    {{- if .Values.proxy.https }}
-          - name: "HTTPS_PROXY"
-            value: "{{.Values.proxy.https}}"
-    {{- end }}
-  {{- end }}
-  {{- if .Values.advertiseIp }}
-          - name: "ADVERTISE_IP"
-            value: "{{.Values.advertiseIp}}"
-{{- end }}
-{{- if .Values.allowedNetworks }}
-          - name: "ALLOWED_NETWORKS"
-            value: "{{include "joinListWithComma" .Values.allowedNetworks}}"
-{{- end }}
 # Extra ENV Values supplied by user
-{{- range $key, $value := .Values.extraEnv }}
-          - name: {{ $key }}
-            value: {{ $value }}
-{{- end }}
+{{- range $envVariable := .Values.environmentVariables }}
+          {{- if and $envVariable.name $envVariable.value }}
+          - name: {{ $envVariable.name }}
+            value: {{ $envVariable.value | quote }}
+          {{- else }}
+            {{- fail "Please specify name/value for environment variable" }}
+          {{- end }}
+{{- end}}
          readinessProbe:
            httpGet:
              path: /identity
--- a/test/plex/1.0.1/templates/service-tcp.yaml
+++ b/test/plex/1.0.1/templates/service-tcp.yaml
--- a/test/plex/1.0.1/templates/service-udp.yaml
+++ b/test/plex/1.0.1/templates/service-udp.yaml
--- a/test/plex/1.0.1/test_values.yaml
+++ b/test/plex/1.0.1/test_values.yaml
@@ -61,12 +61,5 @@ transcodeHostPathEnabled: false
 dataHostPathEnabled: false
 configHostPathEnabled: false

-proxy:
-  # This allows to set a proxy environment variable, which PMS uses to fetch the token and assets like movie cover
-  enabled: false
-  # http: "http://proxy:8080"
-  # https: "https://proxy:8080"
-  # noproxy: "localhost,127.0.0.1,10.96.0.0/12,10.244.0.0/12"
-
 gpuConfiguration: {}
 emptyDirVolumes: true
--- a/test/plex/1.0.1/values.yaml
+++ b/test/plex/1.0.1/values.yaml