diff --git a/templates/app/Chart.yaml b/templates/app/Chart.yaml index a3226416973..73716cdaf0a 100644 --- a/templates/app/Chart.yaml +++ b/templates/app/Chart.yaml @@ -14,12 +14,17 @@ keywords: sources: - https://github.com/truecharts/apps/tree/master/charts/${CHARTNAME} dependencies: - - name: common - repository: https://charts.truecharts.com/ - version: 1.3.0 +- name: common + repository: https://truecharts.org + version: 8.3.14 # condition: maintainers: - name: TrueCharts email: info@truecharts.org url: truecharts.org -# annotations: +annotations: + truecharts.org/catagories: | + - media + - test + truecharts.org/SCALE-support: "true" + truecharts.org/grade: U diff --git a/templates/app/SCALE/item.yaml b/templates/app/SCALE/item.yaml deleted file mode 100644 index 134d3814a14..00000000000 --- a/templates/app/SCALE/item.yaml +++ /dev/null @@ -1,3 +0,0 @@ -categories: - - media -icon_url: PLACEHOLDERICON diff --git a/templates/app/SCALE/ix_values.yaml b/templates/app/SCALE/ix_values.yaml deleted file mode 100644 index 3edf72be710..00000000000 --- a/templates/app/SCALE/ix_values.yaml +++ /dev/null @@ -1,15 +0,0 @@ -## -# This file contains Values.yaml content that gets added to the output of questions.yaml -# It's ONLY meant for content that the user is NOT expected to change. -# Example: Everything under "image" is not included in questions.yaml but is included here. -## - -image: - repository: PLACEHOLDERREPO - pullPolicy: IfNotPresent - tag: PLACEHOLDERTAG@sha256:42 - -## -# Most other defaults are set in questions.yaml -# For other options please refer to the wiki, default_values.yaml or the common library chart -## diff --git a/templates/app/SCALE/questions.yaml b/templates/app/questions.yaml similarity index 64% rename from templates/app/SCALE/questions.yaml rename to templates/app/questions.yaml index a97d38ec197..72ea468713c 100644 --- a/templates/app/SCALE/questions.yaml +++ b/templates/app/questions.yaml @@ -23,6 +23,7 @@ questions: editable: false type: boolean default: true +# Include{global} - variable: controller group: "Controller" label: "" @@ -195,59 +196,7 @@ questions: type: boolean default: false - - variable: dnsPolicy - group: "Networking and Services" - label: "dnsPolicy" - schema: - type: string - default: "" - enum: - - value: "" - description: "Default" - - value: "ClusterFirst" - description: "ClusterFirst" - - value: "ClusterFirstWithHostNet" - description: "ClusterFirstWithHostNet" - - value: "None" - description: "None" - - - variable: dnsConfig - label: "DNS Configuration" - group: "Networking and Services" - description: "Specify custom DNS configuration which will be applied to the pod" - schema: - type: dict - attrs: - - variable: nameservers - label: "Nameservers" - schema: - default: [] - type: list - items: - - variable: nameserver - label: "Nameserver" - schema: - type: string - - variable: options - label: "options" - schema: - default: [] - type: list - items: - - variable: option - label: "Option Entry" - schema: - type: string - - variable: searches - label: "Searches" - schema: - default: [] - type: list - items: - - variable: search - label: "Search Entry" - schema: - type: string +# Include{serviceExpert} # Include{serviceList} @@ -375,6 +324,7 @@ questions: type: string default: "/config" hidden: true + valid_chars: '^\/([a-zA-Z0-9._-]+\/?)+$' - variable: medium label: "EmptyDir Medium" schema: @@ -419,153 +369,13 @@ questions: schema: type: dict attrs: - - variable: enabled - label: "Enable Ingress" - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - 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: 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: "(Advanced) 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 +# Include{ingressDefault} - - variable: expert - label: "Show Expert Configuration 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: - 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 +# Include{ingressTLS} + +# Include{ingressTraefik} + +# Include{ingressExpert} # Include{ingressList}