Fix broken dependencies in helm chart and allow using existing secrets in the chart (#18941)
* 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>
This commit is contained in:
		@@ -50,21 +50,17 @@ spec:
 | 
			
		||||
            - configMapRef:
 | 
			
		||||
                name: {{ include "mastodon.fullname" . }}-env
 | 
			
		||||
            - secretRef:
 | 
			
		||||
                name: {{ template "mastodon.fullname" . }}
 | 
			
		||||
                name: {{ template "mastodon.secretName" . }}
 | 
			
		||||
          env:
 | 
			
		||||
            - name: "DB_PASS"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  {{- if .Values.postgresql.enabled }}
 | 
			
		||||
                  name: {{ .Release.Name }}-postgresql
 | 
			
		||||
                  {{- else }}
 | 
			
		||||
                  name: {{ template "mastodon.fullname" . }}
 | 
			
		||||
                  {{- end }}
 | 
			
		||||
                  key: postgresql-password
 | 
			
		||||
                  name: {{ template "mastodon.postgresql.secretName" . }}
 | 
			
		||||
                  key: password
 | 
			
		||||
            - name: "REDIS_PASSWORD"
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ .Release.Name }}-redis
 | 
			
		||||
                  name: {{ template "mastodon.redis.secretName" . }}
 | 
			
		||||
                  key: redis-password
 | 
			
		||||
            - name: "PORT"
 | 
			
		||||
              value: {{ .Values.mastodon.web.port | quote }}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user