Common 4.0 App Refactor Part 2 - Stavos

Squashed commit:

[a2bbe555] Update docs for services and groups

[f04d91cf] don't require loadbalancer ip settings

[188d40c0] fix typo

[50735ac0] fix description on persistent storage, fix port names on websockets

[42303b07] Refactor services part4

[9486e401] Refactor services part3

[2a0eb1a7] default ClusterIP on websocket (zwave)

[43a1ca1b] Refactor services part2

[a80ee6b3] Refactor services part1

[b561be7e] Remove securityContext and podSecurityContext from apps with PGID/PUID

[0ad14db2] move UMASK, PGID. PUID to env

[3ab8bc1d] Rename environmentVariables to envList and environmentVariable to envItem

[58b533af] Move securityContext to Security group

[8baefb23] Move podSecurityContext to Security group

[dcbf92ae] Rename reverse proxy to ingress

[4a72f6c2] Remove ingress for now

[9c3dac85] Refactor groups
This commit is contained in:
Stavros Kois
2021-05-23 18:25:51 +02:00
committed by kjeld Schouten-Lebbing
parent 2fda3a9e3e
commit 5697c5212b
45 changed files with 5174 additions and 8071 deletions
+95 -147
View File
@@ -6,13 +6,15 @@ groups:
- name: "Configuration"
description: "additional container configuration"
- name: "Networking"
description: "Configure / service for container"
description: "Configure Network and Services for container"
- name: "Storage"
description: "Persist and share data that is separate from the lifecycle of the container"
- name: "Resources and Devices"
description: "Specify resources/devices to be allocated to workload"
- name: "Reverse Proxy Configuration"
description: "Reverse Proxy configuration"
- name: "Ingress Configuration"
description: "Ingress Configuration"
- name: "Security"
description: "Configure security context"
- name: "Advanced"
description: "Advanced Configuration"
- name: "WARNING"
@@ -41,7 +43,6 @@ questions:
editable: false
type: boolean
default: true
# Update Policy
- variable: strategyType
group: "Container Image"
@@ -63,16 +64,27 @@ questions:
default: "Etc/UTC"
$ref:
- "definitions/timezone"
- variable: env
group: "Configuration"
label: "Image Environment"
schema:
type: dict
attrs:
- variable: UMASK
label: "UMASK"
description: "Sets the UMASK env var for LinuxServer.io (compatible) containers"
schema:
type: string
default: "002"
# Configure Enviroment Variables
- variable: environmentVariables
- variable: envList
label: "Image environment"
group: "Configuration"
schema:
type: list
default: []
items:
- variable: environmentVariable
- variable: envItem
label: "Environment Variable"
schema:
type: dict
@@ -92,14 +104,14 @@ questions:
schema:
type: boolean
default: false
- variable: services
- variable: service
group: "Networking"
label: "Configure Service"
label: "Configure Service(s)"
schema:
type: dict
attrs:
- variable: main
label: "Main service"
label: "Main Service"
description: "The Primary service on which the healthcheck runs, often the webUI"
schema:
type: dict
@@ -111,57 +123,88 @@ questions:
default: true
hidden: true
- variable: type
label: "Service type"
description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System"
label: "Service Type"
description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer"
schema:
type: string
default: "ClusterIP"
default: "NodePort"
enum:
- value: "NodePort"
description: "NodePort"
- value: "ClusterIP"
description: "ClusterIP"
- variable: port
label: "Port configuration"
- value: "LoadBalancer"
description: "LoadBalancer"
- variable: loadBalancerIP
label: "LoadBalancer IP"
description: "LoadBalancerIP"
schema:
show_if: [["type", "=", "LoadBalancer"]]
type: string
default: ""
- variable: externalIPs
label: "External IP's"
description: "External IP's"
schema:
show_if: [["type", "=", "LoadBalancer"]]
type: list
default: []
items:
- variable: externalIP
label: "External IP"
schema:
type: string
- variable: ports
label: "Service's Port(s) Configuration"
schema:
type: dict
attrs:
- variable: protocol
label: "Port Type"
- variable: main
label: "Main Service Port Configuration"
schema:
type: string
default: "HTTP"
hidden: false
enum:
- value: HTTP
description: "HTTP"
- value: "HTTPS"
description: "HTTPS"
- variable: port
label: "container port"
schema:
type: int
default: 3579
editable: false
hidden: true
- variable: targetport
label: "Internal Service port"
description: "When connecting internally to this App, you'll need this port"
schema:
type: int
default: 3579
editable: false
hidden: true
- variable: nodePort
label: "(optional) host nodePort to expose to"
description: "only get used when nodePort is selected"
schema:
type: int
min: 9000
max: 65535
default: 36013
required: true
## TrueCharts Specific
type: dict
attrs:
- variable: protocol
label: "Port Type"
schema:
type: string
default: "HTTP"
hidden: false
enum:
- value: HTTP
description: "HTTP"
- value: "HTTPS"
description: "HTTPS"
- value: TCP
description: "TCP"
- value: "UDP"
description: "UDP"
- variable: port
label: "Container Port"
schema:
type: int
default: 3579
editable: false
hidden: true
- variable: targetport
label: "Target Port"
description: "This port exposes the container port on the service"
schema:
type: int
default: 3579
editable: true
hidden: false
required: true
- variable: nodePort
label: "Node Port (Optional)"
description: "This port gets exposed to the node. Only considered when service type is NodePort"
schema:
type: int
min: 9000
max: 65535
default: 36013
required: true
## TrueCharts Specific
- variable: persistence
label: "Integrated Persistent Storage"
group: "Storage"
@@ -274,104 +317,9 @@ questions:
schema:
type: hostpath
required: true
- variable: ingress
label: ""
group: "Reverse Proxy Configuration"
schema:
type: dict
attrs:
- variable: main
label: "WebUI"
schema:
type: dict
attrs:
- variable: certType
label: "Select Reverse-Proxy Type"
schema:
type: string
default: "disabled"
enum:
- value: "disabled"
description: "Disabled"
- value: ""
description: "No Encryption/TLS/Certificates"
- value: "selfsigned"
description: "Self-Signed Certificate"
- value: "ixcert"
description: "TrueNAS SCALE Certificate"
- variable: type
label: "Reverse Proxy Type"
schema:
type: string
default: "HTTP"
hidden: true
editable: false
required: true
- variable: serviceName
label: "Service name to proxy to"
schema:
hidden: true
editable: false
type: string
default: ""
- variable: entrypoint
label: "Select Entrypoint"
schema:
show_if: [["certType", "!=", "disabled"]]
type: string
default: "websecure"
required: true
enum:
- value: "websecure"
description: "Websecure: HTTPS/TLS port 443"
- variable: hosts
label: "Hosts"
schema:
show_if: [["certType", "!=", "disabled"]]
type: list
default: []
items:
- variable: host
label: "Host"
schema:
type: dict
attrs:
- variable: host
label: "Domain Name"
required: true
schema:
type: string
- variable: path
label: "path"
schema:
type: string
required: true
hidden: true
default: "/"
- variable: certificate
label: "Select TrueNAS SCALE Certificate"
schema:
type: int
show_if: [["certType", "=", "ixcert"]]
$ref:
- "definitions/certificate"
- variable: authForwardURL
label: "Forward Authentication URL"
schema:
show_if: [["certType", "!=", "disabled"]]
type: string
default: ""
- variable: UMASK
group: "Advanced"
label: "UMASK"
description: "Sets the UMASK env var for LinuxServer.io (compatible) containers"
schema:
type: string
default: "002"
# Enable privileged
- variable: securityContext
group: "Advanced"
group: "Security"
label: "Security Context"
schema:
type: dict
@@ -383,7 +331,7 @@ questions:
default: false
# Set Pod Security Policy
- variable: podSecurityContext
group: "Advanced"
group: "Security"
label: "Pod Security Context"
schema:
type: dict