Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding iframely support and fixing the quotes #25

Merged
merged 3 commits into from
Jul 28, 2024
Merged

adding iframely support and fixing the quotes #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96fe3f1
adding iframely support and fixing the quotes
strelok899 Jul 18, 2024
1a9f454
fixng typo in the StorageClassName
strelok899 Jul 18, 2024
b71f9a9
reverting the commint i used wrong name in values
strelok899 Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/outline/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ maintainers:
url: https://kubito.dev
apiVersion: v2
appVersion: 0.78.0-0
version: 1.0.5
version: 1.0.6
description: Kubito Outline Wiki Helm Chart
home: https://github.com/kubitodev/helm/tree/main/charts/outline
icon: https://kubito.dev/images/kubito.svg
Expand Down
3 changes: 3 additions & 0 deletions charts/outline/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ The command removes all the Kubernetes components associated with the chart and
| `outline.optional.fileStorageImportMaxSize` | Maximum size limit for importing documents. | `5120000` |
| `outline.optional.logLevel` | Sets the level of logging detail (e.g., info, error, debug). | `info` |
| `outline.optional.googleAnalyticsId` | Google Analytics ID for website traffic analysis. | `""` |
| `outline.optional.iframely.enabled` | Whether to enable iframely | `false` |
| `outline.optional.iframely.url` | URL of the iframely server | `"http://iframely:8061"` |
| `outline.optional.iframely.apiKey` | api key of the iframely server | `""` |
| `outline.optional.sentry.dsn` | Data Source Name for Sentry, used to report errors. | `""` |
| `outline.optional.sentry.tunnel` | URL for Sentry tunnel, useful for bypassing ad blockers. | `""` |
| `outline.optional.smtp.enabled` | Whether to enable SMTP. | `false` |
Expand Down
41 changes: 25 additions & 16 deletions charts/outline/templates/001-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,30 +75,30 @@ spec:
valueFrom:
secretKeyRef:
name: "{{ .Values.postgresql.auth.existingSecret }}"
key: password
{{- if .Values.postgresql.auth.host }}
key: "password"
{{- if .Values.postgresql.auth.host }}
- name: DATABASE_URL
value: "postgres://{{ .Values.postgresql.auth.username }}:$(POSTGRES_PASSWORD)@{{ .Values.postgresql.auth.host }}:5432/{{ .Values.postgresql.auth.database }}"
- name: DATABASE_URL_TEST
value: "postgres://{{ .Values.postgresql.auth.username }}:$(POSTGRES_PASSWORD)@{{ .Values.postgresql.auth.host }}:5432/{{ .Values.postgresql.auth.database }}_test"
{{- else }}
{{- else }}
- name: DATABASE_URL
value: "postgres://{{ .Values.postgresql.auth.username }}:$(POSTGRES_PASSWORD)@{{ .Release.Name }}-postgresql:5432/{{ .Values.postgresql.auth.database }}"
- name: DATABASE_URL_TEST
value: "postgres://{{ .Values.postgresql.auth.username }}:$(POSTGRES_PASSWORD)@{{ .Release.Name }}-postgresql:5432/{{ .Values.postgresql.auth.database }}_test"
{{- end }}
{{- end }}
{{- else }}
{{- if .Values.postgresql.auth.host }}
{{- if .Values.postgresql.auth.host }}
- name: DATABASE_URL
value: "postgres://{{ .Values.postgresql.auth.username }}:{{ .Values.postgresql.auth.password }}@{{ .Values.postgresql.auth.host }}:5432/{{ .Values.postgresql.auth.database }}"
- name: DATABASE_URL_TEST
value: "postgres://{{ .Values.postgresql.auth.username }}:{{ .Values.postgresql.auth.password }}@{{ .Values.postgresql.auth.host }}:5432/{{ .Values.postgresql.auth.database }}_test"
{{- else }}
{{- else }}
- name: DATABASE_URL
value: "postgres://{{ .Values.postgresql.auth.username }}:{{ .Values.postgresql.auth.password }}@{{ .Release.Name }}-postgresql:5432/{{ .Values.postgresql.auth.database }}"
- name: DATABASE_URL_TEST
value: "postgres://{{ .Values.postgresql.auth.username }}:{{ .Values.postgresql.auth.password }}@{{ .Release.Name }}-postgresql:5432/{{ .Values.postgresql.auth.database }}_test"
{{- end }}
{{- end }}
{{- end }}
{{- else }}
{{- if .Values.postgresql.auth.existingSecret }}
Expand All @@ -107,29 +107,29 @@ spec:
secretKeyRef:
name: "{{ .Values.postgresql.auth.existingSecret }}"
key: password
{{- if .Values.postgresql.auth.host }}
{{- if .Values.postgresql.auth.host }}
- name: DATABASE_URL
value: "postgres://{{ .Values.postgresql.auth.username }}:$(POSTGRES_PASSWORD)@{{ .Values.postgresql.auth.host }}:5432/{{ .Values.postgresql.auth.database }}"
- name: DATABASE_URL_TEST
value: "postgres://{{ .Values.postgresql.auth.username }}:$(POSTGRES_PASSWORD)@{{ .Values.postgresql.auth.host }}:5432/{{ .Values.postgresql.auth.database }}_test"
{{- else }}
{{- else }}
- name: DATABASE_URL
value: "postgres://{{ .Values.postgresql.auth.username }}:$(POSTGRES_PASSWORD)@{{ .Release.Name }}-postgresql:5432/{{ .Values.postgresql.auth.database }}"
- name: DATABASE_URL_TEST
value: "postgres://{{ .Values.postgresql.auth.username }}:$(POSTGRES_PASSWORD)@{{ .Release.Name }}-postgresql:5432/{{ .Values.postgresql.auth.database }}_test"
{{- end }}
{{- end }}
{{- else }}
{{- if .Values.postgresql.auth.host }}
{{- if .Values.postgresql.auth.host }}
- name: DATABASE_URL
value: "postgres://{{ .Values.postgresql.auth.username }}:{{ .Values.postgresql.auth.password }}@{{ .Values.postgresql.auth.host }}:5432/{{ .Values.postgresql.auth.database }}"
- name: DATABASE_URL_TEST
value: "postgres://{{ .Values.postgresql.auth.username }}:{{ .Values.postgresql.auth.password }}@{{ .Values.postgresql.auth.host }}:5432/{{ .Values.postgresql.auth.database }}_test"
{{- else }}
{{- else }}
- name: DATABASE_URL
value: "postgres://{{ .Values.postgresql.auth.username }}:{{ .Values.postgresql.auth.password }}@{{ .Release.Name }}-postgresql:5432/{{ .Values.postgresql.auth.database }}"
- name: DATABASE_URL_TEST
value: "postgres://{{ .Values.postgresql.auth.username }}:{{ .Values.postgresql.auth.password }}@{{ .Release.Name }}-postgresql:5432/{{ .Values.postgresql.auth.database }}_test"
{{- end }}
{{- end }}
{{- end }}
{{- end }}

