Various fixes including autoscaling
This commit is contained in:
		
							parent
							
								
									883d0c6d20
								
							
						
					
					
						commit
						8fbe8a5d02
					
				
					 4 changed files with 6 additions and 6 deletions
				
			
		| 
						 | 
				
			
			@ -2,7 +2,7 @@
 | 
			
		|||
{{- if .Values.web.ingress.enabled }}
 | 
			
		||||
{{- range $host := .Values.web.ingress.hosts }}
 | 
			
		||||
  {{- range .paths }}
 | 
			
		||||
  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
 | 
			
		||||
  http{{ if $.Values.web.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
 | 
			
		||||
  {{- end }}
 | 
			
		||||
{{- end }}
 | 
			
		||||
{{- else if contains "NodePort" .Values.web.service.type }}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,7 +2,7 @@
 | 
			
		|||
apiVersion: autoscaling/v2beta1
 | 
			
		||||
kind: HorizontalPodAutoscaler
 | 
			
		||||
metadata:
 | 
			
		||||
  name: {{ template "django.fullname" . }}
 | 
			
		||||
  name: {{ template "django.fullname" . }}-web
 | 
			
		||||
  labels:
 | 
			
		||||
    {{- include "django.labels" . | nindent 4 }}
 | 
			
		||||
spec:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -58,15 +58,15 @@ spec:
 | 
			
		|||
                name: {{ include "django.fullname" . }}
 | 
			
		||||
            - configMapRef:
 | 
			
		||||
                name: {{ include "django.fullname" . }}
 | 
			
		||||
      {{- with .Values.nodeSelector }}
 | 
			
		||||
      {{- with .Values.worker.nodeSelector }}
 | 
			
		||||
      nodeSelector:
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
      {{- end }}
 | 
			
		||||
    {{- with .Values.affinity }}
 | 
			
		||||
    {{- with .Values.worker.affinity }}
 | 
			
		||||
      affinity:
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
    {{- end }}
 | 
			
		||||
    {{- with .Values.tolerations }}
 | 
			
		||||
    {{- with .Values.worker.tolerations }}
 | 
			
		||||
      tolerations:
 | 
			
		||||
        {{- toYaml . | nindent 8 }}
 | 
			
		||||
    {{- end }}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,7 +2,7 @@
 | 
			
		|||
apiVersion: autoscaling/v2beta1
 | 
			
		||||
kind: HorizontalPodAutoscaler
 | 
			
		||||
metadata:
 | 
			
		||||
  name: {{ template "django.fullname" . }}
 | 
			
		||||
  name: {{ template "django.fullname" . }}-worker
 | 
			
		||||
  labels:
 | 
			
		||||
    {{- include "django.labels" . | nindent 4 }}
 | 
			
		||||
spec:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue