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
@@ -3,15 +3,12 @@ appVersion: "7.3.2"
|
||||
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
|
||||
|
||||
- condition: redis.enabled
|
||||
name: redis
|
||||
repository: https://deps.truecharts.org
|
||||
version: 5.0.33
|
||||
version: 6.0.21
|
||||
description: "ONLYOFFICE Document Server is an online office suite comprising viewers and editors for texts, spreadsheets and presentations, fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and enabling collaborative editing in real time."
|
||||
home: https://truecharts.org/charts/stable/onlyoffice-document-server
|
||||
icon: https://truecharts.org/img/hotlink-ok/chart-icons/onlyoffice-document-server.png
|
||||
@@ -27,11 +24,10 @@ sources:
|
||||
- https://github.com/truecharts/charts/tree/master/charts/stable/onlyoffice-document-server
|
||||
- https://github.com/ONLYOFFICE/DocumentServer
|
||||
- https://github.com/ONLYOFFICE/Docker-DocumentServer
|
||||
version: 9.0.26
|
||||
version: 10.0.0
|
||||
annotations:
|
||||
truecharts.org/catagories: |
|
||||
- office
|
||||
- documents
|
||||
- productivity
|
||||
truecharts.org/SCALE-support: "true"
|
||||
truecharts.org/grade: U
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
portals:
|
||||
open:
|
||||
# Include{portalLink}
|
||||
path: "/welcome"
|
||||
questions:
|
||||
# Include{global}
|
||||
# Include{workload}
|
||||
@@ -11,42 +10,35 @@ questions:
|
||||
# Include{replicas1}
|
||||
# Include{podSpec}
|
||||
# Include{containerMain}
|
||||
|
||||
- variable: env
|
||||
group: "App Configuration"
|
||||
label: "Image Environment"
|
||||
schema:
|
||||
additional_attrs: true
|
||||
type: dict
|
||||
attrs:
|
||||
- variable: JWT_SECRET
|
||||
label: "JWT_SECRET"
|
||||
description: "Defines the secret key to validate the JSON Web Token in the request to the ONLYOFFICE Document Server."
|
||||
schema:
|
||||
type: string
|
||||
private: true
|
||||
default: "REPLACETHIS"
|
||||
- variable: JWT_ENABLED
|
||||
label: "JWT_ENABLED"
|
||||
description: "Specifies the enabling the JSON Web Token validation by the ONLYOFFICE Document Server."
|
||||
schema:
|
||||
type: boolean
|
||||
default: false
|
||||
- variable: WOPI_ENABLED
|
||||
label: "WOPI_ENABLED"
|
||||
description: "Specifies the enabling the wopi handlers."
|
||||
schema:
|
||||
type: boolean
|
||||
default: false
|
||||
# Include{containerBasic}
|
||||
# Include{containerAdvanced}
|
||||
|
||||
- variable: secretEnv
|
||||
group: "App Configuration"
|
||||
label: "Image Secrets"
|
||||
schema:
|
||||
additional_attrs: true
|
||||
type: dict
|
||||
attrs:
|
||||
- variable: JWT_SECRET
|
||||
label: "JWT_SECRET"
|
||||
description: "Defines the secret key to validate the JSON Web Token in the request to the ONLYOFFICE Document Server."
|
||||
schema:
|
||||
type: string
|
||||
private: true
|
||||
default: "REPLACETHIS"
|
||||
- variable: env
|
||||
group: "App Configuration"
|
||||
label: "Image Environment"
|
||||
schema:
|
||||
additional_attrs: true
|
||||
type: dict
|
||||
attrs:
|
||||
- variable: JWT_ENABLED
|
||||
label: "JWT_ENABLED"
|
||||
description: "Specifies the enabling the JSON Web Token validation by the ONLYOFFICE Document Server."
|
||||
schema:
|
||||
type: boolean
|
||||
default: false
|
||||
- variable: WOPI_ENABLED
|
||||
label: "WOPI_ENABLED"
|
||||
description: "Specifies the enabling the wopi handlers."
|
||||
schema:
|
||||
type: boolean
|
||||
default: false
|
||||
# Include{containerConfig}
|
||||
# Include{serviceRoot}
|
||||
- variable: main
|
||||
@@ -95,16 +87,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,69 +2,68 @@ image:
|
||||
repository: tccr.io/truecharts/onlyoffice-ds
|
||||
tag: 7.3.2@sha256:9aacea7333ba95828654da677afedf3e9538cef77394c395a3991cc7f07e8e85
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
securityContext:
|
||||
readOnlyRootFilesystem: false
|
||||
runAsNonRoot: false
|
||||
|
||||
podSecurityContext:
|
||||
runAsUser: 0
|
||||
runAsGroup: 0
|
||||
|
||||
secretEnv:
|
||||
JWT_SECRET: "randomgeneratedstring"
|
||||
|
||||
env:
|
||||
WOPI_ENABLED: true
|
||||
JWT_ENABLED: true
|
||||
DB_TYPE: "postgres"
|
||||
DB_PORT: 5432
|
||||
DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}"
|
||||
DB_USER: "{{ .Values.postgresql.postgresqlUsername }}"
|
||||
REDIS_SERVER_PORT: 6379
|
||||
DB_HOST:
|
||||
secretKeyRef:
|
||||
name: dbcreds
|
||||
key: plainhost
|
||||
DB_PWD:
|
||||
secretKeyRef:
|
||||
name: dbcreds
|
||||
key: postgresql-password
|
||||
REDIS_SERVER_HOST:
|
||||
secretKeyRef:
|
||||
name: rediscreds
|
||||
key: plainhost
|
||||
REDIS_SERVER_PASS:
|
||||
secretKeyRef:
|
||||
name: rediscreds
|
||||
key: redis-password
|
||||
|
||||
probes:
|
||||
liveness:
|
||||
path: "/healthcheck"
|
||||
readiness:
|
||||
path: "/healthcheck"
|
||||
startup:
|
||||
path: "/healthcheck"
|
||||
|
||||
service:
|
||||
main:
|
||||
ports:
|
||||
main:
|
||||
port: 10043
|
||||
targetPort: 80
|
||||
|
||||
# Enabled postgres
|
||||
postgresql:
|
||||
enabled: true
|
||||
existingSecret: "dbcreds"
|
||||
postgresqlUsername: onlyoffice
|
||||
postgresqlDatabase: onlyoffice
|
||||
cnpg:
|
||||
main:
|
||||
enabled: true
|
||||
|
||||
user: onlyoffice
|
||||
database: onlyoffice
|
||||
# Enabled redis
|
||||
redis:
|
||||
enabled: true
|
||||
existingSecret: "rediscreds"
|
||||
|
||||
portal:
|
||||
enabled: true
|
||||
open:
|
||||
enabled: true
|
||||
securityContext:
|
||||
container:
|
||||
readOnlyRootFilesystem: false
|
||||
runAsNonRoot: false
|
||||
runAsUser: 0
|
||||
runAsGroup: 0
|
||||
workload:
|
||||
main:
|
||||
podSpec:
|
||||
containers:
|
||||
main:
|
||||
probes:
|
||||
liveness:
|
||||
path: "/healthcheck"
|
||||
readiness:
|
||||
path: "/healthcheck"
|
||||
startup:
|
||||
path: "/healthcheck"
|
||||
env:
|
||||
WOPI_ENABLED: true
|
||||
JWT_ENABLED: true
|
||||
DB_TYPE: "postgres"
|
||||
DB_PORT: 5432
|
||||
DB_NAME: "{{ .Values.cnpg.main.database }}"
|
||||
DB_USER: "{{ .Values.cnpg.main.user }}"
|
||||
REDIS_SERVER_PORT: 6379
|
||||
DB_HOST:
|
||||
secretKeyRef:
|
||||
name: cnpg-main-urls
|
||||
key: host
|
||||
DB_PWD:
|
||||
secretKeyRef:
|
||||
name: cnpg-main-user
|
||||
key: password
|
||||
REDIS_SERVER_HOST:
|
||||
secretKeyRef:
|
||||
expandObjectName: false
|
||||
name: '{{ printf "%s-%s" .Release.Name "rediscreds" }}'
|
||||
key: plainhost
|
||||
REDIS_SERVER_PASS:
|
||||
secretKeyRef:
|
||||
expandObjectName: false
|
||||
name: '{{ printf "%s-%s" .Release.Name "rediscreds" }}'
|
||||
key: redis-password
|
||||
JWT_SECRET: "randomgeneratedstring"
|
||||
|
||||
Reference in New Issue
Block a user