DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases 1 Wiki Activity

fix(outline): Use correct secret length and reduce code for init (#2388)

Browse Source 
* fix(outline): Use correct secret length and reduce code for init

* numbered init cont

* add probes
This commit is contained in:
Stavros Kois
2022-04-02 13:09:42 +03:00
committed by GitHub
parent 82dd9bb08b
commit 1f5d5e60d2
4 changed files with 48 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/stable/outline/Chart.yaml
+1 -1
View File
@@ -28,7 +28,7 @@ name: outline
sources: sources:
- https://github.com/outline/outline - https://github.com/outline/outline
type: application type: application
version: 1.0.9 version: 1.0.10
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- productivity - productivity
charts/stable/outline/questions.yaml
+1
View File
@@ -87,6 +87,7 @@ questions:
description: "URL should point to the fully qualified, publicly accessible URL." description: "URL should point to the fully qualified, publicly accessible URL."
schema: schema:
type: string type: string
required: true
default: "" default: ""
- variable: COLLABORATION_URL - variable: COLLABORATION_URL
label: "COLLABORATION_URL" label: "COLLABORATION_URL"
charts/stable/outline/templates/_secrets.tpl
+2 -2
View File
@@ -15,8 +15,8 @@ data:
SECRET_KEY: {{ index $outlineprevious.data "SECRET_KEY" }} SECRET_KEY: {{ index $outlineprevious.data "SECRET_KEY" }}
UTILS_SECRET: {{ index $outlineprevious.data "UTILS_SECRET" }} UTILS_SECRET: {{ index $outlineprevious.data "UTILS_SECRET" }}
{{- else }} {{- else }}
{{- $secret_key := randAlphaNum 32 }} {{- $secret_key := randAlphaNum 64 }}
{{- $utils_secret := randAlphaNum 32 }} {{- $utils_secret := randAlphaNum 64 }}
SECRET_KEY: {{ $secret_key | b64enc }} SECRET_KEY: {{ $secret_key | b64enc }}
UTILS_SECRET: {{ $utils_secret | b64enc }} UTILS_SECRET: {{ $utils_secret | b64enc }}
{{- end }} {{- end }}
charts/stable/outline/values.yaml
+44 -65
View File
@@ -3,10 +3,6 @@ image:
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
tag: v0.62.0@sha256:9350ace6f88ae314620ab32e9990481d0e89895409b171fa0545b8ef9f7ede65 tag: v0.62.0@sha256:9350ace6f88ae314620ab32e9990481d0e89895409b171fa0545b8ef9f7ede65
minioImage:
repository: tccr.io/truecharts/minio
tag: latest@sha256:70816dc5a2b67795a0583e54d31f96e17fb8fcf436ac17e47b47fdfd7b9660a5
securityContext: securityContext:
readOnlyRootFilesystem: false readOnlyRootFilesystem: false
runAsNonRoot: false runAsNonRoot: false
@@ -20,43 +16,43 @@ env:
PGSSLMODE: "disable" PGSSLMODE: "disable"
PORT: "{{ .Values.service.main.ports.main.port }}" PORT: "{{ .Values.service.main.ports.main.port }}"
# User defined # User defined
URL: "http://localhost:{{ .Values.service.main.ports.main.port }}"
SLACK_MESSAGE_ACTIONS: true SLACK_MESSAGE_ACTIONS: true
ENABLE_UPDATES: true ENABLE_UPDATES: true
WEB_CONCURRENCY: 1 WEB_CONCURRENCY: 1
DEFAULT_LANGUAGE: "en_US"
TEAM_LOGO: ""
MAXIMUM_IMPORT_SIZE: 5120000 MAXIMUM_IMPORT_SIZE: 5120000
ALLOWED_DOMAINS: "" DEFAULT_LANGUAGE: "en_US"
URL: "http://localhost:{{ .Values.service.main.ports.main.port }}" # TEAM_LOGO: ""
COLLABORATION_URL: "" # ALLOWED_DOMAINS: ""
SLACK_KEY: "" # COLLABORATION_URL: ""
SLACK_SECRET: "" # SLACK_KEY: ""
SLACK_VERIFICATION_TOKEN: "" # SLACK_SECRET: ""
SLACK_APP_ID: "" # SLACK_VERIFICATION_TOKEN: ""
GOOGLE_CLIENT_ID: "" # SLACK_APP_ID: ""
GOOGLE_CLIENT_SECRET: "" # GOOGLE_CLIENT_ID: ""
GOOGLE_ANALYTICS_ID: "" # GOOGLE_CLIENT_SECRET: ""
AZURE_CLIENT_ID: "" # GOOGLE_ANALYTICS_ID: ""
AZURE_CLIENT_SECRET: "" # AZURE_CLIENT_ID: ""
AZURE_RESOURCE_APP_ID: "" # AZURE_CLIENT_SECRET: ""
OIDC_CLIENT_ID: "" # AZURE_RESOURCE_APP_ID: ""
OIDC_CLIENT_SECRET: "" # OIDC_CLIENT_ID: ""
OIDC_AUTH_URI: "" # OIDC_CLIENT_SECRET: ""
OIDC_TOKEN_URI: "" # OIDC_AUTH_URI: ""
OIDC_USERINFO_URI: "" # OIDC_TOKEN_URI: ""
OIDC_USERNAME_CLAIM: "" # OIDC_USERINFO_URI: ""
OIDC_DISPLAY_NAME: "" # OIDC_USERNAME_CLAIM: ""
OIDC_SCOPES: "" # OIDC_DISPLAY_NAME: ""
SENTRY_DSN: "" # OIDC_SCOPES: ""
AWS_ACCESS_KEY_ID: "" # SENTRY_DSN: ""
AWS_SECRET_ACCESS_KEY: "" # AWS_ACCESS_KEY_ID: ""
AWS_REGION: "" # AWS_SECRET_ACCESS_KEY: ""
AWS_S3_ACCELERATE_URL: "" # AWS_REGION: ""
AWS_S3_UPLOAD_BUCKET_URL: "" # AWS_S3_ACCELERATE_URL: ""
AWS_S3_UPLOAD_BUCKET_NAME: "" # AWS_S3_UPLOAD_BUCKET_URL: ""
AWS_S3_UPLOAD_MAX_SIZE: 26214400 # AWS_S3_UPLOAD_BUCKET_NAME: ""
AWS_S3_FORCE_PATH_STYLE: true # AWS_S3_UPLOAD_MAX_SIZE: 26214400
AWS_S3_ACL: "" # AWS_S3_FORCE_PATH_STYLE: true
# AWS_S3_ACL: ""
envValueFrom: envValueFrom:
DATABASE_URL: DATABASE_URL:
@@ -82,6 +78,15 @@ service:
main: main:
port: 10196 port: 10196
probes:
liveness:
path: "/_health"
readiness:
path: "/_health"
startup:
path: "/_health"
# Enabled redis # Enabled redis
redis: redis:
enabled: true enabled: true
@@ -94,34 +99,8 @@ postgresql:
postgresqlUsername: outline postgresqlUsername: outline
postgresqlDatabase: outline postgresqlDatabase: outline
installContainers: initContainers:
initdb: 1-migratedb:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
env:
- name: DATABASE_URL
valueFrom:
secretKeyRef:
name: dbcreds
key: url-noql
- name: REDIS_URL
valueFrom:
secretKeyRef:
name: rediscreds
key: url
- name: SECRET_KEY
valueFrom:
secretKeyRef:
name: outline-secrets
key: SECRET_KEY
- name: UTILS_SECRET
valueFrom:
secretKeyRef:
name: outline-secrets
key: UTILS_SECRET
command: ["sh", "-c", "yarn sequelize db:migrate --env=production-ssl-disabled"]
upgradeContainers:
upgradedb:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
env: env:
- name: DATABASE_URL - name: DATABASE_URL