Expand Down Expand Up @@ -174,14 +174,14 @@ spec:
- name: AWS_S3_ACL
value: "{{ .Values.minio.s3Config.acl }}"
- name: FILE_STORAGE_UPLOAD_MAX_SIZE
value: "{{ .Values.minio.s3Config.uploadMaxSize | quote }}"
value: "{{ .Values.minio.s3Config.uploadMaxSize }}"
{{- else if eq .Values.outline.fileStorage.type "local" }}
- name: FILE_STORAGE
value: "{{ .Values.outline.fileStorage.type }}"
- name: FILE_STORAGE_LOCAL_ROOT_DIR
value: "{{ .Values.outline.fileStorage.localRootDir }}"
- name: FILE_STORAGE_UPLOAD_MAX_SIZE
value: "{{ .Values.outline.fileStorage.uploadMaxSize | quote }}"
value: "{{ .Values.outline.fileStorage.uploadMaxSize }}"
{{- end }}

- name: COLLABORATION_URL
Expand All @@ -193,7 +193,7 @@ spec:
- name: WEB_CONCURRENCY
value: "{{ .Values.outline.optional.webConcurrency }}"
- name: FILE_STORAGE_IMPORT_MAX_SIZE
value: "{{ .Values.outline.optional.fileStorageImportMaxSize | quote }}"
value: "{{ .Values.outline.optional.fileStorageImportMaxSize}}"
- name: LOG_LEVEL
value: "{{ .Values.outline.optional.logLevel }}"
- name: GOOGLE_ANALYTICS_ID
Expand Down Expand Up @@ -350,6 +350,15 @@ spec:
- name: OIDC_SCOPES
value: "{{ .Values.auth.oidc.scopes }}"
{{- end }}
{{- if .Values.outline.optional.iframely.enabled }}
- name: IFRAMELY_URL
value: "{{ .Values.outline.optional.iframely.url }}"
{{- if .Values.outline.optional.iframely.apiKey }}
- name: IFRAMELY_API_KEY
value: "{{ .Values.outline.optional.iframely.apiKey }}"
{{- end }}
{{- end }}


{{- if eq .Values.outline.fileStorage.type "local" }}
volumeMounts:
Expand Down
7 changes: 7 additions & 0 deletions charts/outline/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ replicaCount: 1
## @param outline.optional.fileStorageImportMaxSize Maximum size limit for importing documents.
## @param outline.optional.logLevel Sets the level of logging detail (e.g., info, error, debug).
## @param outline.optional.googleAnalyticsId Google Analytics ID for website traffic analysis.
## @param outline.optional.iframely.enabled Whether to enable iframely.
## @param outline.optional.iframely.url URL of the iframely server.
## @param outline.optional.iframely.apiKey api key of the iframely server.
## @param outline.optional.sentry.dsn Data Source Name for Sentry, used to report errors.
## @param outline.optional.sentry.tunnel URL for Sentry tunnel, useful for bypassing ad blockers.
## @param outline.optional.smtp.enabled Whether to enable SMTP.
Expand Down Expand Up @@ -101,6 +104,10 @@ outline:
fileStorageImportMaxSize: "5120000"
logLevel: info
googleAnalyticsId: ""
iframely:
enabled: false
url: "http://iframely:8061"
apiKey: ""
sentry:
dsn: ""
tunnel: ""
Expand Down
Loading