Skip to content

Commit 752455a

Browse files
TheMeinerLPTheMeinerLP
committed
refactor(deployment): Remove unused environment variables and streamline values.yaml
1 parent 270a9f4 commit 752455a

File tree

2 files changed

+0
-372
lines changed

2 files changed

+0
-372
lines changed

‎helm/outline/templates/deployment.yaml‎

Lines changed: 0 additions & 238 deletions
Original file line numberDiff line numberDiff line change
@@ -60,244 +60,6 @@ spec:
6060
volumeMounts:
6161
{{- toYaml . | nindent 12 }}
6262
{{- end }}
63-
env:
64-
# GENERAL
65-
- name: NODE_ENV
66-
value: {{ .Values.outline.general.nodeEnv | quote }}
67-
68-
- name: SECRET_KEY
69-
{{- if .Values.outline.general.existingSecret }}
70-
valueFrom:
71-
secretKeyRef:
72-
name: {{ .Values.outline.general.existingSecret | quote }}
73-
key: SECRET_KEY
74-
{{- else }}
75-
value: {{ .Values.outline.general.secretKey | quote }}
76-
{{- end }}
77-
78-
- name: UTILS_SECRET
79-
{{- if .Values.outline.general.existingSecret }}
80-
valueFrom:
81-
secretKeyRef:
82-
name: {{ .Values.outline.general.existingSecret | quote }}
83-
key: UTILS_SECRET
84-
{{- else }}
85-
value: {{ .Values.outline.general.utilsSecret | quote }}
86-
{{- end }}
87-
88-
- name: URL
89-
value: {{ .Values.outline.general.url | quote }}
90-
- name: PORT
91-
value: {{ .Values.service.port | quote }}
92-
- name: FORCE_HTTPS
93-
value: {{ .Values.outline.general.forceHttps | quote }}
94-
- name: ENABLE_UPDATES
95-
value: {{ .Values.outline.general.enableUpdates | quote }}
96-
- name: WEB_CONCURRENCY
97-
value: {{ .Values.outline.general.webConcurrency | quote }}
98-
- name: DEFAULT_LANGUAGE
99-
value: {{ .Values.outline.general.defaultLanguage | quote }}
100-
- name: LOG_LEVEL
101-
value: {{ .Values.outline.general.logLevel | quote }}
102-
- name: FILE_STORAGE_UPLOAD_MAX_SIZE
103-
value: {{ .Values.outline.general.maxImportSize | quote }}
104-
105-
# RATE LIMITER
106-
- name: RATE_LIMITER_ENABLED
107-
value: {{ .Values.outline.rateLimiter.enabled | quote }}
108-
- name: RATE_LIMITER_REQUESTS
109-
value: {{ .Values.outline.rateLimiter.requests | quote }}
110-
- name: RATE_LIMITER_DURATION_WINDOW
111-
value: {{ .Values.outline.rateLimiter.durationWindow | quote }}
112-
113-
# SENTRY
114-
- name: SENTRY_DSN
115-
value: {{ .Values.outline.sentry.dsn | quote }}
116-
- name: SENTRY_ENVIRONMENT
117-
value: {{ .Values.outline.sentry.environment | quote }}
118-
119-
# NOTION
120-
- name: NOTION_CLIENT_ID
121-
value: {{ .Values.outline.notion.clientId | quote }}
122-
- name: NOTION_CLIENT_SECRET
123-
{{- if .Values.outline.notion.existingSecret }}
124-
valueFrom:
125-
secretKeyRef:
126-
name: {{ .Values.outline.notion.existingSecret | quote }}
127-
key: NOTION_CLIENT_SECRET
128-
{{- else }}
129-
value: {{ .Values.outline.notion.clientSecret | quote }}
130-
{{- end }}
131-
132-
# DATABASE
133-
- name: DATABASE_URL
134-
{{- if .Values.outline.database.existingSecret }}
135-
valueFrom:
136-
secretKeyRef:
137-
name: {{ .Values.outline.database.existingSecret | quote }}
138-
key: DATABASE_URL
139-
{{- else }}
140-
value: {{ .Values.outline.database.url | quote }}
141-
{{- end }}
142-
- name: DATABASE_CONNECTION_POOL_MIN
143-
value: {{ .Values.outline.database.connectionPoolMin | quote }}
144-
- name: DATABASE_CONNECTION_POOL_MAX
145-
value: {{ .Values.outline.database.connectionPoolMax | quote }}
146-
- name: PGSSLMODE
147-
value: {{ .Values.outline.database.pgSslMode | quote }}
148-
149-
# SLACK
150-
- name: SLACK_CLIENT_ID
151-
value: {{ .Values.outline.auth.slack.clientId | quote }}
152-
- name: SLACK_CLIENT_SECRET
153-
{{- if .Values.outline.auth.slack.existingSecret }}
154-
valueFrom:
155-
secretKeyRef:
156-
name: {{ .Values.outline.auth.slack.existingSecret | quote }}
157-
key: SLACK_CLIENT_SECRET
158-
{{- else }}
159-
value: {{ .Values.outline.auth.slack.clientSecret | quote }}
160-
{{- end }}
161-
- name: SLACK_VERIFICATION_TOKEN
162-
value: {{ .Values.outline.slackChannel.verificationToken | quote }}
163-
- name: SLACK_APP_ID
164-
value: {{ .Values.outline.slackChannel.appId | quote }}
165-
- name: SLACK_MESSAGE_ACTIONS
166-
value: {{ .Values.outline.slackChannel.messageActions | quote }}
167-
168-
# GOOGLE
169-
- name: GOOGLE_CLIENT_ID
170-
value: {{ .Values.outline.auth.google.clientId | quote }}
171-
- name: GOOGLE_CLIENT_SECRET
172-
{{- if .Values.outline.auth.google.existingSecret }}
173-
valueFrom:
174-
secretKeyRef:
175-
name: {{ .Values.outline.auth.google.existingSecret | quote }}
176-
key: GOOGLE_CLIENT_SECRET
177-
{{- else }}
178-
value: {{ .Values.outline.auth.google.clientSecret | quote }}
179-
{{- end }}
180-
181-
# AZURE
182-
- name: AZURE_CLIENT_ID
183-
value: {{ .Values.outline.auth.azure.clientId | quote }}
184-
- name: AZURE_CLIENT_SECRET
185-
{{- if .Values.outline.auth.azure.existingSecret }}
186-
valueFrom:
187-
secretKeyRef:
188-
name: {{ .Values.outline.auth.azure.existingSecret | quote }}
189-
key: AZURE_CLIENT_SECRET
190-
{{- else }}
191-
value: {{ .Values.outline.auth.azure.clientSecret | quote }}
192-
{{- end }}
193-
- name: AZURE_RESOURCE_APP_ID
194-
value: {{ .Values.outline.auth.azure.resourceAppId | quote }}
195-
196-
# GITHUB
197-
- name: GITHUB_CLIENT_ID
198-
value: {{ .Values.outline.auth.github.clientId | quote }}
199-
- name: GITHUB_CLIENT_SECRET
200-
{{- if .Values.outline.auth.github.existingSecret }}
201-
valueFrom:
202-
secretKeyRef:
203-
name: {{ .Values.outline.auth.github.existingSecret | quote }}
204-
key: GITHUB_CLIENT_SECRET
205-
{{- else }}
206-
value: {{ .Values.outline.auth.github.clientSecret | quote }}
207-
{{- end }}
208-
# ...additional GitHub vars as needed...
209-
210-
# DISCORD
211-
- name: DISCORD_CLIENT_ID
212-
value: {{ .Values.outline.auth.discord.clientId | quote }}
213-
- name: DISCORD_CLIENT_SECRET
214-
{{- if .Values.outline.auth.discord.existingSecret }}
215-
valueFrom:
216-
secretKeyRef:
217-
name: {{ .Values.outline.auth.discord.existingSecret | quote }}
218-
key: DISCORD_CLIENT_SECRET
219-
{{- else }}
220-
value: {{ .Values.outline.auth.discord.clientSecret | quote }}
221-
{{- end }}
222-
- name: DISCORD_SERVER_ID
223-
value: {{ .Values.outline.auth.discord.serverId | quote }}
224-
- name: DISCORD_SERVER_ROLES
225-
value: {{ .Values.outline.auth.discord.serverRoles | quote }}
226-
227-
# OIDC
228-
- name: OIDC_CLIENT_ID
229-
value: {{ .Values.outline.auth.oidc.clientId | quote }}
230-
- name: OIDC_CLIENT_SECRET
231-
{{- if .Values.outline.auth.oidc.existingSecret }}
232-
valueFrom:
233-
secretKeyRef:
234-
name: {{ .Values.outline.auth.oidc.existingSecret | quote }}
235-
key: OIDC_CLIENT_SECRET
236-
{{- else }}
237-
value: {{ .Values.outline.auth.oidc.clientSecret | quote }}
238-
{{- end }}
239-
# ...remaining OIDC variables...
240-
241-
# REDIS
242-
- name: REDIS_URL
243-
{{- if .Values.outline.redis.existingSecret }}
244-
valueFrom:
245-
secretKeyRef:
246-
name: {{ .Values.outline.redis.existingSecret | quote }}
247-
key: REDIS_URL
248-
{{- else }}
249-
value: {{ .Values.outline.redis.url | quote }}
250-
{{- end }}
251-
252-
# SMTP
253-
- name: SMTP_HOST
254-
value: {{ .Values.outline.smtp.host | quote }}
255-
- name: SMTP_PORT
256-
value: {{ .Values.outline.smtp.port | quote }}
257-
- name: SMTP_USERNAME
258-
value: {{ .Values.outline.smtp.username | quote }}
259-
- name: SMTP_PASSWORD
260-
{{- if .Values.outline.smtp.existingSecret }}
261-
valueFrom:
262-
secretKeyRef:
263-
name: {{ .Values.outline.smtp.existingSecret | quote }}
264-
key: SMTP_PASSWORD
265-
{{- else }}
266-
value: {{ .Values.outline.smtp.password | quote }}
267-
{{- end }}
268-
# ...other SMTP vars...
269-
270-
# FILE STORAGE
271-
- name: FILE_STORAGE
272-
value: {{ .Values.outline.fileStorage.type | quote }}
273-
- name: AWS_ACCESS_KEY_ID
274-
{{- if .Values.outline.fileStorage.s3.existingSecret }}
275-
valueFrom:
276-
secretKeyRef:
277-
name: {{ .Values.outline.fileStorage.s3.existingSecret | quote }}
278-
key: AWS_ACCESS_KEY_ID
279-
{{- else }}
280-
value: {{ .Values.outline.fileStorage.s3.accessKeyId | quote }}
281-
{{- end }}
282-
- name: AWS_SECRET_ACCESS_KEY
283-
{{- if .Values.outline.fileStorage.s3.existingSecret }}
284-
valueFrom:
285-
secretKeyRef:
286-
name: {{ .Values.outline.fileStorage.s3.existingSecret | quote }}
287-
key: AWS_SECRET_ACCESS_KEY
288-
{{- else }}
289-
value: {{ .Values.outline.fileStorage.s3.secretAccessKey | quote }}
290-
{{- end }}
291-
- name: AWS_REGION
292-
value: {{ .Values.outline.fileStorage.s3.region | quote }}
293-
- name: AWS_S3_UPLOAD_BUCKET_URL
294-
value: {{ .Values.outline.fileStorage.s3.uploadBucketUrl | quote }}
295-
- name: AWS_S3_UPLOAD_BUCKET_NAME
296-
value: {{ .Values.outline.fileStorage.s3.uploadBucketName | quote }}
297-
- name: AWS_S3_FORCE_PATH_STYLE
298-
value: {{ .Values.outline.fileStorage.s3.forcePathStyle | quote }}
299-
- name: AWS_S3_ACL
300-
value: {{ .Values.outline.fileStorage.s3.acl | quote }}
30163
{{- with .Values.volumes }}
30264
volumes:
30365
{{- toYaml . | nindent 8 }}

