* 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>
		
			
				
	
	
		
			44 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			YAML
		
	
	
	
	
	
			
		
		
	
	
			44 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			YAML
		
	
	
	
	
	
| {{- if (include "mastodon.createSecret" .) }}
 | |
| apiVersion: v1
 | |
| kind: Secret
 | |
| metadata:
 | |
|   name: {{ template "mastodon.fullname" . }}
 | |
|   labels:
 | |
|     {{- include "mastodon.labels" . | nindent 4 }}
 | |
| type: Opaque
 | |
| data:
 | |
|   {{- if .Values.mastodon.s3.enabled }}
 | |
|   {{- if not .Values.mastodon.s3.existingSecret }}
 | |
|   AWS_ACCESS_KEY_ID: "{{ .Values.mastodon.s3.access_key | b64enc }}"
 | |
|   AWS_SECRET_ACCESS_KEY: "{{ .Values.mastodon.s3.access_secret | b64enc }}"
 | |
|   {{- end }}
 | |
|   {{- end }}
 | |
|   {{- if not .Values.mastodon.secrets.existingSecret }}
 | |
|   {{- if not (empty .Values.mastodon.secrets.secret_key_base) }}
 | |
|   SECRET_KEY_BASE: "{{ .Values.mastodon.secrets.secret_key_base | b64enc }}"
 | |
|   {{- else }}
 | |
|   SECRET_KEY_BASE: {{ required "secret_key_base is required" .Values.mastodon.secrets.secret_key_base }}
 | |
|   {{- end }}
 | |
|   {{- if not (empty .Values.mastodon.secrets.otp_secret) }}
 | |
|   OTP_SECRET: "{{ .Values.mastodon.secrets.otp_secret | b64enc }}"
 | |
|   {{- else }}
 | |
|   OTP_SECRET: {{ required "otp_secret is required" .Values.mastodon.secrets.otp_secret }}
 | |
|   {{- end }}
 | |
|   {{- if not (empty .Values.mastodon.secrets.vapid.private_key) }}
 | |
|   VAPID_PRIVATE_KEY: "{{ .Values.mastodon.secrets.vapid.private_key | b64enc }}"
 | |
|   {{- else }}
 | |
|   VAPID_PRIVATE_KEY: {{ required "vapid.private_key is required" .Values.mastodon.secrets.vapid.private_key }}
 | |
|   {{- end }}
 | |
|   {{- if not (empty .Values.mastodon.secrets.vapid.public_key) }}
 | |
|   VAPID_PUBLIC_KEY: "{{ .Values.mastodon.secrets.vapid.public_key | b64enc }}"
 | |
|   {{- else }}
 | |
|   VAPID_PUBLIC_KEY: {{ required "vapid.public_key is required" .Values.mastodon.secrets.vapid.public_key }}
 | |
|   {{- end }}
 | |
|   {{- end }}
 | |
|   {{- if not .Values.postgresql.enabled }}
 | |
|   {{- if not .Values.postgresql.auth.existingSecret }}
 | |
|   postgresql-password: "{{ .Values.postgresql.auth.password | b64enc }}"
 | |
|   {{- end }}
 | |
|   {{- end }}
 | |
| {{- end -}}
 |