From ab66c050223523ea9186119ee567445cc6d38219 Mon Sep 17 00:00:00 2001
From: Jonathan Ervine <jonny@olympus.localdomain>
Date: Thu, 6 Aug 2020 14:40:48 +0800
Subject: [PATCH] Fixing more errors

---
 guacamole/Chart.yaml                       |  2 +-
 guacamole/templates/guacamole-daemon.yaml  |  6 +++---
 guacamole/templates/guacamole-service.yaml |  4 ++--
 guacamole/templates/hpa.yaml               | 14 +++++++-------
 guacamole/templates/ingress.yaml           | 12 ++++++------
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/guacamole/Chart.yaml b/guacamole/Chart.yaml
index 10201b8..9539c61 100644
--- a/guacamole/Chart.yaml
+++ b/guacamole/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.7
+version: 0.1.9
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/guacamole/templates/guacamole-daemon.yaml b/guacamole/templates/guacamole-daemon.yaml
index fdf0d5d..e5172b2 100644
--- a/guacamole/templates/guacamole-daemon.yaml
+++ b/guacamole/templates/guacamole-daemon.yaml
@@ -5,12 +5,12 @@ metadata:
   labels:
     {{- include "guacamole.labels" . | nindent 4 }}
 spec:
-{{- if not .Values.autoscaling.enabled }}
+{{- if not .Values.guacd.autoscaling.enabled }}
   replicas: {{ .Values.guacd.replicaCount }}
 {{- end }}
   selector:
     matchLabels:
-      {{- include "guacamole.guacd.selectorLabels" . | nindent 6 }}
+      {{- include "guacamole.selectorLabels" . | nindent 6 }}
   template:
     metadata:
     {{- with .Values.guacd.podAnnotations }}
@@ -18,7 +18,7 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
       labels:
-        {{- include "guacamole.guacd.selectorLabels" . | nindent 8 }}
+        {{- include "guacamole.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.guacd.imagePullSecrets }}
       imagePullSecrets:
diff --git a/guacamole/templates/guacamole-service.yaml b/guacamole/templates/guacamole-service.yaml
index 7ec76a5..ddabf9f 100644
--- a/guacamole/templates/guacamole-service.yaml
+++ b/guacamole/templates/guacamole-service.yaml
@@ -5,9 +5,9 @@ metadata:
   labels:
     {{- include "guacamole.labels" . | nindent 4 }}
 spec:
-  type: {{ .Values.service.type }}
+  type: {{ .Values.guacamole.service.type }}
   ports:
-    - port: {{ .Values.service.port }}
+    - port: {{ .Values.guacamole.service.port }}
       targetPort: 8080
       protocol: TCP
       name: http
diff --git a/guacamole/templates/hpa.yaml b/guacamole/templates/hpa.yaml
index 09d2b3f..d01b54e 100644
--- a/guacamole/templates/hpa.yaml
+++ b/guacamole/templates/hpa.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.autoscaling.enabled }}
+{{- if .Values.guacamole.autoscaling.enabled }}
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
@@ -10,19 +10,19 @@ spec:
     apiVersion: apps/v1
     kind: Deployment
     name: {{ include "guacamole.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  minReplicas: {{ .Values.guacamole.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.guacamole.autoscaling.maxReplicas }}
   metrics:
-  {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+  {{- if .Values.guacamole.autoscaling.targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
         name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+        targetAverageUtilization: {{ .Values.guacamole.autoscaling.targetCPUUtilizationPercentage }}
   {{- end }}
-  {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+  {{- if .Values.guacamole.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+        targetAverageUtilization: {{ .Values.guacamole.autoscaling.targetMemoryUtilizationPercentage }}
   {{- end }}
 {{- end }}
diff --git a/guacamole/templates/ingress.yaml b/guacamole/templates/ingress.yaml
index cabd049..0d6d6ae 100644
--- a/guacamole/templates/ingress.yaml
+++ b/guacamole/templates/ingress.yaml
@@ -1,6 +1,6 @@
-{{- if .Values.ingress.enabled -}}
+{{- if .Values.guacamole.ingress.enabled -}}
 {{- $fullName := include "guacamole.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
+{{- $svcPort := .Values.guacamole.service.port -}}
 {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
@@ -11,14 +11,14 @@ metadata:
   name: {{ $fullName }}
   labels:
     {{- include "guacamole.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
+  {{- with .Values.guacamole.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if .Values.ingress.tls }}
+  {{- if .Values.guacamole.ingress.tls }}
   tls:
-    {{- range .Values.ingress.tls }}
+    {{- range .Values.guacamole.ingress.tls }}
     - hosts:
         {{- range .hosts }}
         - {{ . | quote }}
@@ -27,7 +27,7 @@ spec:
     {{- end }}
   {{- end }}
   rules:
-    {{- range .Values.ingress.hosts }}
+    {{- range .Values.guacamole.ingress.hosts }}
     - host: {{ .host | quote }}
       http:
         paths: