From a67164b7b091ab3914d3f875acbc3ff8ca6e74be Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 12 Sep 2021 18:05:54 +0200
Subject: [PATCH] Integrate expert settings into current catagories for testbed

---
 charts/incubator/testbed/Chart.yaml           |   2 +-
 charts/incubator/testbed/SCALE/questions.yaml | 477 +++++++++---------
 2 files changed, 236 insertions(+), 243 deletions(-)

diff --git a/charts/incubator/testbed/Chart.yaml b/charts/incubator/testbed/Chart.yaml
index 30d8ec3ed71..47bdf22565d 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: 7.0.1
+version: 7.0.2
diff --git a/charts/incubator/testbed/SCALE/questions.yaml b/charts/incubator/testbed/SCALE/questions.yaml
index 3b3c43383bf..df5eb29bc1b 100644
--- a/charts/incubator/testbed/SCALE/questions.yaml
+++ b/charts/incubator/testbed/SCALE/questions.yaml
@@ -170,6 +170,7 @@ questions:
           schema:
             type: string
             default: "002"
+
   # Configure Enviroment Variables
   - variable: envList
     label: "Image environment"
@@ -192,7 +193,66 @@ questions:
                 schema:
                   type: string
 
+  - variable: expertpodconf
+    group: "Container Configuration"
+    label: "Show Expert Config"
+    schema:
+      type: boolean
+      default: false
+      show_subquestions_if: true
+      subquestions:
+        - variable: termination
+          group: "Container Configuration"
+          label: "Termination settings"
+          schema:
+            type: dict
+            attrs:
+              - variable: gracePeriodSeconds
+                label: "Grace Period Seconds"
+                schema:
+                  type: int
+                  default: 10
+        - variable: podLabelsList
+          group: "Container Configuration"
+          label: "Pod Labels"
+          schema:
+            type: list
+            default: []
+            items:
+              - variable: podLabelItem
+                label: "Label"
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: name
+                      label: "Name"
+                      schema:
+                        type: string
+                    - variable: value
+                      label: "Value"
+                      schema:
+                        type: string
 
+        - variable: podAnnotationsList
+          group: "Container Configuration"
+          label: "Pod Annotations"
+          schema:
+            type: list
+            default: []
+            items:
+              - variable: podAnnotationItem
+                label: "Label"
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: name
+                      label: "Name"
+                      schema:
+                        type: string
+                    - variable: value
+                      label: "Value"
+                      schema:
+                        type: string
 
   - variable: service
     group: "Networking and Services"
@@ -299,7 +359,7 @@ questions:
                               default: 36009
 
   - variable: serviceexpert
-    group: "Advanced"
+    group: "Networking and Services"
     label: "Show Expert Config"
     schema:
       type: boolean
@@ -307,14 +367,14 @@ questions:
       show_subquestions_if: true
       subquestions:
         - variable: hostNetwork
-          group: "Advanced"
+          group: "Networking and Services"
           label: "Host-Networking (Complicated)"
           schema:
             type: boolean
             default: false
 
         - variable: dnsPolicy
-          group: "Advanced"
+          group: "Networking and Services"
           label: "dnsPolicy"
           schema:
             type: string
@@ -331,7 +391,7 @@ questions:
 
         - variable: dnsConfig
           label: "DNS Configuration"
-          group: "Advanced"
+          group: "Networking and Services"
           description: "Specify custom DNS configuration which will be applied to the pod"
           schema:
             type: dict
@@ -371,7 +431,7 @@ questions:
 
         - variable: serviceList
           label: "Add Manual Custom Services"
-          group: "Advanced"
+          group: "Networking and Services"
           schema:
             type: list
             default: []
@@ -962,6 +1022,176 @@ questions:
                                   schema:
                                     type: string
 
+        - variable: ingressList
+          label: "Add Manual Custom Ingresses"
+          group: "Ingress"
+          schema:
+            type: list
+            default: []
+            items:
+              - variable: ingressListEntry
+                label: "Custom Ingress"
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: enabled
+                      label: "Enable Ingress"
+                      schema:
+                        type: boolean
+                        default: true
+                        hidden: true
+                    - variable: name
+                      label: "Name"
+                      schema:
+                        type: string
+                        default: ""
+                    - variable: ingressClassName
+                      label: "IngressClass Name"
+                      schema:
+                        type: string
+                        default: ""
+                    - variable: labelsList
+                      label: "Labels"
+                      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"
+                      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: hosts
+                      label: "Hosts"
+                      schema:
+                        type: list
+                        default: []
+                        items:
+                          - variable: hostEntry
+                            label: "Host"
+                            schema:
+                              type: dict
+                              attrs:
+                                - variable: host
+                                  label: "HostName"
+                                  schema:
+                                    type: string
+                                    default: ""
+                                    required: true
+                                - variable: paths
+                                  label: "Paths"
+                                  schema:
+                                    type: list
+                                    default: []
+                                    items:
+                                      - variable: pathEntry
+                                        label: "Host"
+                                        schema:
+                                          type: dict
+                                          attrs:
+                                            - variable: path
+                                              label: "path"
+                                              schema:
+                                                type: string
+                                                required: true
+                                                default: "/"
+                                            - variable: pathType
+                                              label: "pathType"
+                                              schema:
+                                                type: string
+                                                required: true
+                                                default: "Prefix"
+                                            - variable: service
+                                              label: "Linked Service"
+                                              schema:
+                                                type: dict
+                                                attrs:
+                                                  - variable: name
+                                                    label: "Service Name"
+                                                    schema:
+                                                      type: string
+                                                      default: ""
+                                                  - variable: port
+                                                    label: "Service Port"
+                                                    schema:
+                                                      type: int
+                    - variable: tls
+                      label: "TLS-Settings"
+                      schema:
+                        type: list
+                        default: []
+                        items:
+                          - variable: tlsEntry
+                            label: "Host"
+                            schema:
+                              type: dict
+                              attrs:
+                                - variable: hosts
+                                  label: "Certificate Hosts"
+                                  schema:
+                                    type: list
+                                    default: []
+                                    items:
+                                      - variable: host
+                                        label: "Host"
+                                        schema:
+                                          type: string
+                                          default: ""
+                                          required: true
+                                - variable: scaleCert
+                                  label: "Select TrueNAS SCALE Certificate"
+                                  schema:
+                                    type: int
+                                    $ref:
+                                      - "definitions/certificate"
+                    - variable: entrypoint
+                      label: "Traefik Entrypoint"
+                      description: "Entrypoint used by Traefik when using Traefik as Ingress Provider"
+                      schema:
+                        type: string
+                        default: "websecure"
+                        required: true
+                    - variable: middlewares
+                      label: "Traefik Middlewares"
+                      description: "Add previously created Traefik Middlewares to this Ingress"
+                      schema:
+                        type: list
+                        default: []
+                        items:
+                          - variable: name
+                            label: "Name"
+                            schema:
+                              type: string
+                              default: ""
+                              required: true
+
 
   - variable: securityContext
     group: "Security and Permissions"
@@ -1230,240 +1460,3 @@ questions:
                         type: string
                         default: "/mnt/tank/config/YourVPN-Config.conf"
                         required: true
