* Add ability to specify an existing Secret (#18139) Closes #18139 * Allow using secrets with external postgres * Upgrade CronJob to batch/v1 * Allow using redis.auth.existingSecret * Helmignore mastodon-*.tgz for easy local development * Upgrade helm dependencies * Upgrade postgresql to 11 * Allow putting SMTP password into a secret * Add optional login to SMTP secret This to allow setting LOGIN either in values.yaml or in the secret. * Switch to bitnami charts full archive This prevents older versions from disappearing, see https://github.com/bitnami/charts/issues/10539 for full context. Co-authored-by: Ted Tramonte <ted.tramonte@gmail.com>
		
			
				
	
	
		
			106 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			YAML
		
	
	
	
	
	
			
		
		
	
	
			106 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			YAML
		
	
	
	
	
	
apiVersion: apps/v1
 | 
						|
kind: Deployment
 | 
						|
metadata:
 | 
						|
  name: {{ include "mastodon.fullname" . }}-web
 | 
						|
  labels:
 | 
						|
    {{- include "mastodon.labels" . | nindent 4 }}
 | 
						|
spec:
 | 
						|
{{- if not .Values.autoscaling.enabled }}
 | 
						|
  replicas: {{ .Values.replicaCount }}
 | 
						|
{{- end }}
 | 
						|
  selector:
 | 
						|
    matchLabels:
 | 
						|
      {{- include "mastodon.selectorLabels" . | nindent 6 }}
 | 
						|
      component: rails
 | 
						|
  template:
 | 
						|
    metadata:
 | 
						|
    {{- with .Values.podAnnotations }}
 | 
						|
      annotations:
 | 
						|
        {{- toYaml . | nindent 8 }}
 | 
						|
        # roll the pods to pick up any db migrations
 | 
						|
        rollme: {{ randAlphaNum 5 | quote }}
 | 
						|
    {{- end }}
 | 
						|
      labels:
 | 
						|
        {{- include "mastodon.selectorLabels" . | nindent 8 }}
 | 
						|
        component: rails
 | 
						|
    spec:
 | 
						|
      {{- with .Values.imagePullSecrets }}
 | 
						|
      imagePullSecrets:
 | 
						|
        {{- toYaml . | nindent 8 }}
 | 
						|
      {{- end }}
 | 
						|
      serviceAccountName: {{ include "mastodon.serviceAccountName" . }}
 | 
						|
      securityContext:
 | 
						|
        {{- toYaml .Values.podSecurityContext | nindent 8 }}
 | 
						|
      {{- if (not .Values.mastodon.s3.enabled) }}
 | 
						|
      volumes:
 | 
						|
        - name: assets
 | 
						|
          persistentVolumeClaim:
 | 
						|
            claimName: {{ template "mastodon.fullname" . }}-assets
 | 
						|
        - name: system
 | 
						|
          persistentVolumeClaim:
 | 
						|
            claimName: {{ template "mastodon.fullname" . }}-system
 | 
						|
      {{- end }}
 | 
						|
      containers:
 | 
						|
        - name: {{ .Chart.Name }}
 | 
						|
          securityContext:
 | 
						|
            {{- toYaml .Values.securityContext | nindent 12 }}
 | 
						|
          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
 | 
						|
          imagePullPolicy: {{ .Values.image.pullPolicy }}
 | 
						|
          command:
 | 
						|
            - bundle
 | 
						|
            - exec
 | 
						|
            - puma
 | 
						|
            - -C
 | 
						|
            - config/puma.rb
 | 
						|
          envFrom:
 | 
						|
            - configMapRef:
 | 
						|
                name: {{ include "mastodon.fullname" . }}-env
 | 
						|
            - secretRef:
 | 
						|
                name: {{ template "mastodon.secretName" . }}
 | 
						|
          env:
 | 
						|
            - name: "DB_PASS"
 | 
						|
              valueFrom:
 | 
						|
                secretKeyRef:
 | 
						|
                  name: {{ template "mastodon.postgresql.secretName" . }}
 | 
						|
                  key: password
 | 
						|
            - name: "REDIS_PASSWORD"
 | 
						|
              valueFrom:
 | 
						|
                secretKeyRef:
 | 
						|
                  name: {{ template "mastodon.redis.secretName" . }}
 | 
						|
                  key: redis-password
 | 
						|
            - name: "PORT"
 | 
						|
              value: {{ .Values.mastodon.web.port | quote }}
 | 
						|
          {{- if (not .Values.mastodon.s3.enabled) }}
 | 
						|
          volumeMounts:
 | 
						|
            - name: assets
 | 
						|
              mountPath: /opt/mastodon/public/assets
 | 
						|
            - name: system
 | 
						|
              mountPath: /opt/mastodon/public/system
 | 
						|
          {{- end }}
 | 
						|
          ports:
 | 
						|
            - name: http
 | 
						|
              containerPort: {{ .Values.mastodon.web.port }}
 | 
						|
              protocol: TCP
 | 
						|
          livenessProbe:
 | 
						|
            httpGet:
 | 
						|
              path: /health
 | 
						|
              port: http
 | 
						|
          readinessProbe:
 | 
						|
            httpGet:
 | 
						|
              path: /health
 | 
						|
              port: http
 | 
						|
          resources:
 | 
						|
            {{- toYaml .Values.resources | nindent 12 }}
 | 
						|
      {{- with .Values.nodeSelector }}
 | 
						|
      nodeSelector:
 | 
						|
        {{- toYaml . | nindent 8 }}
 | 
						|
      {{- end }}
 | 
						|
      {{- with .Values.affinity }}
 | 
						|
      affinity:
 | 
						|
        {{- toYaml . | nindent 8 }}
 | 
						|
      {{- end }}
 | 
						|
      {{- with .Values.tolerations }}
 | 
						|
      tolerations:
 | 
						|
        {{- toYaml . | nindent 8 }}
 | 
						|
      {{- end }}
 |