[statping] Allow annotations in service (#58 )

* Statping: allow annotations in service * Bump chart version to 1.0.1 Co-authored-by: Jeff Billimek <jeff@billimek.com>
[media-common] Add tests, bump version (#57 )
2020-09-22 08:12:04 -04:00 · 2020-09-22 08:07:16 -04:00 · 2020-09-21 15:13:32 -04:00 · 2020-09-21 14:57:55 -04:00
8 changed files with 40 additions and 32 deletions
--- a/charts/home-assistant/Chart.yaml
+++ b/charts/home-assistant/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 0.114.0
+appVersion: 0.115.2
 description: Home Assistant
 name: home-assistant
-version: 2.1.0
+version: 2.2.0
 keywords:
 - home-assistant
 - hass
--- a/charts/home-assistant/values.yaml
+++ b/charts/home-assistant/values.yaml
@@ -4,7 +4,7 @@

 image:
  repository: homeassistant/home-assistant
-  tag: 0.114.0
+  tag: 0.115.2
  pullPolicy: IfNotPresent
  pullSecrets: []

--- a/charts/media-common-openvpn/Chart.yaml
+++ b/charts/media-common-openvpn/Chart.yaml
@@ -4,8 +4,9 @@ description: OpenVPN add-on for `media-common`-based charts
 type: library
 keywords:
  - media-common
+  - openvpn
 home: https://github.com/k8s-at-home/charts/tree/master/charts/media-common-openvpn
 maintainers:
  - name: bjw-s
    email: bjw-s@users.noreply.github.com
-version: 1.0.0
+version: 1.0.1
--- a/charts/media-common-openvpn/templates/_container.tpl
+++ b/charts/media-common-openvpn/templates/_container.tpl
@@ -10,41 +10,39 @@ The OpenVPN container(s) to be inserted
      add: ["NET_ADMIN"]
  {{- if .Values.openvpn.env }}
  env:
-  {{- if .Values.openvpn.env }}
  {{- range $k, $v := .Values.openvpn.env }}
-    - name: {{ $k }}
-      value: {{ $v }}
+  - name: {{ $k }}
+    value: {{ $v }}
  {{- end }}
  {{- end }}  
  envFrom:
-    {{- if or .Values.openvpn.auth .Values.openvpn.authSecret }}
-    - secretRef:
-      {{- if .Values.openvpn.authSecret }}
+  {{- if or .Values.openvpn.auth .Values.openvpn.authSecret }}
+  - secretRef:
+    {{- if .Values.openvpn.authSecret }}
      name: {{ .Values.openvpn.authSecret }}
-      {{- else }}
+    {{- else }}
      name: {{ template "media-common.fullname" . }}-openvpn
-      {{- end }}
    {{- end }}
  {{- end }}
  volumeMounts:
-    {{- if .Values.openvpn.vpnConf }}
-    - name: openvpnconf
-      mountPath: /vpn/vpn.conf
-      subPath: vpnConf
-    {{- end }}
-    {{- if .Values.openvpn.scripts.up }}
-    - name: openvpnconf
-      mountPath: /vpn/up.sh
-      subPath: up.sh
-    {{- end }}
-    {{- if .Values.openvpn.scripts.down }}
-    - name: openvpnconf
-      mountPath: /vpn/down.sh
-      subPath: down.sh
-    {{- end }}
-    {{- if .Values.openvpn.additionalVolumeMounts }}
-    {{- toYaml .Values.openvpn.additionalVolumeMounts | nindent 4 }}
-    {{- end }}
+  {{- if .Values.openvpn.vpnConf }}
+  - name: openvpnconf
+    mountPath: /vpn/vpn.conf
+    subPath: vpnConf
+  {{- end }}
+  {{- if .Values.openvpn.scripts.up }}
+  - name: openvpnconf
+    mountPath: /vpn/up.sh
+    subPath: up.sh
+  {{- end }}
+  {{- if .Values.openvpn.scripts.down }}
+  - name: openvpnconf
+    mountPath: /vpn/down.sh
+    subPath: down.sh
+  {{- end }}
+  {{- if .Values.openvpn.additionalVolumeMounts }}
+  {{- toYaml .Values.openvpn.additionalVolumeMounts | nindent 2 }}
+  {{- end }}
  livenessProbe:
    {{- toYaml .Values.openvpn.livenessProbe | nindent 4 }}
 {{- end -}}
--- a/charts/media-common/Chart.yaml
+++ b/charts/media-common/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: media-common
 description: Common dependancy chart for media ecosystem containers
 type: application
-version: 1.1.0
+version: 1.1.1
 keywords:
  - media-common
 home: https://github.com/k8s-at-home/charts/tree/master/charts/media-common
--- a/charts/media-common/ci/ct-values.yaml
+++ b/charts/media-common/ci/ct-values.yaml
@@ -14,6 +14,11 @@ openvpn:
    tag: latest
    pullPolicy: IfNotPresent

+  auth: user;pass
+
+  env:
+    TZ: UTC
+
  scripts:
    up:
    down:
--- a/charts/statping/Chart.yaml
+++ b/charts/statping/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: statping
 description: Status page for monitoring your websites and applications
 type: application
-version: 1.0.0
+version: 1.0.1
 appVersion: v0.90.65
 keywords:
  - statping
--- a/charts/statping/templates/service.yaml
+++ b/charts/statping/templates/service.yaml
@@ -4,6 +4,10 @@ metadata:
  name: {{ include "statping.fullname" . }}
  labels:
    {{- include "statping.labels" . | nindent 4 }}
+{{- with .Values.service.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
  type: {{ .Values.service.type }}
  ports:
Author	SHA1	Message	Date
Gallardo994	85c7673e31	[statping] Allow annotations in service (#58 ) * Statping: allow annotations in service * Bump chart version to 1.0.1 Co-authored-by: Jeff Billimek <jeff@billimek.com>	2020-09-22 08:12:04 -04:00
Bernd Schörgers	53ca0dfafd	[media-common] Add tests, bump version (#57 )	2020-09-22 08:07:16 -04:00
Dan Webb	ade40a1e9d	[home-assistant] Bump homeassistant to 0.115.2 (#55 ) Signed-off-by: Dan Webb <dan.webb@damacus.io> Co-authored-by: Jeff Billimek <jeff@billimek.com>	2020-09-21 15:13:32 -04:00
Bernd Schörgers	bc2742e655	[media-common-openvpn] Fix auth syntax, indenting (#56 )	2020-09-21 14:57:55 -04:00