local-it/dashboard
Archived
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove all postgres and redis, rename everything to adminFrontend, remove other things we do not need

Browse source
This commit is contained in:
Maarten de Waard 2021-09-30 15:33:22 +02:00
parent f0b0dd3e36
commit 44c020e37f
No known key found for this signature in database
GPG key ID: 1D3E893A657CC8DA
9 changed files with 109 additions and 594 deletions
Download patch file Download diff file Expand all files Collapse all files

220
deployment/helmchart/templates/deployment.yaml
View file

@ -1,10 +1,10 @@
{{- if and (include "discourse.host" .) (or .Values.postgresql.enabled .Values.externalDatabase.host) -}}
{{- if (include "adminFrontend.host" .) -}}
apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }}
kind: Deployment
metadata:
name: {{ template "common.names.fullname" . }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
component: discourse
component: adminFrontend
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
@ -15,19 +15,14 @@ spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
component: discourse
component: adminFrontend
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
template:
metadata:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmaps.yaml") . | sha256sum }}
checksum/secrets-discourse: {{ include (print $.Template.BasePath "/secrets-discourse.yaml") . | sha256sum }}
checksum/secrets-database: {{ include (print $.Template.BasePath "/secrets-database.yaml") . | sha256sum }}
checksum/secrets-redis: {{ include (print $.Template.BasePath "/secrets-redis.yaml") . | sha256sum }}
labels: {{- include "common.labels.standard" . | nindent 8 }}
component: discourse
component: adminFrontend
{{- if .Values.podLabels }}
{{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
{{- end }}
@ -35,7 +30,7 @@ spec:
annotations: {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
{{- end }}
spec:
{{- include "discourse.imagePullSecrets" . | nindent 6 }}
{{- include "adminFrontend.imagePullSecrets" . | nindent 6 }}
{{- if .Values.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}
{{- end }}
@ -53,7 +48,7 @@ spec:
{{- if .Values.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.tolerations "context" $) | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "discourse.serviceAccountName" . }}
serviceAccountName: {{ include "adminFrontend.serviceAccountName" . }}
securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }}
initContainers:
{{- if .Values.initContainers }}
@ -61,214 +56,105 @@ spec:
{{- end }}
{{- if and .Values.volumePermissions.enabled .Values.persistence.enabled }}
- name: volume-permissions
image: {{ include "discourse.image" . }}
image: {{ include "adminFrontend.image" . }}
imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
command:
- sh
- -c
- |
mkdir -p "/bitnami/discourse"
chown -R "discourse:root" "/bitnami/discourse"
mkdir -p "/bitnami/adminFrontend"
chown -R "adminFrontend:root" "/bitnami/adminFrontend"
securityContext:
runAsUser: 0
{{- if .Values.volumePermissions.resources }}
resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }}
{{- end }}
volumeMounts:
- name: discourse-data
mountPath: /bitnami/discourse
- name: adminFrontend-data
mountPath: /bitnami/adminFrontend
{{- end }}
containers:
- name: discourse
securityContext: {{- toYaml .Values.discourse.containerSecurityContext | nindent 12 }}
image: {{ template "discourse.image" . }}
- name: adminFrontend
securityContext: {{- toYaml .Values.adminFrontend.containerSecurityContext | nindent 12 }}
image: {{ template "adminFrontend.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
{{- if .Values.discourse.command }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.discourse.command "context" $) | nindent 12 }}
{{- if .Values.adminFrontend.command }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.command "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.discourse.args }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.discourse.args "context" $) | nindent 12 }}
{{- if .Values.adminFrontend.args }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.args "context" $) | nindent 12 }}
{{- end }}
env:
- name: BITNAMI_DEBUG
value: {{ ternary "true" "false" .Values.image.debug | quote }}
- name: DISCOURSE_PASSWORD
- name: ADMIN_FRONTEND_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "discourse.secretName" . }}
key: discourse-password
- name: DISCOURSE_DATABASE_PASSWORD
name: {{ include "adminFrontend.secretName" . }}
key: adminFrontend-password
{{- if (include "adminFrontend.smtp.password.enabled" .) }}
- name: ADMIN_FRONTEND_SMTP_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "discourse.postgresql.secretName" . }}
key: postgresql-password
{{- if or .Values.postgresql.enabled .Values.externalDatabase.create }}
- name: POSTGRESQL_CLIENT_POSTGRES_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "discourse.postgresql.secretName" . }}
key: postgresql-postgres-password
{{- end }}
{{- if (include "discourse.redis.auth.enabled" .) }}
- name: DISCOURSE_REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "discourse.redis.secretName" . }}
key: {{ include "discourse.redis.secretPasswordKey" . }}
{{- end }}
{{- if (include "discourse.smtp.password.enabled" .) }}
- name: DISCOURSE_SMTP_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "discourse.smtp.secretName" . }}
name: {{ include "adminFrontend.smtp.secretName" . }}
key: smtp-password
{{- end }}
{{- if .Values.discourse.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.discourse.extraEnvVars "context" $) | nindent 12 }}
{{- if .Values.adminFrontend.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.extraEnvVars "context" $) | nindent 12 }}
{{- end }}
envFrom:
- configMapRef:
name: {{ include "common.names.fullname" . }}
{{- if .Values.discourse.extraEnvVarsCM }}
{{- if .Values.adminFrontend.extraEnvVarsCM }}
- configMapRef:
name: {{ .Values.discourse.extraEnvVarsCM }}
name: {{ .Values.adminFrontend.extraEnvVarsCM }}
{{- end }}
{{- if .Values.discourse.extraEnvVarsSecret }}
{{- if .Values.adminFrontend.extraEnvVarsSecret }}
- secretRef:
name: {{ .Values.discourse.extraEnvVarsSecret }}
name: {{ .Values.adminFrontend.extraEnvVarsSecret }}
{{- end }}
ports:
- name: http
containerPort: 3000
protocol: TCP
{{- if .Values.discourse.livenessProbe.enabled }}
{{- if .Values.adminFrontend.livenessProbe.enabled }}
livenessProbe:
httpGet:
path: /srv/status
port: http
initialDelaySeconds: {{ .Values.discourse.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.discourse.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.discourse.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.discourse.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.discourse.livenessProbe.failureThreshold }}
{{- else if .Values.discourse.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.discourse.customLivenessProbe "context" $) | nindent 12 }}
initialDelaySeconds: {{ .Values.adminFrontend.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.adminFrontend.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.adminFrontend.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.adminFrontend.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.adminFrontend.livenessProbe.failureThreshold }}
{{- else if .Values.adminFrontend.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.discourse.readinessProbe.enabled }}
{{- if .Values.adminFrontend.readinessProbe.enabled }}
readinessProbe:
httpGet:
path: /srv/status
port: http
initialDelaySeconds: {{ .Values.discourse.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.discourse.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.discourse.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.discourse.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.discourse.readinessProbe.failureThreshold }}
{{- else if .Values.discourse.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.discourse.customReadinessProbe "context" $) | nindent 12 }}
initialDelaySeconds: {{ .Values.adminFrontend.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.adminFrontend.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.adminFrontend.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.adminFrontend.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.adminFrontend.readinessProbe.failureThreshold }}
{{- else if .Values.adminFrontend.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
volumeMounts:
- name: discourse-data
mountPath: /bitnami/discourse
subPath: discourse
{{- if .Values.discourse.extraVolumeMounts }}
{{- include "common.tplvalues.render" (dict "value" .Values.discourse.extraVolumeMounts "context" $) | nindent 12 }}
- name: adminFrontend-data
mountPath: /bitnami/adminFrontend
subPath: adminFrontend
{{- if .Values.adminFrontend.extraVolumeMounts }}
{{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.extraVolumeMounts "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.discourse.resources }}
resources: {{- toYaml .Values.discourse.resources | nindent 12 }}
{{- end }}
- name: sidekiq
securityContext: {{- toYaml .Values.sidekiq.containerSecurityContext | nindent 12 }}
image: {{ template "discourse.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.sidekiq.command "context" $) | nindent 12 }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.sidekiq.args "context" $) | nindent 12 }}
env:
- name: BITNAMI_DEBUG
value: {{ ternary "true" "false" .Values.image.debug | quote }}
- name: DISCOURSE_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "discourse.secretName" . }}
key: discourse-password
- name: DISCOURSE_POSTGRESQL_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "discourse.postgresql.secretName" . }}
key: postgresql-password
{{- if (include "discourse.redis.auth.enabled" .) }}
- name: REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "discourse.redis.secretName" . }}
key: {{ include "discourse.redis.secretPasswordKey" . }}
{{- end }}
{{- if (include "discourse.smtp.password.enabled" .) }}
- name: DISCOURSE_SMTP_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "discourse.smtp.secretName" . }}
key: smtp-password
{{- end }}
{{- if .Values.sidekiq.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.sidekiq.extraEnvVars "context" $) | nindent 12 }}
{{- end }}
envFrom:
- configMapRef:
name: {{ include "common.names.fullname" . }}
{{- if .Values.sidekiq.extraEnvVarsCM }}
- configMapRef:
name: {{ .Values.sidekiq.extraEnvVarsCM }}
{{- end }}
{{- if .Values.sidekiq.extraEnvVarsSecret }}
- secretRef:
name: {{ .Values.sidekiq.extraEnvVarsSecret }}
{{- end }}
{{- if .Values.sidekiq.livenessProbe.enabled }}
livenessProbe:
exec:
command: ["/bin/sh", "-c", "pgrep -f ^sidekiq"]
initialDelaySeconds: {{ .Values.sidekiq.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.sidekiq.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.sidekiq.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.sidekiq.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.sidekiq.livenessProbe.failureThreshold }}
{{- else if .Values.sidekiq.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.sidekiq.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.sidekiq.readinessProbe.enabled }}
readinessProbe:
exec:
command: ["/bin/sh", "-c", "pgrep -f ^sidekiq"]
initialDelaySeconds: {{ .Values.sidekiq.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.sidekiq.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.sidekiq.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.sidekiq.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.sidekiq.readinessProbe.failureThreshold }}
{{- else if .Values.sidekiq.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.sidekiq.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
volumeMounts:
- name: discourse-data
mountPath: /bitnami/discourse
subPath: discourse
{{- if .Values.sidekiq.extraVolumeMounts }}
{{- include "common.tplvalues.render" (dict "value" .Values.sidekiq.extraVolumeMounts "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.sidekiq.resources }}
resources: {{- toYaml .Values.sidekiq.resources | nindent 12 }}
{{- if .Values.adminFrontend.resources }}
resources: {{- toYaml .Values.adminFrontend.resources | nindent 12 }}
{{- end }}
{{- if .Values.sidecars }}
{{- include "common.tplvalues.render" (dict "value" .Values.sidecars "context" $) | nindent 8 }}
{{- end }}
volumes:
- name: discourse-data
{{- if .Values.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ .Values.persistence.existingClaim | default (include "common.names.fullname" .) }}
{{- else }}
emptyDir: {}
{{ end }}
{{- if .Values.extraVolumes }}
{{- include "common.tplvalues.render" (dict "value" .Values.extraVolumes "context" $) | nindent 8 }}
{{- end }}