Merge branch 'UltherEgo-master-patch-92170' into 'master'
Added the declaration of resources in pre-install-job.yaml See merge request burke-software/django-helm-chart!10
This commit is contained in:
		
						commit
						af39eedea8
					
				
					 2 changed files with 8 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -30,6 +30,9 @@ spec:
 | 
			
		|||
            {{- toYaml .Values.securityContext | nindent 12 }}
 | 
			
		||||
        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
 | 
			
		||||
        imagePullPolicy: {{ .Values.image.pullPolicy }}
 | 
			
		||||
        {{- if .Values.preInstall.resources }}        
 | 
			
		||||
        resources: {{ toYaml .Values.preInstall.resources | nindent 12 }}
 | 
			
		||||
        {{- end }}
 | 
			
		||||
        command: ["./manage.py","migrate"]
 | 
			
		||||
        env:
 | 
			
		||||
          - name: DEBUG
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,6 +14,10 @@ fullnameOverride: ""
 | 
			
		|||
preInstall:
 | 
			
		||||
  enabled: true
 | 
			
		||||
  activeDeadlineSeconds: 900
 | 
			
		||||
  resources:
 | 
			
		||||
    limits: {}
 | 
			
		||||
    requests: {}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
env:
 | 
			
		||||
  normal: {}
 | 
			
		||||
| 
						 | 
				
			
			@ -190,3 +194,4 @@ postgresql:
 | 
			
		|||
  enabled: false
 | 
			
		||||
  #auth:
 | 
			
		||||
  #  postgresqlPassword: # Must be set
 | 
			
		||||
  
 | 
			
		||||
		Reference in a new issue