diff --git a/charts/stable/bazarr/Chart.yaml b/charts/stable/bazarr/Chart.yaml index b4dbb28235c..c1e4ecec1bf 100644 --- a/charts/stable/bazarr/Chart.yaml +++ b/charts/stable/bazarr/Chart.yaml @@ -38,4 +38,4 @@ sources: - https://github.com/morpheus65535/bazarr - https://github.com/truecharts/charts/tree/master/charts/stable/bazarr type: application -version: 21.1.3 +version: 21.1.4 diff --git a/charts/stable/bazarr/ci/disabledmetrics-values.yaml b/charts/stable/bazarr/ci/disabledmetrics-values.yaml new file mode 100644 index 00000000000..c54316d241a --- /dev/null +++ b/charts/stable/bazarr/ci/disabledmetrics-values.yaml @@ -0,0 +1,9 @@ +metrics: + main: + enabled: false + type: "servicemonitor" + endpoints: + - port: metrics + path: /metrics + prometheusRule: + enabled: false diff --git a/charts/stable/bazarr/values.yaml b/charts/stable/bazarr/values.yaml index a82ad0f96d5..182702d5f0c 100644 --- a/charts/stable/bazarr/values.yaml +++ b/charts/stable/bazarr/values.yaml @@ -14,26 +14,19 @@ service: protocol: http targetPort: 6767 metrics: - enabled: true + enabled: "{{ .Values.metrics.main.enabled }}" type: ClusterIP - targetSelector: exportarr ports: metrics: enabled: true port: 7879 - targetSelector: exportarr workload: - exportarr: - enabled: "{{ .Values.metrics.main.enabled }}" - type: Deployment - strategy: RollingUpdate - replicas: 1 + main: podSpec: containers: exportarr: - primary: true - enabled: true + enabled: "{{ .Values.metrics.main.enabled }}" imageSelector: exportarrImage args: - bazarr @@ -66,7 +59,6 @@ persistence: main: main: mountPath: /config - exportarr: exportarr: mountPath: /config readOnly: true diff --git a/charts/stable/lidarr/Chart.yaml b/charts/stable/lidarr/Chart.yaml index 23bda8bc3af..04d22026860 100644 --- a/charts/stable/lidarr/Chart.yaml +++ b/charts/stable/lidarr/Chart.yaml @@ -35,4 +35,4 @@ sources: - https://github.com/Lidarr/Lidarr - https://github.com/truecharts/charts/tree/master/charts/stable/lidarr type: application -version: 23.2.2 +version: 23.2.3 diff --git a/charts/stable/lidarr/ci/default-values.yaml b/charts/stable/lidarr/ci/default-values.yaml new file mode 100644 index 00000000000..daba1bd9648 --- /dev/null +++ b/charts/stable/lidarr/ci/default-values.yaml @@ -0,0 +1,3 @@ +metrics: + main: + enabled: true diff --git a/charts/stable/lidarr/ci/disabledmetrics-values.yaml b/charts/stable/lidarr/ci/disabledmetrics-values.yaml new file mode 100644 index 00000000000..c54316d241a --- /dev/null +++ b/charts/stable/lidarr/ci/disabledmetrics-values.yaml @@ -0,0 +1,9 @@ +metrics: + main: + enabled: false + type: "servicemonitor" + endpoints: + - port: metrics + path: /metrics + prometheusRule: + enabled: false diff --git a/charts/stable/lidarr/templates/common.yaml b/charts/stable/lidarr/templates/common.yaml index 3c93f578611..b51394e00a4 100644 --- a/charts/stable/lidarr/templates/common.yaml +++ b/charts/stable/lidarr/templates/common.yaml @@ -1,11 +1 @@ -{{/* Make sure all variables are set properly */}} -{{- include "tc.v1.common.loader.init" . -}} - -{{/* Disable [exportarr] if requested */}} -{{- if not .Values.metrics.main.enabled -}} - {{- $_ := set .Values.workload.exportarr "enabled" false -}} - {{- $_ := set .Values.service.metrics "enabled" false -}} -{{- end -}} - -{{/* Render the templates */}} -{{- include "tc.v1.common.loader.apply" . -}} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/lidarr/values.yaml b/charts/stable/lidarr/values.yaml index 4c7f6cb664d..d88bcfc60f0 100644 --- a/charts/stable/lidarr/values.yaml +++ b/charts/stable/lidarr/values.yaml @@ -15,14 +15,12 @@ service: main: port: 8686 metrics: - enabled: true + enabled: "{{ .Values.metrics.main.enabled }}" type: ClusterIP - targetSelector: exportarr ports: metrics: enabled: true port: 8687 - targetSelector: exportarr workload: main: podSpec: @@ -44,16 +42,8 @@ workload: env: LIDARR__PORT: "{{ .Values.service.main.ports.main.port }}" LIDARR__AUTHENTICATION_METHOD: "" - exportarr: - enabled: true - type: Deployment - strategy: RollingUpdate - replicas: 1 - podSpec: - containers: exportarr: - primary: true - enabled: true + enabled: "{{ .Values.metrics.main.enabled }}" imageSelector: exportarrImage args: - lidarr @@ -89,7 +79,6 @@ persistence: main: main: mountPath: /config - exportarr: exportarr: mountPath: /config readOnly: true diff --git a/charts/stable/prowlarr/Chart.yaml b/charts/stable/prowlarr/Chart.yaml index fe0e08e9cec..f0bb386bc03 100644 --- a/charts/stable/prowlarr/Chart.yaml +++ b/charts/stable/prowlarr/Chart.yaml @@ -36,4 +36,4 @@ sources: - https://github.com/k8s-at-home/container-images - https://github.com/truecharts/charts/tree/master/charts/stable/prowlarr type: application -version: 18.3.1 +version: 18.3.2 diff --git a/charts/stable/prowlarr/ci/default-values.yaml b/charts/stable/prowlarr/ci/default-values.yaml new file mode 100644 index 00000000000..daba1bd9648 --- /dev/null +++ b/charts/stable/prowlarr/ci/default-values.yaml @@ -0,0 +1,3 @@ +metrics: + main: + enabled: true diff --git a/charts/stable/prowlarr/ci/disabledmetrics-values.yaml b/charts/stable/prowlarr/ci/disabledmetrics-values.yaml new file mode 100644 index 00000000000..c54316d241a --- /dev/null +++ b/charts/stable/prowlarr/ci/disabledmetrics-values.yaml @@ -0,0 +1,9 @@ +metrics: + main: + enabled: false + type: "servicemonitor" + endpoints: + - port: metrics + path: /metrics + prometheusRule: + enabled: false diff --git a/charts/stable/prowlarr/templates/common.yaml b/charts/stable/prowlarr/templates/common.yaml index 3c93f578611..b51394e00a4 100644 --- a/charts/stable/prowlarr/templates/common.yaml +++ b/charts/stable/prowlarr/templates/common.yaml @@ -1,11 +1 @@ -{{/* Make sure all variables are set properly */}} -{{- include "tc.v1.common.loader.init" . -}} - -{{/* Disable [exportarr] if requested */}} -{{- if not .Values.metrics.main.enabled -}} - {{- $_ := set .Values.workload.exportarr "enabled" false -}} - {{- $_ := set .Values.service.metrics "enabled" false -}} -{{- end -}} - -{{/* Render the templates */}} -{{- include "tc.v1.common.loader.apply" . -}} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/prowlarr/values.yaml b/charts/stable/prowlarr/values.yaml index a84052bfbc6..764e9903054 100644 --- a/charts/stable/prowlarr/values.yaml +++ b/charts/stable/prowlarr/values.yaml @@ -15,14 +15,12 @@ service: main: port: 9696 metrics: - enabled: true + enabled: "{{ .Values.metrics.main.enabled }}" type: ClusterIP - targetSelector: exportarr ports: metrics: enabled: true port: 9697 - targetSelector: exportarr workload: main: podSpec: @@ -38,16 +36,8 @@ workload: env: PROWLARR__PORT: "{{ .Values.service.main.ports.main.port }}" PROWLARR__AUTHENTICATION_METHOD: "" - exportarr: - enabled: true - type: Deployment - strategy: RollingUpdate - replicas: 1 - podSpec: - containers: exportarr: - primary: true - enabled: true + enabled: "{{ .Values.metrics.main.enabled }}" imageSelector: exportarrImage args: - prowlarr @@ -87,7 +77,6 @@ persistence: main: main: mountPath: /config - exportarr: exportarr: mountPath: /config readOnly: true diff --git a/charts/stable/radarr/Chart.yaml b/charts/stable/radarr/Chart.yaml index 586eca9b0e2..6f38da4f58d 100644 --- a/charts/stable/radarr/Chart.yaml +++ b/charts/stable/radarr/Chart.yaml @@ -35,4 +35,4 @@ sources: - https://github.com/Radarr/Radarr - https://github.com/truecharts/charts/tree/master/charts/stable/radarr type: application -version: 23.4.0 +version: 23.4.1 \ No newline at end of file diff --git a/charts/stable/radarr/ci/disabledmetrics-values.yaml b/charts/stable/radarr/ci/disabledmetrics-values.yaml new file mode 100644 index 00000000000..c54316d241a --- /dev/null +++ b/charts/stable/radarr/ci/disabledmetrics-values.yaml @@ -0,0 +1,9 @@ +metrics: + main: + enabled: false + type: "servicemonitor" + endpoints: + - port: metrics + path: /metrics + prometheusRule: + enabled: false diff --git a/charts/stable/radarr/templates/common.yaml b/charts/stable/radarr/templates/common.yaml index 3c93f578611..b51394e00a4 100644 --- a/charts/stable/radarr/templates/common.yaml +++ b/charts/stable/radarr/templates/common.yaml @@ -1,11 +1 @@ -{{/* Make sure all variables are set properly */}} -{{- include "tc.v1.common.loader.init" . -}} - -{{/* Disable [exportarr] if requested */}} -{{- if not .Values.metrics.main.enabled -}} - {{- $_ := set .Values.workload.exportarr "enabled" false -}} - {{- $_ := set .Values.service.metrics "enabled" false -}} -{{- end -}} - -{{/* Render the templates */}} -{{- include "tc.v1.common.loader.apply" . -}} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/radarr/values.yaml b/charts/stable/radarr/values.yaml index 5bfd74caea9..493acf449b0 100644 --- a/charts/stable/radarr/values.yaml +++ b/charts/stable/radarr/values.yaml @@ -15,14 +15,12 @@ service: main: port: 7878 metrics: - enabled: true + enabled: "{{ .Values.metrics.main.enabled }}" type: ClusterIP - targetSelector: exportarr ports: metrics: enabled: true port: 7879 - targetSelector: exportarr workload: main: podSpec: @@ -43,16 +41,8 @@ workload: path: /ping env: RADARR__PORT: "{{ .Values.service.main.ports.main.port }}" - exportarr: - enabled: true - type: Deployment - strategy: RollingUpdate - replicas: 1 - podSpec: - containers: exportarr: - primary: true - enabled: true + enabled: "{{ .Values.metrics.main.enabled }}" imageSelector: exportarrImage args: - radarr @@ -88,7 +78,6 @@ persistence: main: main: mountPath: /config - exportarr: exportarr: mountPath: /config readOnly: true diff --git a/charts/stable/readarr/Chart.yaml b/charts/stable/readarr/Chart.yaml index 6a8c8871e52..dea28d0c6b3 100644 --- a/charts/stable/readarr/Chart.yaml +++ b/charts/stable/readarr/Chart.yaml @@ -38,4 +38,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/readarr - https://readarr.com type: application -version: 23.1.4 +version: 23.1.5 diff --git a/charts/stable/readarr/ci/default-values.yaml b/charts/stable/readarr/ci/default-values.yaml new file mode 100644 index 00000000000..daba1bd9648 --- /dev/null +++ b/charts/stable/readarr/ci/default-values.yaml @@ -0,0 +1,3 @@ +metrics: + main: + enabled: true diff --git a/charts/stable/readarr/ci/disabledmetrics-values.yaml b/charts/stable/readarr/ci/disabledmetrics-values.yaml new file mode 100644 index 00000000000..c54316d241a --- /dev/null +++ b/charts/stable/readarr/ci/disabledmetrics-values.yaml @@ -0,0 +1,9 @@ +metrics: + main: + enabled: false + type: "servicemonitor" + endpoints: + - port: metrics + path: /metrics + prometheusRule: + enabled: false diff --git a/charts/stable/readarr/templates/common.yaml b/charts/stable/readarr/templates/common.yaml index 3c93f578611..b51394e00a4 100644 --- a/charts/stable/readarr/templates/common.yaml +++ b/charts/stable/readarr/templates/common.yaml @@ -1,11 +1 @@ -{{/* Make sure all variables are set properly */}} -{{- include "tc.v1.common.loader.init" . -}} - -{{/* Disable [exportarr] if requested */}} -{{- if not .Values.metrics.main.enabled -}} - {{- $_ := set .Values.workload.exportarr "enabled" false -}} - {{- $_ := set .Values.service.metrics "enabled" false -}} -{{- end -}} - -{{/* Render the templates */}} -{{- include "tc.v1.common.loader.apply" . -}} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/readarr/values.yaml b/charts/stable/readarr/values.yaml index f9f9f7bf970..bb9f2e481d9 100644 --- a/charts/stable/readarr/values.yaml +++ b/charts/stable/readarr/values.yaml @@ -15,14 +15,12 @@ service: main: port: 8787 metrics: - enabled: true + enabled: "{{ .Values.metrics.main.enabled }}" type: ClusterIP - targetSelector: exportarr ports: metrics: enabled: true port: 8788 - targetSelector: exportarr workload: main: podSpec: @@ -44,16 +42,8 @@ workload: env: READARR__PORT: "{{ .Values.service.main.ports.main.port }}" READARR__AUTHENTICATION_METHOD: "None" - exportarr: - enabled: true - type: Deployment - strategy: RollingUpdate - replicas: 1 - podSpec: - containers: exportarr: - primary: true - enabled: true + enabled: "{{ .Values.metrics.main.enabled }}" imageSelector: exportarrImage args: - readarr @@ -89,7 +79,6 @@ persistence: main: main: mountPath: /config - exportarr: exportarr: mountPath: /config readOnly: true diff --git a/charts/stable/rtorrent-rutorrent/Chart.yaml b/charts/stable/rtorrent-rutorrent/Chart.yaml index 288607f71de..cea25186f07 100644 --- a/charts/stable/rtorrent-rutorrent/Chart.yaml +++ b/charts/stable/rtorrent-rutorrent/Chart.yaml @@ -35,4 +35,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/rtorrent-rutorrent - https://truecharts.org/charts/stable/rtorrent-rutorrent type: application -version: 6.1.4 +version: 6.1.5 diff --git a/charts/stable/rtorrent-rutorrent/ci/default-values.yaml b/charts/stable/rtorrent-rutorrent/ci/default-values.yaml new file mode 100644 index 00000000000..daba1bd9648 --- /dev/null +++ b/charts/stable/rtorrent-rutorrent/ci/default-values.yaml @@ -0,0 +1,3 @@ +metrics: + main: + enabled: true diff --git a/charts/stable/rtorrent-rutorrent/ci/disabledmetrics-values.yaml b/charts/stable/rtorrent-rutorrent/ci/disabledmetrics-values.yaml new file mode 100644 index 00000000000..c54316d241a --- /dev/null +++ b/charts/stable/rtorrent-rutorrent/ci/disabledmetrics-values.yaml @@ -0,0 +1,9 @@ +metrics: + main: + enabled: false + type: "servicemonitor" + endpoints: + - port: metrics + path: /metrics + prometheusRule: + enabled: false diff --git a/charts/stable/rtorrent-rutorrent/templates/common.yaml b/charts/stable/rtorrent-rutorrent/templates/common.yaml index 3c93f578611..b51394e00a4 100644 --- a/charts/stable/rtorrent-rutorrent/templates/common.yaml +++ b/charts/stable/rtorrent-rutorrent/templates/common.yaml @@ -1,11 +1 @@ -{{/* Make sure all variables are set properly */}} -{{- include "tc.v1.common.loader.init" . -}} - -{{/* Disable [exportarr] if requested */}} -{{- if not .Values.metrics.main.enabled -}} - {{- $_ := set .Values.workload.exportarr "enabled" false -}} - {{- $_ := set .Values.service.metrics "enabled" false -}} -{{- end -}} - -{{/* Render the templates */}} -{{- include "tc.v1.common.loader.apply" . -}} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/rtorrent-rutorrent/values.yaml b/charts/stable/rtorrent-rutorrent/values.yaml index 25074ebfead..a8f51ee2cac 100644 --- a/charts/stable/rtorrent-rutorrent/values.yaml +++ b/charts/stable/rtorrent-rutorrent/values.yaml @@ -57,14 +57,12 @@ service: enabled: true port: 50000 metrics: - enabled: true + enabled: "{{ .Values.metrics.main.enabled }}" type: ClusterIP - targetSelector: exportarr ports: metrics: enabled: true port: 9135 - targetSelector: exportarr workload: main: @@ -91,17 +89,8 @@ workload: XMLRPC_PORT: "{{ .Values.service.xmlrpc.ports.xmlrpc.port }}" WEBDAV_PORT: "{{ .Values.service.webdav.ports.webdav.port }}" RT_INC_PORT: "{{ .Values.service.rtinc.ports.rtinc.port }}" - - exportarr: - enabled: true - type: Deployment - strategy: RollingUpdate - replicas: 1 - podSpec: - containers: exportarr: - primary: true - enabled: true + enabled: "{{ .Values.metrics.main.enabled }}" imageSelector: exportarrImage args: - --rtorrent.scrape-uri={{ printf "http://%s-xmlrpc.%s:%v/RPC2/" .Release.Name .Release.Namespace .Values.service.xmlrpc.ports.xmlrpc.port }} diff --git a/charts/stable/sabnzbd/Chart.yaml b/charts/stable/sabnzbd/Chart.yaml index b65f56f7860..3eb62d102e4 100644 --- a/charts/stable/sabnzbd/Chart.yaml +++ b/charts/stable/sabnzbd/Chart.yaml @@ -34,4 +34,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/sabnzbd - https://sabnzbd.org/ type: application -version: 21.1.5 +version: 21.1.6 diff --git a/charts/stable/sabnzbd/ci/disabledmetrics-values.yaml b/charts/stable/sabnzbd/ci/disabledmetrics-values.yaml new file mode 100644 index 00000000000..c54316d241a --- /dev/null +++ b/charts/stable/sabnzbd/ci/disabledmetrics-values.yaml @@ -0,0 +1,9 @@ +metrics: + main: + enabled: false + type: "servicemonitor" + endpoints: + - port: metrics + path: /metrics + prometheusRule: + enabled: false diff --git a/charts/stable/sabnzbd/values.yaml b/charts/stable/sabnzbd/values.yaml index c0dc23bbae3..ea2b7064802 100644 --- a/charts/stable/sabnzbd/values.yaml +++ b/charts/stable/sabnzbd/values.yaml @@ -12,14 +12,12 @@ service: main: port: 10097 metrics: - enabled: true + enabled: "{{ .Values.metrics.main.enabled }}" type: ClusterIP - targetSelector: exportarr ports: metrics: enabled: true port: 8990 - targetSelector: exportarr workload: main: podSpec: @@ -28,16 +26,8 @@ workload: env: SABNZBD__HOST_WHITELIST_ENTRIES: "" SABNZBD__PORT: "{{ .Values.service.main.ports.main.port }}" - exportarr: - enabled: "{{ .Values.metrics.main.enabled }}" - type: Deployment - strategy: RollingUpdate - replicas: 1 - podSpec: - containers: exportarr: - primary: true - enabled: true + enabled: "{{ .Values.metrics.main.enabled }}" imageSelector: exportarrImage args: - sabnzbd @@ -69,7 +59,6 @@ persistence: main: main: mountPath: /config - exportarr: exportarr: mountPath: /config readOnly: true diff --git a/charts/stable/sonarr/Chart.yaml b/charts/stable/sonarr/Chart.yaml index 2ee4d140f7f..298bbe722e0 100644 --- a/charts/stable/sonarr/Chart.yaml +++ b/charts/stable/sonarr/Chart.yaml @@ -35,4 +35,4 @@ sources: - https://github.com/Sonarr/Sonarr - https://github.com/truecharts/charts/tree/master/charts/stable/sonarr type: application -version: 23.1.5 +version: 23.1.6 diff --git a/charts/stable/sonarr/templates/common.yaml b/charts/stable/sonarr/templates/common.yaml index 3c93f578611..b51394e00a4 100644 --- a/charts/stable/sonarr/templates/common.yaml +++ b/charts/stable/sonarr/templates/common.yaml @@ -1,11 +1 @@ -{{/* Make sure all variables are set properly */}} -{{- include "tc.v1.common.loader.init" . -}} - -{{/* Disable [exportarr] if requested */}} -{{- if not .Values.metrics.main.enabled -}} - {{- $_ := set .Values.workload.exportarr "enabled" false -}} - {{- $_ := set .Values.service.metrics "enabled" false -}} -{{- end -}} - -{{/* Render the templates */}} -{{- include "tc.v1.common.loader.apply" . -}} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/sonarr/values.yaml b/charts/stable/sonarr/values.yaml index 8c3c310eb5b..fae8080805e 100644 --- a/charts/stable/sonarr/values.yaml +++ b/charts/stable/sonarr/values.yaml @@ -12,14 +12,12 @@ service: main: port: 8989 metrics: - enabled: true + enabled: "{{ .Values.metrics.main.enabled }}" type: ClusterIP - targetSelector: exportarr ports: metrics: enabled: true port: 8990 - targetSelector: exportarr workload: main: podSpec: @@ -41,16 +39,8 @@ workload: env: SONARR__PORT: "{{ .Values.service.main.ports.main.port }}" SONARR__AUTHENTICATION_METHOD: "" - exportarr: - enabled: true - type: Deployment - strategy: RollingUpdate - replicas: 1 - podSpec: - containers: exportarr: - primary: true - enabled: true + enabled: "{{ .Values.metrics.main.enabled }}" imageSelector: exportarrImage args: - sonarr @@ -86,7 +76,6 @@ persistence: main: main: mountPath: /config - exportarr: exportarr: mountPath: /config readOnly: true