From 8fbe8a5d02854ad4fe4eb9c9dc87c14d1618992d Mon Sep 17 00:00:00 2001
From: David Burke <david@burkesoftware.com>
Date: Fri, 12 Feb 2021 22:23:40 -0500
Subject: [PATCH] Various fixes including autoscaling

---
 templates/NOTES.txt              | 2 +-
 templates/web/hpa.yaml           | 2 +-
 templates/worker/deployment.yaml | 6 +++---
 templates/worker/hpa.yaml        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/NOTES.txt b/templates/NOTES.txt
index 1f601e1..2fddc9e 100644
--- a/templates/NOTES.txt
+++ b/templates/NOTES.txt
@@ -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 }}
diff --git a/templates/web/hpa.yaml b/templates/web/hpa.yaml
index 1d26cec..a3cfffe 100644
--- a/templates/web/hpa.yaml
+++ b/templates/web/hpa.yaml
@@ -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:
diff --git a/templates/worker/deployment.yaml b/templates/worker/deployment.yaml
index da6a4f6..f114446 100644
--- a/templates/worker/deployment.yaml
+++ b/templates/worker/deployment.yaml
@@ -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 }}
diff --git a/templates/worker/hpa.yaml b/templates/worker/hpa.yaml
index f93531f..878c6f6 100644
--- a/templates/worker/hpa.yaml
+++ b/templates/worker/hpa.yaml
@@ -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: