helm: standardize yaml configuration (#15728)
- move application variables under `mastodon` namespace - restore standard yaml structure for ingress configuration - move values.yaml.template to values.yaml
This commit is contained in:
		@@ -16,7 +16,7 @@ spec:
 | 
			
		||||
      restartPolicy: Never
 | 
			
		||||
      # ensure we run on the same node as the other rails components; only
 | 
			
		||||
      # required when using PVCs that are ReadWriteOnce
 | 
			
		||||
      {{- if or (eq "ReadWriteOnce" .Values.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.persistence.system.accessMode) }}
 | 
			
		||||
      {{- if or (eq "ReadWriteOnce" .Values.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.mastodon.persistence.system.accessMode) }}
 | 
			
		||||
      affinity:
 | 
			
		||||
        podAffinity:
 | 
			
		||||
          requiredDuringSchedulingIgnoredDuringExecution:
 | 
			
		||||
@@ -65,7 +65,7 @@ spec:
 | 
			
		||||
                  name: {{ .Release.Name }}-redis
 | 
			
		||||
                  key: redis-password
 | 
			
		||||
            - name: "PORT"
 | 
			
		||||
              value: {{ .Values.application.web.port | quote }}
 | 
			
		||||
              value: {{ .Values.mastodon.web.port | quote }}
 | 
			
		||||
          volumeMounts:
 | 
			
		||||
            - name: assets
 | 
			
		||||
              mountPath: /opt/mastodon/public/assets
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user