Common 4.0 App Refactor Part 3 - Ornias

This commit is contained in:
kjeld Schouten-Lebbing 2021-05-22 22:43:29 +02:00
parent 5697c5212b
commit f94206ee60
No known key found for this signature in database
GPG Key ID: 4CDAD4A532BC1EDB
54 changed files with 197 additions and 89 deletions

View File

@ -156,6 +156,18 @@ jobs:
with: with:
test-results: test.json test-results: test.json
- name: Run tests
if: ${{ steps.prep-lint.outputs.unittests == 'true' }}
run: |
if grep -q "FAIL" test.json
then
echo "Unit Test reported FAILED";
exit 1
else
echo "Unit Test reported OK";
exit 0
fi
## ##
# Chart-Testing Section # Chart-Testing Section

View File

@ -20,7 +20,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: [] maintainers: []
# annotations: # annotations:

View File

@ -16,7 +16,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts
email: info@truecharts.org email: info@truecharts.org

View File

@ -24,7 +24,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -21,7 +21,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -19,7 +19,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -16,7 +16,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
- name: postgresql - name: postgresql
version: 10.4.3 version: 10.4.3
repository: https://charts.bitnami.com/bitnami repository: https://charts.bitnami.com/bitnami

View File

@ -20,7 +20,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -20,7 +20,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -18,7 +18,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -17,7 +17,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -20,7 +20,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -21,7 +21,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -21,7 +21,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -19,7 +19,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -20,7 +20,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -19,7 +19,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -17,7 +17,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts
email: info@truecharts.org email: info@truecharts.org

View File

@ -19,7 +19,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -23,7 +23,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -20,7 +20,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -21,7 +21,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -19,7 +19,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -1,7 +1,7 @@
apiVersion: v2 apiVersion: v2
kubeVersion: ">=1.16.0-0" kubeVersion: ">=1.16.0-0"
name: common-test name: common-test
version: 3.0.0 version: 3.0.1
# upstream_version: # upstream_version:
appVersion: none appVersion: none
description: Helper chart to test different use cases of the common library description: Helper chart to test different use cases of the common library

View File

@ -0,0 +1,22 @@
image:
repository: b4bz/homer
tag: latest
pullPolicy: IfNotPresent
service:
main:
ports:
main:
port: 8080
ingress:
main:
enabled: true
probes:
liveness:
enabled: true
readiness:
enabled: true
startup:
enabled: true

View File

@ -2,9 +2,3 @@ image:
repository: b4bz/homer repository: b4bz/homer
tag: latest tag: latest
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
service:
main:
ports:
main:
port: 8080

View File

@ -236,7 +236,7 @@ service:
# -- Port protocol. # -- Port protocol.
# Support values are `HTTP`, `HTTPS`, `TCP` and `UDP`. # Support values are `HTTP`, `HTTPS`, `TCP` and `UDP`.
# HTTPS and HTTPS spawn a TCP service and get used for internal URL and name generation # HTTPS and HTTPS spawn a TCP service and get used for internal URL and name generation
protocol: HTTP protocol: HTTP
# -- Specify a service targetPort if you wish to differ the service port from the application port. # -- Specify a service targetPort if you wish to differ the service port from the application port.
# If `targetPort` is specified, this port number is used in the container definition instead of # If `targetPort` is specified, this port number is used in the container definition instead of

View File

@ -22,7 +22,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
- name: postgresql - name: postgresql
version: 10.4.3 version: 10.4.3

View File

@ -15,6 +15,7 @@
{{- if eq .Values.bitwardenrs.yubico.enabled true }} {{- if eq .Values.bitwardenrs.yubico.enabled true }}
{{- $yubicoClientId = required "Yubico Client ID required" .Values.bitwardenrs.yubico.clientId | toString | b64enc | quote }} {{- $yubicoClientId = required "Yubico Client ID required" .Values.bitwardenrs.yubico.clientId | toString | b64enc | quote }}
{{- end -}} {{- end -}}
---
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret

View File

@ -19,7 +19,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -19,7 +19,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -20,7 +20,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -19,7 +19,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -21,7 +21,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -6,14 +6,8 @@ image:
strategy: strategy:
type: Recreate type: Recreate
startAsRoot: true
# Configure the Security Context for the Pod # Configure the Security Context for the Pod
podSecurityContext: podSecurityContext:
runAsNonRoot: false
runAsUser: 0
runAsGroup: 0
fsGroup: 0
supplementalGroups: [24, 44, 107] supplementalGroups: [24, 44, 107]
service: service:

View File

@ -21,7 +21,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
# ## postgresql is currently not ported to SCALE yet. # ## postgresql is currently not ported to SCALE yet.
# - name: postgresql # - name: postgresql

View File

@ -21,7 +21,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -21,7 +21,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -17,7 +17,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -21,7 +21,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -24,7 +24,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -17,7 +17,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -21,7 +21,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -21,7 +21,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -18,7 +18,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -20,7 +20,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -1,7 +1,7 @@
apiVersion: v2 apiVersion: v2
kubeVersion: ">=1.16.0-0" kubeVersion: ">=1.16.0-0"
name: traefik name: traefik
version: 4.0.0 version: 3.2.4
appVersion: "auto" appVersion: "auto"
description: A Traefik based Reverse Proxy and Certificate Manager description: A Traefik based Reverse Proxy and Certificate Manager
type: application type: application
@ -19,7 +19,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 3.5.8
# condition: # condition:
- name: traefik - name: traefik
repository: https://helm.traefik.io/traefik repository: https://helm.traefik.io/traefik

