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