Chore(stable): BREAKING CHANGE migrate to new common part 2 (#7992)
**Description** See: https://github.com/truecharts/charts/pull/7900 **⚙️ Type of change** - [x] ⚙️ Feature/App addition - [x] 🪛 Bugfix - [x] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [x] 🔃 Refactor of current code **🧪 How Has This Been Tested?** <!-- Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration --> **📃 Notes:** <!-- Please enter any other relevant information here --> **✔️ Checklist:** - [x] ⚖️ My code follows the style guidelines of this project - [x] 👀 I have performed a self-review of my own code - [x] #️⃣ I have commented my code, particularly in hard-to-understand areas - [x] 📄 I have made corresponding changes to the documentation - [x] ⚠️ My changes generate no new warnings - [x] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [x] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [x] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [x] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._
This commit is contained in:
Kjeld Schouten-Lebbing
@@ -1,7 +1,7 @@
|
||||
apiVersion: v2
|
||||
appVersion: "1.5.1"
|
||||
kubeVersion: ">=1.16.0-0"
|
||||
version: 7.0.26
|
||||
version: 8.0.0
|
||||
name: spotweb
|
||||
description: Spotweb is a decentralized usenet community based on the Spotnet protocol.
|
||||
type: application
|
||||
@@ -18,11 +18,8 @@ sources:
|
||||
dependencies:
|
||||
- name: common
|
||||
repository: https://library-charts.truecharts.org
|
||||
version: 11.1.2
|
||||
- condition: postgresql.enabled
|
||||
name: postgresql
|
||||
repository: https://deps.truecharts.org/
|
||||
version: 11.0.31
|
||||
version: 12.4.9
|
||||
|
||||
maintainers:
|
||||
- email: info@truecharts.org
|
||||
name: TrueCharts
|
||||
@@ -31,4 +28,3 @@ annotations:
|
||||
truecharts.org/catagories: |
|
||||
- media
|
||||
truecharts.org/SCALE-support: "true"
|
||||
truecharts.org/grade: U
|
||||
|
||||
@@ -10,97 +10,90 @@ questions:
|
||||
# Include{replicas1}
|
||||
# Include{podSpec}
|
||||
# Include{containerMain}
|
||||
|
||||
- variable: env
|
||||
group: "App Configuration"
|
||||
label: "Image Environment"
|
||||
schema:
|
||||
additional_attrs: true
|
||||
type: dict
|
||||
attrs:
|
||||
- variable: SPOTWEB_USERNAME
|
||||
label: "Admin username"
|
||||
description: "Username to configure for the admin of this installation."
|
||||
schema:
|
||||
type: string
|
||||
default: ""
|
||||
valid_chars: ^((?!god|mod|spot|admin|drazix|superuser|supervisor|root|anonymous)[^<>])*$
|
||||
required: true
|
||||
- variable: SPOTWEB_PASSWORD
|
||||
label: "Admin password"
|
||||
description: "Password to configure for the admin of this installation."
|
||||
schema:
|
||||
type: string
|
||||
default: ""
|
||||
valid_chars: "[a-zA-Z0-9!@#$%^&*?]{8,}"
|
||||
private: true
|
||||
required: true
|
||||
- variable: SPOTWEB_SYSTEMTYPE
|
||||
label: "System Type"
|
||||
description: "System type to configure during initialization."
|
||||
schema:
|
||||
type: string
|
||||
required: true
|
||||
default: "single"
|
||||
enum:
|
||||
- value: "single"
|
||||
description: "Singe User System"
|
||||
- value: "shared"
|
||||
description: "Shared System"
|
||||
- value: "public"
|
||||
description: "Public System"
|
||||
- variable: SPOTWEB_FIRSTNAME
|
||||
label: "Admin first name"
|
||||
description: "The first name of the admin user."
|
||||
schema:
|
||||
type: string
|
||||
required: true
|
||||
default: "firstname"
|
||||
valid_chars: ^([^<>]{2})([^<>]*)$
|
||||
- variable: SPOTWEB_LASTNAME
|
||||
label: "Admin last name"
|
||||
description: "Last name of the admin user."
|
||||
schema:
|
||||
type: string
|
||||
required: true
|
||||
default: "lastname"
|
||||
valid_chars: ^([^<>]{2})([^<>]*)$
|
||||
- variable: SPOTWEB_MAIL
|
||||
label: "Admin mail adres"
|
||||
description: "Email adres to configure for the provided admin user."
|
||||
schema:
|
||||
type: string
|
||||
required: true
|
||||
default: firstname@lastname.com
|
||||
valid_chars: ^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$
|
||||
- variable: SPOTWEB_RETRIEVE
|
||||
label: "SPOTWEB_RETRIEVE"
|
||||
description: "Schedule on which to automatically retrieve new spots."
|
||||
schema:
|
||||
type: string
|
||||
default: "15min"
|
||||
enum:
|
||||
- value: "1min"
|
||||
description: "Each minute"
|
||||
- value: "5min"
|
||||
description: "Every 5 minutes"
|
||||
- value: "15min"
|
||||
description: "Every 15 minutes"
|
||||
- value: "hourly"
|
||||
description: "Every hour"
|
||||
- value: "weekly"
|
||||
description: "Once a week"
|
||||
- value: "monthly"
|
||||
description: "Once a month"
|
||||
# Include{containerBasic}
|
||||
# Include{containerAdvanced}
|
||||
|
||||
- variable: secretEnv
|
||||
group: "App Configuration"
|
||||
label: "Image Secrets"
|
||||
schema:
|
||||
additional_attrs: true
|
||||
type: dict
|
||||
attrs:
|
||||
- variable: SPOTWEB_USERNAME
|
||||
label: "Admin username"
|
||||
description: "Username to configure for the admin of this installation."
|
||||
schema:
|
||||
type: string
|
||||
default: ""
|
||||
valid_chars: ^((?!god|mod|spot|admin|drazix|superuser|supervisor|root|anonymous)[^<>])*$
|
||||
required: true
|
||||
- variable: SPOTWEB_PASSWORD
|
||||
label: "Admin password"
|
||||
description: "Password to configure for the admin of this installation."
|
||||
schema:
|
||||
type: string
|
||||
default: ""
|
||||
valid_chars: "[a-zA-Z0-9!@#$%^&*?]{8,}"
|
||||
private: true
|
||||
required: true
|
||||
- variable: env
|
||||
group: "App Configuration"
|
||||
label: "Image Environment"
|
||||
schema:
|
||||
additional_attrs: true
|
||||
type: dict
|
||||
attrs:
|
||||
- variable: SPOTWEB_SYSTEMTYPE
|
||||
label: "System Type"
|
||||
description: "System type to configure during initialization."
|
||||
schema:
|
||||
type: string
|
||||
required: true
|
||||
default: "single"
|
||||
enum:
|
||||
- value: "single"
|
||||
description: "Singe User System"
|
||||
- value: "shared"
|
||||
description: "Shared System"
|
||||
- value: "public"
|
||||
description: "Public System"
|
||||
- variable: SPOTWEB_FIRSTNAME
|
||||
label: "Admin first name"
|
||||
description: "The first name of the admin user."
|
||||
schema:
|
||||
type: string
|
||||
required: true
|
||||
default: "firstname"
|
||||
valid_chars: ^([^<>]{2})([^<>]*)$
|
||||
- variable: SPOTWEB_LASTNAME
|
||||
label: "Admin last name"
|
||||
description: "Last name of the admin user."
|
||||
schema:
|
||||
type: string
|
||||
required: true
|
||||
default: "lastname"
|
||||
valid_chars: ^([^<>]{2})([^<>]*)$
|
||||
- variable: SPOTWEB_MAIL
|
||||
label: "Admin mail adres"
|
||||
description: "Email adres to configure for the provided admin user."
|
||||
schema:
|
||||
type: string
|
||||
required: true
|
||||
default: firstname@lastname.com
|
||||
valid_chars: ^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$
|
||||
- variable: SPOTWEB_RETRIEVE
|
||||
label: "SPOTWEB_RETRIEVE"
|
||||
description: "Schedule on which to automatically retrieve new spots."
|
||||
schema:
|
||||
type: string
|
||||
default: "15min"
|
||||
enum:
|
||||
- value: "1min"
|
||||
description: "Each minute"
|
||||
- value: "5min"
|
||||
description: "Every 5 minutes"
|
||||
- value: "15min"
|
||||
description: "Every 15 minutes"
|
||||
- value: "hourly"
|
||||
description: "Every hour"
|
||||
- value: "weekly"
|
||||
description: "Once a week"
|
||||
- value: "monthly"
|
||||
description: "Once a month"
|
||||
# Include{containerConfig}
|
||||
# Include{serviceRoot}
|
||||
- variable: main
|
||||
@@ -150,16 +143,16 @@ questions:
|
||||
schema:
|
||||
type: int
|
||||
default: 0
|
||||
- variable: runAsGroup
|
||||
label: "runAsGroup"
|
||||
description: "The groupID this App of the user running the application"
|
||||
schema:
|
||||
type: int
|
||||
default: 0
|
||||
- variable: runAsGroup
|
||||
label: "runAsGroup"
|
||||
description: "The groupID of the user running the application"
|
||||
schema:
|
||||
type: int
|
||||
default: 0
|
||||
# Include{securityContextContainer}
|
||||
# Include{securityContextAdvanced}
|
||||
# Include{securityContextPod}
|
||||
- variable: fsGroup
|
||||
- variable: fsGroup
|
||||
label: "fsGroup"
|
||||
description: "The group that should own ALL storage."
|
||||
schema:
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
{{- include "tc.v1.common.lib.chart.notes" $ -}}
|
||||
@@ -1 +1 @@
|
||||
{{ include "tc.common.loader.all" . }}
|
||||
{{ include "tc.v1.common.loader.all" . }}
|
||||
|
||||
@@ -2,51 +2,50 @@ image:
|
||||
repository: tccr.io/truecharts/spotweb
|
||||
pullPolicy: IfNotPresent
|
||||
tag: v1.5.1@sha256:465b6b094b31caa1f295dc9cdbe359d67bfda010b6b020097c54b25bb4f9710e
|
||||
|
||||
env:
|
||||
SPOTWEB_SYSTEMTYPE: "single"
|
||||
SPOTWEB_FIRSTNAME: "demo"
|
||||
SPOTWEB_LASTNAME: "spotweb"
|
||||
SPOTWEB_MAIL: "demo@spotweb.com"
|
||||
SPOTWEB_RETRIEVE: "15min"
|
||||
DB_ENGINE: "pdo_pgsql"
|
||||
DB_PORT: "5432"
|
||||
DB_DATABASE: "{{ .Values.postgresql.postgresqlDatabase }}"
|
||||
DB_USER: "{{ .Values.postgresql.postgresqlUsername }}"
|
||||
DB_SCHEMA: "public"
|
||||
DB_PASSWORD:
|
||||
secretKeyRef:
|
||||
name: dbcreds
|
||||
key: postgresql-password
|
||||
DB_HOST:
|
||||
secretKeyRef:
|
||||
name: dbcreds
|
||||
key: plainhost
|
||||
|
||||
secretEnv:
|
||||
SPOTWEB_USERNAME: "myawesomeuser"
|
||||
SPOTWEB_PASSWORD: "changeme"
|
||||
|
||||
securityContext:
|
||||
readOnlyRootFilesystem: false
|
||||
runAsNonRoot: false
|
||||
|
||||
podSecurityContext:
|
||||
runAsUser: 0
|
||||
runAsGroup: 0
|
||||
|
||||
service:
|
||||
main:
|
||||
ports:
|
||||
main:
|
||||
port: 10050
|
||||
targetPort: 80
|
||||
cnpg:
|
||||
main:
|
||||
enabled: true
|
||||
|
||||
postgresql:
|
||||
enabled: true
|
||||
existingSecret: "dbcreds"
|
||||
postgresqlUsername: spotweb
|
||||
postgresqlDatabase: spotweb
|
||||
|
||||
user: spotweb
|
||||
database: spotweb
|
||||
portal:
|
||||
enabled: true
|
||||
open:
|
||||
enabled: true
|
||||
securityContext:
|
||||
container:
|
||||
readOnlyRootFilesystem: false
|
||||
runAsNonRoot: false
|
||||
runAsUser: 0
|
||||
runAsGroup: 0
|
||||
workload:
|
||||
main:
|
||||
podSpec:
|
||||
containers:
|
||||
main:
|
||||
env:
|
||||
SPOTWEB_SYSTEMTYPE: "single"
|
||||
SPOTWEB_FIRSTNAME: "demo"
|
||||
SPOTWEB_LASTNAME: "spotweb"
|
||||
SPOTWEB_MAIL: "demo@spotweb.com"
|
||||
SPOTWEB_RETRIEVE: "15min"
|
||||
DB_ENGINE: "pdo_pgsql"
|
||||
DB_PORT: "5432"
|
||||
DB_DATABASE: "{{ .Values.cnpg.main.database }}"
|
||||
DB_USER: "{{ .Values.cnpg.main.user }}"
|
||||
DB_SCHEMA: "public"
|
||||
DB_PASSWORD:
|
||||
secretKeyRef:
|
||||
name: cnpg-main-user
|
||||
key: password
|
||||
DB_HOST:
|
||||
secretKeyRef:
|
||||
name: cnpg-main-urls
|
||||
key: host
|
||||
SPOTWEB_USERNAME: "myawesomeuser"
|
||||
SPOTWEB_PASSWORD: "changeme"
|
||||
|
||||
Reference in New Issue
Block a user