-
-
-  - variable: expertmenu
-    group: "Advanced"
-    label: "Unlock Expert Config Menu"
-    schema:
-      type: boolean
-      default: false
-      show_subquestions_if: true
-      subquestions:
-        - variable: podLabelsList
-          group: "Advanced"
-          label: "Pod Labels"
-          schema:
-            type: list
-            default: []
-            items:
-              - variable: podLabelItem
-                label: "Label"
-                schema:
-                  type: dict
-                  attrs:
-                    - variable: name
-                      label: "Name"
-                      schema:
-                        type: string
-                    - variable: value
-                      label: "Value"
-                      schema:
-                        type: string
-
-        - variable: podAnnotationsList
-          group: "Advanced"
-          label: "Pod Annotations"
-          schema:
-            type: list
-            default: []
-            items:
-              - variable: podAnnotationItem
-                label: "Label"
-                schema:
-                  type: dict
-                  attrs:
-                    - variable: name
-                      label: "Name"
-                      schema:
-                        type: string
-                    - variable: value
-                      label: "Value"
-                      schema:
-                        type: string
-
-        - variable: termination
-          group: "Advanced"
-          label: "Termination settings"
-          schema:
-            type: dict
-            attrs:
-              - variable: gracePeriodSeconds
-                label: "Grace Period Seconds"
-                schema:
-                  type: int
-                  default: 10
-
-
-
-
-
-        - variable: ingressList
-          label: "Add Manual Custom Ingresses"
-          group: "Advanced"
-          schema:
-            type: list
-            default: []
-            items:
-              - variable: ingressListEntry
-                label: "Custom Ingress"
-                schema:
-                  type: dict
-                  attrs:
-                    - variable: enabled
-                      label: "Enable Ingress"
-                      schema:
-                        type: boolean
-                        default: true
-                        hidden: true
-                    - variable: name
-                      label: "Name"
-                      schema:
-                        type: string
-                        default: ""
-                    - variable: ingressClassName
-                      label: "IngressClass Name"
-                      schema:
-                        type: string
-                        default: ""
-                    - variable: labelsList
-                      label: "Labels"
-                      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"
-                      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: hosts
-                      label: "Hosts"
-                      schema:
-                        type: list
-                        default: []
-                        items:
-                          - variable: hostEntry
-                            label: "Host"
-                            schema:
-                              type: dict
-                              attrs:
-                                - variable: host
-                                  label: "HostName"
-                                  schema:
-                                    type: string
-                                    default: ""
-                                    required: true
-                                - variable: paths
-                                  label: "Paths"
-                                  schema:
-                                    type: list
-                                    default: []
-                                    items:
-                                      - variable: pathEntry
-                                        label: "Host"
-                                        schema:
-                                          type: dict
-                                          attrs:
-                                            - variable: path
-                                              label: "path"
-                                              schema:
-                                                type: string
-                                                required: true
-                                                default: "/"
-                                            - variable: pathType
-                                              label: "pathType"
-                                              schema:
-                                                type: string
-                                                required: true
-                                                default: "Prefix"
-                                            - variable: service
-                                              label: "Linked Service"
-                                              schema:
-                                                type: dict
-                                                attrs:
-                                                  - variable: name
-                                                    label: "Service Name"
-                                                    schema:
-                                                      type: string
-                                                      default: ""
-                                                  - variable: port
-                                                    label: "Service Port"
-                                                    schema:
-                                                      type: int
-                    - variable: tls
-                      label: "TLS-Settings"
-                      schema:
-                        type: list
-                        default: []
-                        items:
-                          - variable: tlsEntry
-                            label: "Host"
-                            schema:
-                              type: dict
-                              attrs:
-                                - variable: hosts
-                                  label: "Certificate Hosts"
-                                  schema:
-                                    type: list
-                                    default: []
-                                    items:
-                                      - variable: host
-                                        label: "Host"
-                                        schema:
-                                          type: string
-                                          default: ""
-                                          required: true
-                                - variable: scaleCert
-                                  label: "Select TrueNAS SCALE Certificate"
-                                  schema:
-                                    type: int
-                                    $ref:
-                                      - "definitions/certificate"
-                    - variable: entrypoint
-                      label: "Traefik Entrypoint"
-                      description: "Entrypoint used by Traefik when using Traefik as Ingress Provider"
-                      schema:
-                        type: string
-                        default: "websecure"
-                        required: true
-                    - variable: middlewares
-                      label: "Traefik Middlewares"
-                      description: "Add previously created Traefik Middlewares to this Ingress"
-                      schema:
-                        type: list
-                        default: []
-                        items:
-                          - variable: name
-                            label: "Name"
-                            schema:
-                              type: string
-                              default: ""
-                              required: true