update feeds and config file templating

Author: jessebot

charts/matrix/templates/bridge-rss/_feeds.tpl

@@ -0,0 +1,8 @@
+{{- define "rss_feeds.yml" }}
+feeds:
+  {{- range .Values.bridges.rss.feeds }}
+  - name: {{ .name }}
+    url: {{ .url }}
+    room: {{ .room }}
+  {{- end }}
+{{- end }}{{/* end define template rss_feeds.yml */}}

charts/matrix/templates/bridge-rss/_helpers.tpl

@@ -14,3 +14,21 @@
 {{ template "matrix.fullname" . }}-rss-registration
 {{- end -}}
 {{- end -}}
+
+{{/* config secret name */}}
+{{- define "matrix.rss.configSecret" -}}
+{{- if .Values.bridges.rss.existingSecret.config -}}
+{{ .Values.bridges.rss.existingSecret.config }}
+{{- else -}}
+{{ template "matrix.fullname" . }}-rss-config
+{{- end -}}
+{{- end -}}
+
+{{/* feeds secret name */}}
+{{- define "matrix.rss.feedsSecret" -}}
+{{- if .Values.bridges.rss.existingSecret.feeds -}}
+{{ .Values.bridges.rss.existingSecret.feeds }}
+{{- else -}}
+{{ template "matrix.fullname" . }}-rss-feeds
+{{- end -}}
+{{- end -}}

…trix/templates/bridge-rss/configmap.yaml …mplates/bridge-rss/configmap_config.yamlcharts/matrix/templates/bridge-rss/configmap.yaml renamed to charts/matrix/templates/bridge-rss/configmap_config.yaml charts/matrix/templates/bridge-rss/configmap.yaml renamed to charts/matrix/templates/bridge-rss/configmap_config.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "matrix.fullname" . }}-bridge-rss
+  name: {{ include "matrix.rss.configSecret" . }}
   labels:
   {{ include "matrix.labels" . | nindent 4}}
 data:

charts/matrix/templates/bridge-rss/configmap_feeds.yaml

@@ -0,0 +1,11 @@
+{{- if and (not .Values.bridges.rss.existingSecret.feeds ) .Values.bridges.rss.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "matrix.rss.feedsSecret" . }}
+  labels:
+  {{ include "matrix.labels" . | nindent 4}}
+data:
+  feeds.yml: |-
+    {{ include "rss_feeds.yml" . | nindent 4 }}
+{{- end }}

charts/matrix/templates/bridge-rss/deployment.yaml

@@ -118,8 +118,12 @@ spec:
         - name: data
           projected:
             sources:
+              - secret:
+                  name: {{ include "matrix.rss.configSecret" . }}
               - secret:
                   name: {{ include "matrix.rss.registrationSecret" . }}
+              - secret:
+                  name: {{ include "matrix.rss.feedsSecret" . }}
         - name: bridges
           persistentVolumeClaim:
             {{- if not .Values.bridges.volume.existingClaim }}