View File

@ -6,15 +6,13 @@ groups:
- name: "Configuration" - name: "Configuration"
description: "additional container configuration" description: "additional container configuration"
- name: "Networking" - name: "Networking"
description: "Configure Network and Services for container" description: "Configure / service for container"
- name: "Storage" - name: "Storage"
description: "Persist and share data that is separate from the lifecycle of the container" description: "Persist and share data that is separate from the lifecycle of the container"
- name: "Resources and Devices" - name: "Resources and Devices"
description: "Specify resources/devices to be allocated to workload" description: "Specify resources/devices to be allocated to workload"
- name: "Ingress Configuration" - name: "Reverse Proxy Configuration"
description: "Ingress Configuration" description: "Reverse Proxy configuration"
- name: "Security"
description: "Configure security context"
- name: "Advanced" - name: "Advanced"
description: "Advanced Configuration" description: "Advanced Configuration"
- name: "WARNING" - name: "WARNING"
@ -52,18 +50,103 @@ questions:
default: "Etc/UTC" default: "Etc/UTC"
$ref: $ref:
- "definitions/timezone" - "definitions/timezone"
- variable: env
group: "Configuration" - variable: ingress
label: "Image Environment" label: ""
group: "Reverse Proxy Configuration"
schema: schema:
type: dict type: dict
attrs: attrs:
- variable: UMASK - variable: main
label: "UMASK" label: "WebUI"
description: "Sets the UMASK env var for LinuxServer.io (compatible) containers"
schema: schema:
type: string type: dict
default: "002" attrs:
- variable: enabled
label: "Enable Web Reverse Proxy"
schema:
type: boolean
default: false
show_subquestions_if: true
subquestions:
- variable: type
label: "Reverse Proxy Type"
schema:
type: string
default: "HTTP-IR"
hidden: true
editable: false
required: true
- variable: serviceName
label: "Service name to proxy to"
schema:
hidden: true
editable: false
type: string
default: "api@internal"
- variable: serviceKind
label: "Service Kind to proxy to"
schema:
hidden: true
editable: false
type: string
default: "TraefikService"
- variable: entrypoint
label: "Select Entrypoint"
schema:
type: string
default: "websecure"
required: true
enum:
- value: "websecure"
description: "Websecure: HTTPS/TLS port 443"
- variable: hosts
label: "Hosts"
schema:
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: certType
label: "Select Certificate Type"
schema:
type: string
default: "selfsigned"
enum:
- value: ""
description: "No Encryption/TLS/Certificates"
- value: "selfsigned"
description: "Self-Signed Certificate"
- value: "ixcert"
description: "TrueNAS SCALE Certificate"
- variable: certificate
label: "Select TrueNAS SCALE Certificate"
schema:
type: int
show_if: [["certType", "=", "ixcert"]]
$ref:
- "definitions/certificate"
- variable: authForwardURL
label: "Forward Authentication URL"
schema:
type: string
default: ""
- variable: traefik - variable: traefik
label: "(Advanced) Traefik Settings" label: "(Advanced) Traefik Settings"
group: "Advanced" group: "Advanced"
@ -659,9 +742,17 @@ questions:
schema: schema:
type: string type: string
default: "" 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 # Enable privileged
- variable: securityContext - variable: securityContext
group: "Security" group: "Advanced"
label: "Security Context" label: "Security Context"
schema: schema:
type: dict type: dict
@ -673,7 +764,7 @@ questions:
default: false default: false
# Set Pod Security Policy # Set Pod Security Policy
- variable: podSecurityContext - variable: podSecurityContext
group: "Security" group: "Advanced"
label: "Pod Security Context" label: "Pod Security Context"
schema: schema:
type: dict type: dict
@ -728,12 +819,12 @@ questions:
description: "Please be sure to set the UI to a different port or adapter" description: "Please be sure to set the UI to a different port or adapter"
group: "WARNING" group: "WARNING"
schema: schema:
type: dict type: dict
attrs: attrs:
- variable: confirm-warning - variable: confirm-warning
description: "Check this to confirm you have made precautions against conflicts on port 80 and 443, such as running the TrueNAS SCALE UI on a different port or adapter." description: "Check this to confirm you have made precautions against conflicts on port 80 and 443, such as running the TrueNAS SCALE UI on a different port or adapter."
label: "I understand above warning and its consequences" label: "I understand above warning and its consequences"
schema: schema:
type: boolean type: boolean
default: false default: false
required: true required: true

View File

@ -260,7 +260,7 @@ ingress:
# Ignored if not kubeVersion >= 1.14-0 # Ignored if not kubeVersion >= 1.14-0
pathType: Prefix pathType: Prefix
externalservice: externalServices:
- enabled: true - enabled: true
name: "test" name: "test"
type: "HTTP" type: "HTTP"

View File

@ -1,6 +0,0 @@
dependencies:
- name: common
repository: https://truecharts.org/
version: 4.1.1
digest: sha256:d13c8b723da27f049ec5a709db8128a96033773c1be13330a453daa4e4d0b7ff
generated: "2021-05-20T18:13:40.3933879+02:00"

View File

@ -20,7 +20,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -17,7 +17,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts

View File

@ -22,7 +22,7 @@ sources:
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org/ repository: https://truecharts.org/
version: 4.1.1 version: 4.1.2
# condition: # condition:
maintainers: maintainers:
- name: TrueCharts - name: TrueCharts