From 05cf548b9e10b58c1a8bdf9ad71c6c848a7b30d3 Mon Sep 17 00:00:00 2001 From: Jeff Billimek Date: Sun, 13 Oct 2019 17:40:58 -0400 Subject: [PATCH] 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 | 2 +- comcast/templates/deployment.yaml | 12 ++++++------ modem-stats/Chart.yaml | 2 +- modem-stats/templates/deployment.yaml | 12 ++++++------ nzbget/Chart.yaml | 2 +- nzbget/templates/deployment.yaml | 12 ++++++------ rtorrent-flood/Chart.yaml | 2 +- rtorrent-flood/templates/deployment.yaml | 12 ++++++------ speedtest/Chart.yaml | 2 +- speedtest/templates/deployment.yaml | 12 ++++++------ uptimerobot/Chart.yaml | 2 +- uptimerobot/templates/deployment.yaml | 12 ++++++------ 12 files changed, 42 insertions(+), 42 deletions(-) diff --git a/comcast/Chart.yaml b/comcast/Chart.yaml index d57c2a68..040cdb98 100644 --- a/comcast/Chart.yaml +++ b/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: diff --git a/comcast/templates/deployment.yaml b/comcast/templates/deployment.yaml index 81127803..ba86f92e 100644 --- a/comcast/templates/deployment.yaml +++ b/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 }} diff --git a/modem-stats/Chart.yaml b/modem-stats/Chart.yaml index 4c321296..0ff43ca9 100644 --- a/modem-stats/Chart.yaml +++ b/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: diff --git a/modem-stats/templates/deployment.yaml b/modem-stats/templates/deployment.yaml index 7066d0c8..00d10781 100644 --- a/modem-stats/templates/deployment.yaml +++ b/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 }} diff --git a/nzbget/Chart.yaml b/nzbget/Chart.yaml index 47ab4a1b..ff5f06f4 100644 --- a/nzbget/Chart.yaml +++ b/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 diff --git a/nzbget/templates/deployment.yaml b/nzbget/templates/deployment.yaml index 3483f059..3d73e607 100644 --- a/nzbget/templates/deployment.yaml +++ b/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 }} diff --git a/rtorrent-flood/Chart.yaml b/rtorrent-flood/Chart.yaml index 533115e1..f859a75c 100644 --- a/rtorrent-flood/Chart.yaml +++ b/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 diff --git a/rtorrent-flood/templates/deployment.yaml b/rtorrent-flood/templates/deployment.yaml index 4ea530e4..6d78ddd6 100644 --- a/rtorrent-flood/templates/deployment.yaml +++ b/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 diff --git a/speedtest/Chart.yaml b/speedtest/Chart.yaml index 0e89ec83..fd4b5250 100644 --- a/speedtest/Chart.yaml +++ b/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: diff --git a/speedtest/templates/deployment.yaml b/speedtest/templates/deployment.yaml index 5b50ebea..f19bbf56 100644 --- a/speedtest/templates/deployment.yaml +++ b/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 }} diff --git a/uptimerobot/Chart.yaml b/uptimerobot/Chart.yaml index e83b2400..b92a25ed 100644 --- a/uptimerobot/Chart.yaml +++ b/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: diff --git a/uptimerobot/templates/deployment.yaml b/uptimerobot/templates/deployment.yaml index 6961d976..8826a0ea 100644 --- a/uptimerobot/templates/deployment.yaml +++ b/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 }}