feat(chart): changes for hiru bootstrap deployment (#44)

SwanseaUniversityMedical · Dec 20, 2023 · 397d746 · 397d746
1 parent 3247f24
commit 397d746
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/charts/canary/templates/controller/daemonset.yaml b/charts/canary/templates/controller/daemonset.yaml
@@ -45,13 +45,15 @@ spec:
         {{- range $key, $value := .Values.controller.labels }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
+      {{- if or .Values.controller.annotations .Values.controller.podAnnotations  }}
       annotations:
         {{- range $key, $value := .Values.controller.podAnnotations }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
         {{- range $key, $value := .Values.controller.annotations }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
+      {{- end }}
 
     spec:
 

diff --git a/charts/canary/templates/controller/deployment.yaml b/charts/canary/templates/controller/deployment.yaml
@@ -39,13 +39,15 @@ spec:
         {{- range $key, $value := .Values.controller.labels }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
+      {{- if or .Values.controller.annotations .Values.controller.podAnnotations  }}
       annotations:
         {{- range $key, $value := .Values.controller.podAnnotations }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
         {{- range $key, $value := .Values.controller.annotations }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
+      {{- end }}
 
     spec:
 

diff --git a/charts/canary/templates/monitors/example-monitor.yaml b/charts/canary/templates/monitors/example-monitor.yaml
diff --git a/charts/canary/templates/monitors/monitors.yaml b/charts/canary/templates/monitors/monitors.yaml
@@ -0,0 +1,10 @@
+{{- range $key, $value := .Values.monitors }}
+---
+apiVersion: "canary.ukserp.ac.uk/v1"
+kind: CanaryHTTPMonitor
+metadata:
+  name: {{ $key }}
+  namespace: {{ $.Release.Namespace }}
+spec:
+{{ $value | toYaml | indent 2 }}
+{{- end }}
diff --git a/charts/canary/templates/prometheus/podmonitor.yaml b/charts/canary/templates/prometheus/podmonitor.yaml
@@ -14,10 +14,12 @@ metadata:
     {{- range $key, $value := .Values.podMonitor.labels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
+  {{- if .Values.podMonitor.annotations }}
   annotations:
     {{- range $key, $value := .Values.podMonitor.annotations }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
+  {{- end }}
 
 spec:
   jobLabel: {{ include "canary.fullname" . }}

diff --git a/charts/canary/values.yaml b/charts/canary/values.yaml
@@ -45,6 +45,4 @@ controller:
     uid: 1001
     gid: 1001
 
-monitor:
-  example:
-    enabled: false
+monitors: {}