diff --git a/incubator/testbed/7.0.1/CHANGELOG.md b/incubator/testbed/7.0.1/CHANGELOG.md
deleted file mode 100644
index c4214fb77db..00000000000
--- a/incubator/testbed/7.0.1/CHANGELOG.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-### [testbed-7.0.1](https://github.com/truecharts/apps/compare/testbed-7.0.0...testbed-7.0.1) (2021-09-12)
-
diff --git a/incubator/testbed/7.0.2/CHANGELOG.md b/incubator/testbed/7.0.2/CHANGELOG.md
new file mode 100644
index 00000000000..171a75dd7eb
--- /dev/null
+++ b/incubator/testbed/7.0.2/CHANGELOG.md
@@ -0,0 +1,4 @@
+
+
+### [testbed-7.0.2](https://github.com/truecharts/apps/compare/testbed-7.0.1...testbed-7.0.2) (2021-09-12)
+
diff --git a/incubator/testbed/7.0.1/CONFIG.md b/incubator/testbed/7.0.2/CONFIG.md
similarity index 100%
rename from incubator/testbed/7.0.1/CONFIG.md
rename to incubator/testbed/7.0.2/CONFIG.md
diff --git a/incubator/testbed/7.0.1/Chart.lock b/incubator/testbed/7.0.2/Chart.lock
similarity index 78%
rename from incubator/testbed/7.0.1/Chart.lock
rename to incubator/testbed/7.0.2/Chart.lock
index dd7bb134a01..2a969ee9591 100644
--- a/incubator/testbed/7.0.1/Chart.lock
+++ b/incubator/testbed/7.0.2/Chart.lock
@@ -3,4 +3,4 @@ dependencies:
repository: https://truecharts.org/
version: 7.0.4
digest: sha256:a99a1463f60273d2be558f311ff2136723b29f39cde9f008d6f39e0a990b9bde
-generated: "2021-09-12T16:01:56.07589687Z"
+generated: "2021-09-12T16:07:19.955719726Z"
diff --git a/incubator/testbed/7.0.1/Chart.yaml b/incubator/testbed/7.0.2/Chart.yaml
similarity index 97%
rename from incubator/testbed/7.0.1/Chart.yaml
rename to incubator/testbed/7.0.2/Chart.yaml
index 30d8ec3ed71..47bdf22565d 100644
--- a/incubator/testbed/7.0.1/Chart.yaml
+++ b/incubator/testbed/7.0.2/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/incubator/testbed/7.0.1/README.md b/incubator/testbed/7.0.2/README.md
similarity index 100%
rename from incubator/testbed/7.0.1/README.md
rename to incubator/testbed/7.0.2/README.md
diff --git a/incubator/testbed/7.0.1/app-readme.md b/incubator/testbed/7.0.2/app-readme.md
similarity index 100%
rename from incubator/testbed/7.0.1/app-readme.md
rename to incubator/testbed/7.0.2/app-readme.md
diff --git a/incubator/testbed/7.0.1/charts/common-7.0.4.tgz b/incubator/testbed/7.0.2/charts/common-7.0.4.tgz
similarity index 100%
rename from incubator/testbed/7.0.1/charts/common-7.0.4.tgz
rename to incubator/testbed/7.0.2/charts/common-7.0.4.tgz
diff --git a/incubator/testbed/7.0.1/helm-values.md b/incubator/testbed/7.0.2/helm-values.md
similarity index 100%
rename from incubator/testbed/7.0.1/helm-values.md
rename to incubator/testbed/7.0.2/helm-values.md
diff --git a/incubator/testbed/7.0.1/ix_values.yaml b/incubator/testbed/7.0.2/ix_values.yaml
similarity index 100%
rename from incubator/testbed/7.0.1/ix_values.yaml
rename to incubator/testbed/7.0.2/ix_values.yaml
diff --git a/incubator/testbed/7.0.1/questions.yaml b/incubator/testbed/7.0.2/questions.yaml
similarity index 99%
rename from incubator/testbed/7.0.1/questions.yaml
rename to incubator/testbed/7.0.2/questions.yaml
index 3b3c43383bf..df5eb29bc1b 100644
--- a/incubator/testbed/7.0.1/questions.yaml
+++ b/incubator/testbed/7.0.2/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
diff --git a/incubator/testbed/7.0.1/templates/common.yaml b/incubator/testbed/7.0.2/templates/common.yaml
similarity index 100%
rename from incubator/testbed/7.0.1/templates/common.yaml
rename to incubator/testbed/7.0.2/templates/common.yaml
diff --git a/incubator/testbed/7.0.1/test_values.yaml b/incubator/testbed/7.0.2/test_values.yaml
similarity index 100%
rename from incubator/testbed/7.0.1/test_values.yaml
rename to incubator/testbed/7.0.2/test_values.yaml
diff --git a/incubator/testbed/7.0.1/values.yaml b/incubator/testbed/7.0.2/values.yaml
similarity index 100%
rename from incubator/testbed/7.0.1/values.yaml
rename to incubator/testbed/7.0.2/values.yaml