Fix annotations on multiple charts (#80)

* fix annotations for comcast chart

* fix annotations for modem-stats chart

* fix annotations for nzbget chart

* fix annotations for rtorrent-flood chart

* fix annotations for speedtest chart

* fix annotations for uptimerobot chart

comcast/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: comcast
-version: 1.0.7
+version: 1.0.8
 appVersion: 1.0.0
 description: periodic comcast data usage checks and save the results to InfluxDB
 keywords:

comcast/templates/deployment.yaml

@@ -7,12 +7,6 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  {{- if .Values.podAnnotations }}
-  annotations:
-    {{- range $key, $value := .Values.podAnnotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
 spec:
   selector:
     matchLabels:
@@ -24,6 +18,12 @@ spec:
       labels:
         app: {{ template "comcast.name" . }}
         release: {{ .Release.Name }}
+      {{- if .Values.podAnnotations }}
+      annotations:
+        {{- range $key, $value := .Values.podAnnotations }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+      {{- end }}
     spec:
       containers:
         - name: {{ .Chart.Name }}

modem-stats/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: modem-stats
-version: 1.0.8
+version: 1.0.9
 appVersion: 1.0.0
 description: periodic cable modem data collection and save the results to InfluxDB
 keywords:

modem-stats/templates/deployment.yaml

@@ -7,12 +7,6 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  {{- if .Values.podAnnotations }}
-  annotations:
-    {{- range $key, $value := .Values.podAnnotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
 spec:
   selector:
     matchLabels:
@@ -24,6 +18,12 @@ spec:
       labels:
         app: {{ template "modem-stats.name" . }}
         release: {{ .Release.Name }}
+      {{- if .Values.podAnnotations }}
+      annotations:
+        {{- range $key, $value := .Values.podAnnotations }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+      {{- end }}
     spec:
       containers:
         - name: {{ .Chart.Name }}

nzbget/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v21.0-ls14
 description: NZBGet is a Usenet downloader client
 name: nzbget
-version: 2.0.8
+version: 2.0.9
 keywords:
   - nzbget
   - usenet

nzbget/templates/deployment.yaml

@@ -7,12 +7,6 @@ metadata:
     helm.sh/chart: {{ include "nzbget.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-  {{- if .Values.podAnnotations }}
-  annotations:
-    {{- range $key, $value := .Values.podAnnotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
 spec:
   replicas: 1
   strategy:
@@ -26,6 +20,12 @@ spec:
       labels:
         app.kubernetes.io/name: {{ include "nzbget.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- if .Values.podAnnotations }}
+      annotations:
+        {{- range $key, $value := .Values.podAnnotations }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+      {{- end }}
     spec:
       containers:
         - name: {{ .Chart.Name }}

rtorrent-flood/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.0.0
 description: rtorrent and flood co-located in the same deployment
 name: rtorrent-flood
-version: 3.1.3
+version: 3.1.4
 keywords:
   - rtorrent
   - flood

rtorrent-flood/templates/deployment.yaml

@@ -7,12 +7,6 @@ metadata:
     helm.sh/chart: {{ include "rtorrent-flood.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-  {{- if .Values.podAnnotations }}
-  annotations:
-    {{- range $key, $value := .Values.podAnnotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
 spec:
   replicas: 1
   strategy:
@@ -26,6 +20,12 @@ spec:
       labels:
         app.kubernetes.io/name: {{ include "rtorrent-flood.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- if .Values.podAnnotations }}
+      annotations:
+        {{- range $key, $value := .Values.podAnnotations }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+      {{- end }}
     spec:
       containers:
         - name: {{ .Chart.Name }}-rtorrent

speedtest/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: speedtest
-version: 1.1.8
+version: 1.1.9
 appVersion: 1.0.0
 description: periodic speedtest and save the results to InfluxDB
 keywords:

speedtest/templates/deployment.yaml

@@ -7,12 +7,6 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  {{- if .Values.podAnnotations }}
-  annotations:
-    {{- range $key, $value := .Values.podAnnotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
 spec:
   selector:
     matchLabels:
@@ -24,6 +18,12 @@ spec:
       labels:
         app: {{ template "speedtest.name" . }}
         release: {{ .Release.Name }}
+      {{- if .Values.podAnnotations }}
+      annotations:
+        {{- range $key, $value := .Values.podAnnotations }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+      {{- end }}
     spec:
       containers:
         - name: {{ .Chart.Name }}

uptimerobot/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: uptimerobot
-version: 1.1.11
+version: 1.1.12
 appVersion: 1.1.0
 description: A tool to get statistics from Uptime Robot and log it into InfluxDB
 keywords:

uptimerobot/templates/deployment.yaml

@@ -7,12 +7,6 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  {{- if .Values.podAnnotations }}
-  annotations:
-    {{- range $key, $value := .Values.podAnnotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
 spec:
   selector:
     matchLabels:
@@ -24,6 +18,12 @@ spec:
       labels:
         app: {{ template "uptimerobot.name" . }}
         release: {{ .Release.Name }}
+      {{- if .Values.podAnnotations }}
+      annotations:
+        {{- range $key, $value := .Values.podAnnotations }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+      {{- end }}
     spec:
       containers:
         - name: {{ .Chart.Name }}