‎helm/outline/values.yaml‎

Lines changed: 0 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,3 @@
1-
# Default values for outline.
2-
# This is a YAML-formatted file.
3-
# Declare variables to be passed into your templates.
4-
#
5-
# Secret Keys required in your Kubernetes Secret:
6-
# - SECRET_KEY: Application secret key.
7-
# - DATABASE_URL: Database connection string.
8-
# - AWS_ACCESS_KEY_ID: AWS access key.
9-
# - AWS_SECRET_ACCESS_KEY: AWS secret key.
10-
# - SLACK_CLIENT_SECRET: Slack client secret.
11-
# - GOOGLE_CLIENT_SECRET: Google client secret.
12-
# - AZURE_CLIENT_SECRET: Azure client secret.
13-
# - SMTP_HOST, SMTP_PORT, SMTP_USERNAME, SMTP_PASSWORD: SMTP credentials.
14-
15-
# Additional documentation for existingSecret usage:
16-
# outline.general.existingSecret => SECRET_KEY, UTILS_SECRET
17-
# outline.database.existingSecret => DATABASE_URL
18-
# outline.auth.slack.existingSecret => SLACK_CLIENT_SECRET
19-
# outline.auth.google.existingSecret => GOOGLE_CLIENT_SECRET
20-
# outline.auth.azure.existingSecret => AZURE_CLIENT_SECRET
21-
# outline.auth.notion.existingSecret => NOTION_CLIENT_SECRET
22-
# outline.auth.github.existingSecret => GITHUB_CLIENT_SECRET
23-
# outline.auth.discord.existingSecret => DISCORD_CLIENT_SECRET
24-
# outline.auth.oidc.existingSecret => OIDC_CLIENT_SECRET
25-
# outline.fileStorage.s3.existingSecret => AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
26-
# outline.sentry.existingSecret => SENTRY_DSN
27-
# outline.redis.existingSecret => REDIS_URL
28-
# outline.smtp.existingSecret => SMTP_PASSWORD
29-
301
# This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
312

323
# This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/
@@ -66,111 +37,6 @@ service:
6637
# This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports
6738
port: 3000
6839

69-
outline:
70-
# Generic Outline environment variables
71-
general:
72-
nodeEnv: production
73-
url: "https://outline.apps.example.com"
74-
cdnUrl: ""
75-
forceHttps: true
76-
enableUpdates: true
77-
webConcurrency: 5
78-
maxImportSize: "5120000"
79-
utilsSecret: ""
80-
secretKey: ""
81-
sslKey: ""
82-
sslCert: ""
83-
defaultLanguage: en_US
84-
dropboxKey: ""
85-
logLevel: info
86-
existingSecret: ""
87-
rateLimiter:
88-
enabled: false
89-
requests: 1000
90-
durationWindow: 60
91-
sentry:
92-
dsn: ""
93-
environment: ""
94-
existingSecret: ""
95-
notion:
96-
clientId: ""
97-
clientSecret: ""
98-
existingSecret: ""
99-
database:
100-
url: ""
101-
connectionPoolMin: 5
102-
connectionPoolMax: 15
103-
pgSslMode: disable
104-
existingSecret: ""
105-
slackChannel:
106-
verificationToken: ""
107-
appId: ""
108-
messageActions: true
109-
existingSecret: ""
110-
redis:
111-
url: ""
112-
existingSecret: ""
113-
auth:
114-
slack:
115-
clientId: ""
116-
clientSecret: ""
117-
existingSecret: ""
118-
google:
119-
clientId: ""
120-
clientSecret: ""
121-
existingSecret: ""
122-
azure:
123-
clientId: ""
124-
clientSecret: ""
125-
resourceAppId: ""
126-
existingSecret: ""
127-
github:
128-
clientId: ""
129-
clientSecret: ""
130-
appName: ""
131-
appId: ""
132-
appPrivateKey: ""
133-
existingSecret: ""
134-
discord:
135-
clientId: ""
136-
clientSecret: ""
137-
serverId: ""
138-
serverRoles: ""
139-
existingSecret: ""
140-
oidc:
141-
clientId: ""
142-
clientSecret: ""
143-
redirectUri: ""
144-
tokenUri: ""
145-
userInfoUri: ""
146-
logoutUri: ""
147-
usernameClaim: "preferred_username"
148-
scopes: "openid profile email"
149-
displayName: "OIDC"
150-
existingSecret: ""
151-
fileStorage:
152-
type: s3
153-
uploadMaxSize: "26214400"
154-
local:
155-
rootDir: /var/lib/outline/data
156-
s3:
157-
region: "us-west-rack2"
158-
uploadBucketUrl: ""
159-
uploadBucketName: ""
160-
forcePathStyle: true
161-
acl: private
162-
existingSecret: ""
163-
smtp:
164-
host: ""
165-
port: 587
166-
username: ""
167-
password: ""
168-
fromEmail: ""
169-
replyToEmail: ""
170-
tlsCipher: ""
171-
secure: true
172-
existingSecret: ""
173-
17440
# This section builds out the service account more information can be found here: https://kubernetes.io/docs/concepts/security/service-accounts/
17541
serviceAccount:
17642
# Specifies whether a service account should be created

0 commit comments

Comments
 (0)