Update ingress for new certificate system (#6615)

* Update ingressDefault.yaml

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Update ingressList.yaml

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Update ingressTLS.yaml

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Update ingressDefault.yaml

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Update ingressList.yaml

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Update ingressList.yaml

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Update ingressTLS.yaml

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Update ingressList.yaml

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Apply suggestions from code review

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Apply suggestions from code review

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

* Bump for testing

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
This commit is contained in:
Kjeld Schouten-Lebbing
2023-01-24 12:25:48 +01:00
committed by GitHub
parent 6d593b048a
commit 2fc63b1e2c
4 changed files with 46 additions and 5 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ sources:
- https://github.com/truecharts/charts/tree/master/charts/stable/jackett - https://github.com/truecharts/charts/tree/master/charts/stable/jackett
- https://github.com/Jackett/Jackett - https://github.com/Jackett/Jackett
type: application type: application
version: 13.0.36 version: 13.0.37
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- media - media
@@ -5,6 +5,12 @@
default: false default: false
show_subquestions_if: true show_subquestions_if: true
subquestions: subquestions:
- variable: clusterIssuer
label: clusterIssuer
description: 'add the name of your cert-manager clusterIssuer here for automatic tls certificates. Cannot be used combined with tls option below'
schema:
type: string
default: ""
- variable: hosts - variable: hosts
label: Hosts label: Hosts
schema: schema:
+22 -2
View File
@@ -27,6 +27,12 @@
schema: schema:
type: string type: string
default: "" default: ""
- variable: clusterIssuer
label: clusterIssuer
description: 'add the name of your cert-manager clusterIssuer here for automatic tls certificates. Cannot be used combined with tls option below'
schema:
type: string
default: ""
- variable: hosts - variable: hosts
label: Hosts label: Hosts
schema: schema:
@@ -89,6 +95,7 @@
schema: schema:
type: list type: list
default: [] default: []
show_if: [["clusterIssuer", "=", ""]]
items: items:
- variable: tlsEntry - variable: tlsEntry
label: Host label: Host
@@ -108,12 +115,25 @@
type: string type: string
default: "" default: ""
required: true required: true
- variable: scaleCert - variable: clusterIssuer
label: Select TrueNAS SCALE Certificate label: Use Cert-Manager clusterIssuer
description: 'add the name of your Cert-Manager clusterIssuer here for automatic tls certificates.'
schema: schema:
type: string
default: ""
- variable: scaleCert
label: Use TrueNAS SCALE Certificate (Deprecated)
schema:
show_if: [["clusterIssuer", "=", ""]]
type: int type: int
$ref: $ref:
- "definitions/certificate" - "definitions/certificate"
- variable: secretName
label: Use Custom Secret (Advanced)
schema:
type: string
show_if: [["clusterIssuer", "=", ""]]
default: ""
- variable: entrypoint - variable: entrypoint
label: Traefik Entrypoint label: Traefik Entrypoint
description: Entrypoint used by Traefik when using Traefik as Ingress Provider description: Entrypoint used by Traefik when using Traefik as Ingress Provider
+17 -2
View File
@@ -2,6 +2,7 @@
label: TLS-Settings label: TLS-Settings
schema: schema:
type: list type: list
show_if: [["clusterIssuer", "=", ""]]
default: [] default: []
items: items:
- variable: tlsEntry - variable: tlsEntry
@@ -22,9 +23,23 @@
type: string type: string
default: "" default: ""
required: true required: true
- variable: scaleCert
label: Select TrueNAS SCALE Certificate - variable: clusterIssuer
label: Use Cert-Manager clusterIssuer
description: 'add the name of your cert-manager clusterIssuer here for automatic tls certificates.'
schema: schema:
type: string
default: ""
- variable: scaleCert
label: Use TrueNAS SCALE Certificate (Deprecated)
schema:
show_if: [["clusterIssuer", "=", ""]]
type: int type: int
$ref: $ref:
- "definitions/certificate" - "definitions/certificate"
- variable: secretName
label: Use Custom Secret (Advanced)
schema:
show_if: [["clusterIssuer", "=", ""]]
type: string
default: ""