From ddeaf81b2d3cd114c1ba460d91a8f7f1daaa317b Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sun, 12 Sep 2021 15:06:47 +0200 Subject: [PATCH] test different test gui options --- charts/incubator/testbed/Chart.yaml | 2 +- charts/incubator/testbed/SCALE/questions.yaml | 391 +++++++++--------- 2 files changed, 202 insertions(+), 191 deletions(-) diff --git a/charts/incubator/testbed/Chart.yaml b/charts/incubator/testbed/Chart.yaml index 6485ed161bb..08b3c15772c 100644 --- a/charts/incubator/testbed/Chart.yaml +++ b/charts/incubator/testbed/Chart.yaml @@ -24,4 +24,4 @@ name: testbed sources: - https://github.com/Jackett/Jackett type: application -version: 6.11.22 +version: 6.11.23 diff --git a/charts/incubator/testbed/SCALE/questions.yaml b/charts/incubator/testbed/SCALE/questions.yaml index cec02b376aa..c0fa811d36a 100644 --- a/charts/incubator/testbed/SCALE/questions.yaml +++ b/charts/incubator/testbed/SCALE/questions.yaml @@ -297,6 +297,19 @@ questions: type: boolean default: true hidden: true + - variable: type + label: "(Advanced) Type of Storage" + description: "Type of storage. Warning: Anything other than pvc will not work with rollback!"" + schema: + type: string + default: "pvc" + enum: + - value: "pvc" + description: "pvc" + - value: "emptyDir" + description: "emptyDir" + - value: "hostPath" + description: "hostPath" - variable: expert label: "Show Expert Options" schema: @@ -342,24 +355,12 @@ questions: label: "Value" schema: type: string - - variable: type - label: "(Advanced) Type of Storage" - description: "Sets the persistence type" - schema: - type: string - default: "pvc" - enum: - - value: "pvc" - description: "pvc" - - value: "emptyDir" - description: "emptyDir" - - value: "hostPath" - description: "hostPath" + - variable: storageClass label: "(Advanced) storageClass" - description: " Warning: Anything other than SCALE-ZFS will break rollback!" + description: "Warning: Anything other than SCALE-ZFS will break rollback!" schema: - show_if: [["type", "=", "pvc"],["expert", "=", true]] + show_if: [["type", "=", "pvc"]] type: string default: "SCALE-ZFS" - variable: setPermissions @@ -383,7 +384,7 @@ questions: - variable: hostPathType label: "(Advanced) hostPath Type" schema: - show_if: [["type", "=", "hostPath"],["expert", "=", true]] + show_if: [["type", "=", "hostPath"]] type: string default: "" enum: @@ -425,7 +426,7 @@ questions: label: "(Advanced) Access Mode" description: "Allow or disallow multiple PVC's writhing to the same PV" schema: - show_if: [["type", "=", "pvc"],["expert", "=", true]] + show_if: [["type", "=", "pvc"]] type: string default: "ReadWriteOnce" enum: @@ -453,187 +454,38 @@ questions: schema: type: dict attrs: - - variable: enabled - label: "Enable the storage" + - variable: config + label: "App Config Storage" + description: "Stores the Application Configuration." schema: - type: boolean - default: true - hidden: true - - variable: advanced - label: "Show Advanced Options" - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: labelsList - label: "Labels" + type: dict + attrs: + - variable: enabled + label: "Enable the storage" schema: - type: list - default: [] - items: - - variable: labelItem - label: "Label" - schema: - type: dict - attrs: - - variable: name - label: "Name" - schema: - type: string - - variable: value - label: "Value" - schema: - type: string - - variable: annotationsList - label: "Annotations" + type: boolean + default: true + hidden: true + - variable: type + label: "(Advanced) Type of Storage" + description: "Type of storage. Warning: Anything other than pvc will not work with rollback!"" schema: - type: list - default: [] - items: - - variable: annotationItem - label: "Label" - schema: - type: dict - attrs: - - variable: name - label: "Name" - schema: - type: string - - variable: value - label: "Value" - schema: - type: string - - variable: type - label: "(Advanced) Type of Storage" - description: "Sets the persistence type" - schema: - type: string - default: "hostPath" - enum: - - value: "pvc" - description: "pvc" - - value: "emptyDir" - description: "emptyDir" - - value: "hostPath" - description: "hostPath" - - variable: storageClass - label: "(Advanced) storageClass" - description: " Warning: Anything other than SCALE-ZFS will break rollback!" - schema: - show_if: [["type", "=", "pvc"]] - type: string - default: "SCALE-ZFS" - - variable: setPermissions - label: "Automatic Permissions" - description: "Automatically set permissions on install" - schema: - show_if: [["type", "=", "hostPath"]] - type: boolean - default: true - - variable: readOnly - label: "readOnly" - schema: - type: boolean - default: false - - variable: hostPath - label: "hostPath" - description: "Path inside the container the storage is mounted" - schema: - show_if: [["type", "=", "hostPath"]] - type: hostpath - - variable: hostPathType - label: "(Advanced) hostPath Type" - schema: - show_if: [["type", "=", "hostPath"]] - type: string - default: "" - enum: - - value: "" - description: "Default" - - value: "DirectoryOrCreate" - description: "DirectoryOrCreate" - - value: "Directory" - description: "Directory" - - value: "FileOrCreate" - description: "FileOrCreate" - - value: "File" - description: "File" - - value: "Socket" - description: "Socket" - - value: "CharDevice" - description: "CharDevice" - - value: "BlockDevice" - description: "BlockDevice" - - variable: mountPath - label: "mountPath" - description: "Path inside the container the storage is mounted" - schema: - type: string - default: "" - required: true - - variable: medium - label: "EmptyDir Medium" - schema: - show_if: [["type", "=", "emptyDir"]] - type: string - default: "" - enum: - - value: "" - description: "Default" - - value: "Memory" - description: "Memory" - - variable: accessMode - label: "(Advanced) Access Mode" - description: "Allow or disallow multiple PVC's writhing to the same PV" - schema: - show_if: [["type", "=", "pvc"]] - type: string - default: "ReadWriteOnce" - enum: - - value: "ReadWriteOnce" - description: "ReadWriteOnce" - - value: "ReadOnlyMany" - description: "ReadOnlyMany" - - value: "ReadWriteMany" - description: "ReadWriteMany" - - variable: size - label: "Size quotum of storage" - schema: - show_if: [["type", "=", "pvc"]] - type: string - default: "100Gi" - - - variable: ingress - label: "" - group: "Ingress" - schema: - type: dict - attrs: - - variable: main - label: "Main Ingress" - schema: - type: dict - attrs: - - variable: enabled - label: "Enable Ingress" - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: Expert - label: "Show Expert Configuration Options" + type: string + default: "pvc" + enum: + - value: "pvc" + description: "pvc" + - value: "emptyDir" + description: "emptyDir" + - value: "hostPath" + description: "hostPath" + - variable: expert + label: "Show Expert Options" schema: type: boolean default: false show_subquestions_if: true subquestions: - - variable: ingressClassName - label: "IngressClass Name" - schema: - type: string - default: "" - variable: labelsList label: "Labels" schema: @@ -672,6 +524,112 @@ questions: label: "Value" schema: type: string + + - variable: storageClass + label: "(Advanced) storageClass" + description: "Warning: Anything other than SCALE-ZFS will break rollback!" + schema: + show_if: [["type", "=", "pvc"]] + type: string + default: "SCALE-ZFS" + - variable: setPermissions + label: "Automatic Permissions" + description: "Automatically set permissions on install" + schema: + show_if: [["type", "=", "hostPath"]] + type: boolean + default: true + - variable: readOnly + label: "readOnly" + schema: + type: boolean + default: false + - variable: hostPath + label: "hostPath" + description: "Path inside the container the storage is mounted" + schema: + show_if: [["type", "=", "hostPath"]] + type: hostpath + - variable: hostPathType + label: "(Advanced) hostPath Type" + schema: + show_if: [["type", "=", "hostPath"]] + type: string + default: "" + enum: + - value: "" + description: "Default" + - value: "DirectoryOrCreate" + description: "DirectoryOrCreate" + - value: "Directory" + description: "Directory" + - value: "FileOrCreate" + description: "FileOrCreate" + - value: "File" + description: "File" + - value: "Socket" + description: "Socket" + - value: "CharDevice" + description: "CharDevice" + - value: "BlockDevice" + description: "BlockDevice" + - variable: mountPath + label: "mountPath" + description: "Path inside the container the storage is mounted" + schema: + type: string + default: "/config" + hidden: true + - variable: medium + label: "EmptyDir Medium" + schema: + show_if: [["type", "=", "emptyDir"]] + type: string + default: "" + enum: + - value: "" + description: "Default" + - value: "Memory" + description: "Memory" + - variable: accessMode + label: "(Advanced) Access Mode" + description: "Allow or disallow multiple PVC's writhing to the same PV" + schema: + show_if: [["type", "=", "pvc"]] + type: string + default: "ReadWriteOnce" + enum: + - value: "ReadWriteOnce" + description: "ReadWriteOnce" + - value: "ReadOnlyMany" + description: "ReadOnlyMany" + - value: "ReadWriteMany" + description: "ReadWriteMany" + - variable: size + label: "Size quotum of storage" + schema: + show_if: [["type", "=", "pvc"]] + type: string + default: "100Gi" + + - variable: ingress + label: "" + group: "Ingress" + schema: + type: dict + attrs: + - variable: main + label: "Main Ingress" + schema: + type: dict + attrs: + - variable: enabled + label: "Enable Ingress" + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: - variable: hosts label: "Hosts" schema: @@ -761,6 +719,59 @@ questions: type: string default: "" required: true + - variable: expert + label: "Show Expert Configuration Options" + description: "does not enable Ingress itself" + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: ingressClassName + label: "IngressClass Name" + schema: + type: string + default: "" + - variable: labelsList + label: "Labels" + schema: + type: list + show_if: [["expert", "=", true]] + default: [] + items: + - variable: labelItem + label: "Label" + schema: + type: dict + attrs: + - variable: name + label: "Name" + schema: + type: string + - variable: value + label: "Value" + schema: + type: string + - variable: annotationsList + label: "Annotations" + schema: + type: list + show_if: [["expert", "=", true]] + default: [] + items: + - variable: annotationItem + label: "Label" + schema: + type: dict + attrs: + - variable: name + label: "Name" + schema: + type: string + - variable: value + label: "Value" + schema: + type: string - variable: securityContext