add existingSecret option, align postgres PW handling
This commit is contained in:
		
							parent
							
								
									9960f52561
								
							
						
					
					
						commit
						2fc2751d75
					
				
					 4 changed files with 16 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -47,12 +47,16 @@ spec:
 | 
			
		|||
            - name: DATABASE_PASSWORD
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ include "django.postgresql.fullname" . }}
 | 
			
		||||
                  name: {{ default (include "django.postgresql.fullname" .) .Values.postgresql.auth.existingSecret }}
 | 
			
		||||
                  key: postgres-password
 | 
			
		||||
{{- end }}
 | 
			
		||||
          envFrom:
 | 
			
		||||
            - secretRef:
 | 
			
		||||
                name: {{ include "django.fullname" . }}
 | 
			
		||||
            {{- if .Values.existingSecret }}
 | 
			
		||||
            - secretRef:
 | 
			
		||||
                name: {{ .Values.existingSecret }}
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            - configMapRef:
 | 
			
		||||
                name: {{ include "django.fullname" . }}
 | 
			
		||||
      {{- with .Values.beat.nodeSelector }}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -74,6 +74,10 @@ spec:
 | 
			
		|||
          envFrom:
 | 
			
		||||
            - secretRef:
 | 
			
		||||
                name: {{ include "django.fullname" . }}
 | 
			
		||||
            {{- if .Values.existingSecret }}
 | 
			
		||||
            - secretRef:
 | 
			
		||||
                name: {{ .Values.existingSecret }}
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            - configMapRef:
 | 
			
		||||
                name: {{ include "django.fullname" . }}
 | 
			
		||||
      {{- with .Values.web.nodeSelector }}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -46,12 +46,16 @@ spec:
 | 
			
		|||
            - name: DATABASE_PASSWORD
 | 
			
		||||
              valueFrom:
 | 
			
		||||
                secretKeyRef:
 | 
			
		||||
                  name: {{ include "django.postgresql.fullname" . }}
 | 
			
		||||
                  name: {{ default (include "django.postgresql.fullname" .) .Values.postgresql.auth.existingSecret }}
 | 
			
		||||
                  key: postgres-password
 | 
			
		||||
{{- end }}
 | 
			
		||||
          envFrom:
 | 
			
		||||
            - secretRef:
 | 
			
		||||
                name: {{ include "django.fullname" . }}
 | 
			
		||||
            {{- if .Values.existingSecret }}
 | 
			
		||||
            - secretRef:
 | 
			
		||||
                name: {{ .Values.existingSecret }}
 | 
			
		||||
            {{- end }}
 | 
			
		||||
            - configMapRef:
 | 
			
		||||
                name: {{ include "django.fullname" . }}
 | 
			
		||||
      {{- with .Values.worker.nodeSelector }}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue