Common 4.0 App Refactor Part 3 - Ornias
This commit is contained in:
parent
5697c5212b
commit
f94206ee60
|
@ -156,6 +156,18 @@ jobs:
|
|||
with:
|
||||
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
|
||||
|
|
|
@ -20,7 +20,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers: []
|
||||
# annotations:
|
||||
|
|
|
@ -16,7 +16,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
email: info@truecharts.org
|
||||
|
|
|
@ -24,7 +24,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -21,7 +21,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -19,7 +19,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -16,7 +16,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
- name: postgresql
|
||||
version: 10.4.3
|
||||
repository: https://charts.bitnami.com/bitnami
|
||||
|
|
|
@ -20,7 +20,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -20,7 +20,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -18,7 +18,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -17,7 +17,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -20,7 +20,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -21,7 +21,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -21,7 +21,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -19,7 +19,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -20,7 +20,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -19,7 +19,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -17,7 +17,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
email: info@truecharts.org
|
||||
|
|
|
@ -19,7 +19,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -23,7 +23,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -20,7 +20,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -21,7 +21,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -19,7 +19,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
apiVersion: v2
|
||||
kubeVersion: ">=1.16.0-0"
|
||||
name: common-test
|
||||
version: 3.0.0
|
||||
version: 3.0.1
|
||||
# upstream_version:
|
||||
appVersion: none
|
||||
description: Helper chart to test different use cases of the common library
|
||||
|
|
|
@ -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
|
|
@ -2,9 +2,3 @@ image:
|
|||
repository: b4bz/homer
|
||||
tag: latest
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
service:
|
||||
main:
|
||||
ports:
|
||||
main:
|
||||
port: 8080
|
||||
|
|
|
@ -236,7 +236,7 @@ service:
|
|||
# -- Port protocol.
|
||||
# Support values are `HTTP`, `HTTPS`, `TCP` and `UDP`.
|
||||
# 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.
|
||||
# If `targetPort` is specified, this port number is used in the container definition instead of
|
||||
|
|
|
@ -22,7 +22,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
- name: postgresql
|
||||
version: 10.4.3
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
{{- if eq .Values.bitwardenrs.yubico.enabled true }}
|
||||
{{- $yubicoClientId = required "Yubico Client ID required" .Values.bitwardenrs.yubico.clientId | toString | b64enc | quote }}
|
||||
{{- end -}}
|
||||
---
|
||||
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
|
|
|
@ -19,7 +19,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -19,7 +19,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -20,7 +20,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -19,7 +19,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -21,7 +21,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -6,14 +6,8 @@ image:
|
|||
strategy:
|
||||
type: Recreate
|
||||
|
||||
startAsRoot: true
|
||||
|
||||
# Configure the Security Context for the Pod
|
||||
podSecurityContext:
|
||||
runAsNonRoot: false
|
||||
runAsUser: 0
|
||||
runAsGroup: 0
|
||||
fsGroup: 0
|
||||
supplementalGroups: [24, 44, 107]
|
||||
|
||||
service:
|
||||
|
|
|
@ -21,7 +21,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
# ## postgresql is currently not ported to SCALE yet.
|
||||
# - name: postgresql
|
||||
|
|
|
@ -21,7 +21,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -21,7 +21,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -17,7 +17,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -21,7 +21,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -24,7 +24,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -17,7 +17,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -21,7 +21,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -21,7 +21,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -18,7 +18,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -20,7 +20,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
apiVersion: v2
|
||||
kubeVersion: ">=1.16.0-0"
|
||||
name: traefik
|
||||
version: 4.0.0
|
||||
version: 3.2.4
|
||||
appVersion: "auto"
|
||||
description: A Traefik based Reverse Proxy and Certificate Manager
|
||||
type: application
|
||||
|
@ -19,7 +19,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 3.5.8
|
||||
# condition:
|
||||
- name: traefik
|
||||
repository: https://helm.traefik.io/traefik
|
||||
|
|
|
@ -6,15 +6,13 @@ groups:
|
|||
- name: "Configuration"
|
||||
description: "additional container configuration"
|
||||
- name: "Networking"
|
||||
description: "Configure Network and Services for container"
|
||||
description: "Configure / service 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: "Ingress Configuration"
|
||||
description: "Ingress Configuration"
|
||||
- name: "Security"
|
||||
description: "Configure security context"
|
||||
- name: "Reverse Proxy Configuration"
|
||||
description: "Reverse Proxy configuration"
|
||||
- name: "Advanced"
|
||||
description: "Advanced Configuration"
|
||||
- name: "WARNING"
|
||||
|
@ -52,18 +50,103 @@ questions:
|
|||
default: "Etc/UTC"
|
||||
$ref:
|
||||
- "definitions/timezone"
|
||||
- variable: env
|
||||
group: "Configuration"
|
||||
label: "Image Environment"
|
||||
|
||||
- variable: ingress
|
||||
label: ""
|
||||
group: "Reverse Proxy Configuration"
|
||||
schema:
|
||||
type: dict
|
||||
attrs:
|
||||
- variable: UMASK
|
||||
label: "UMASK"
|
||||
description: "Sets the UMASK env var for LinuxServer.io (compatible) containers"
|
||||
- variable: main
|
||||
label: "WebUI"
|
||||
schema:
|
||||
type: string
|
||||
default: "002"
|
||||
type: dict
|
||||
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
|
||||
label: "(Advanced) Traefik Settings"
|
||||
group: "Advanced"
|
||||
|
@ -659,9 +742,17 @@ questions:
|
|||
schema:
|
||||
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: "Security"
|
||||
group: "Advanced"
|
||||
label: "Security Context"
|
||||
schema:
|
||||
type: dict
|
||||
|
@ -673,7 +764,7 @@ questions:
|
|||
default: false
|
||||
# Set Pod Security Policy
|
||||
- variable: podSecurityContext
|
||||
group: "Security"
|
||||
group: "Advanced"
|
||||
label: "Pod Security Context"
|
||||
schema:
|
||||
type: dict
|
||||
|
@ -728,12 +819,12 @@ questions:
|
|||
description: "Please be sure to set the UI to a different port or adapter"
|
||||
group: "WARNING"
|
||||
schema:
|
||||
type: dict
|
||||
attrs:
|
||||
- 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."
|
||||
label: "I understand above warning and its consequences"
|
||||
schema:
|
||||
type: boolean
|
||||
default: false
|
||||
required: true
|
||||
type: dict
|
||||
attrs:
|
||||
- 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."
|
||||
label: "I understand above warning and its consequences"
|
||||
schema:
|
||||
type: boolean
|
||||
default: false
|
||||
required: true
|
||||
|
|
|
@ -260,7 +260,7 @@ ingress:
|
|||
# Ignored if not kubeVersion >= 1.14-0
|
||||
pathType: Prefix
|
||||
|
||||
externalservice:
|
||||
externalServices:
|
||||
- enabled: true
|
||||
name: "test"
|
||||
type: "HTTP"
|
||||
|
|
|
@ -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"
|
|
@ -20,7 +20,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
Binary file not shown.
|
@ -17,7 +17,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
|
@ -22,7 +22,7 @@ sources:
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org/
|
||||
version: 4.1.1
|
||||
version: 4.1.2
|
||||
# condition:
|
||||
maintainers:
|
||||
- name: TrueCharts
|
||||
|
|
Loading…
Reference in New Issue