From 5e762c7d31c330ce64e9564bafff5d7923a07f74 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Tue, 7 Mar 2023 19:45:34 +0100 Subject: [PATCH 1/2] fix(enterprise): misc fixes from common and prometheus storageclass patch (#7762) --- charts/enterprise/authelia/Chart.yaml | 6 +++--- charts/enterprise/blocky/Chart.yaml | 6 +++--- charts/enterprise/cert-manager/Chart.yaml | 4 ++-- charts/enterprise/grafana/Chart.yaml | 4 ++-- charts/enterprise/metallb/Chart.yaml | 4 ++-- charts/enterprise/prometheus/Chart.yaml | 4 ++-- .../prometheus/templates/alertmanager/_alertmanager.tpl | 2 +- .../prometheus/templates/prometheus/_prometheus.tpl | 2 +- charts/enterprise/traefik/Chart.yaml | 4 ++-- charts/enterprise/vaultwarden/Chart.yaml | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/charts/enterprise/authelia/Chart.yaml b/charts/enterprise/authelia/Chart.yaml index f48592b99a9..1cf5c642c8b 100644 --- a/charts/enterprise/authelia/Chart.yaml +++ b/charts/enterprise/authelia/Chart.yaml @@ -3,11 +3,11 @@ appVersion: "4.37.5" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 12.2.20 + version: 12.2.24 - condition: redis.enabled name: redis repository: https://deps.truecharts.org - version: 6.0.11 + version: 6.0.14 deprecated: false description: Authelia is a Single Sign-On Multi-Factor portal for web apps home: https://truecharts.org/charts/enterprise/authelia @@ -36,7 +36,7 @@ sources: - https://github.com/authelia/chartrepo - https://github.com/authelia/authelia type: application -version: 15.0.5 +version: 15.0.6 annotations: truecharts.org/catagories: | - security diff --git a/charts/enterprise/blocky/Chart.yaml b/charts/enterprise/blocky/Chart.yaml index 4a96fd15d79..0e9e9fe02ce 100644 --- a/charts/enterprise/blocky/Chart.yaml +++ b/charts/enterprise/blocky/Chart.yaml @@ -3,11 +3,11 @@ appVersion: "0.20.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 12.2.22 + version: 12.2.24 - condition: redis.enabled name: redis repository: https://deps.truecharts.org - version: 6.0.13 + version: 6.0.14 description: Blocky is a DNS proxy, DNS enhancer and ad-blocker for the local network written in Go home: https://truecharts.org/charts/enterprise/blocky icon: https://truecharts.org/img/hotlink-ok/chart-icons/blocky.png @@ -26,7 +26,7 @@ sources: - https://0xerr0r.github.io/blocky/ - https://github.com/0xERR0R/blocky - https://github.com/Mozart409/blocky-frontend -version: 5.0.8 +version: 5.0.9 annotations: truecharts.org/catagories: | - network diff --git a/charts/enterprise/cert-manager/Chart.yaml b/charts/enterprise/cert-manager/Chart.yaml index 7112a1d9df2..5561bc28419 100644 --- a/charts/enterprise/cert-manager/Chart.yaml +++ b/charts/enterprise/cert-manager/Chart.yaml @@ -10,7 +10,7 @@ keywords: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 12.2.22 + version: 12.2.24 kubeVersion: ">=1.16.0-0" maintainers: - email: info@truecharts.org @@ -21,7 +21,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/enterprise/cert-manager - https://cert-manager.io/ type: application -version: 1.0.6 +version: 1.0.7 annotations: truecharts.org/catagories: | - core diff --git a/charts/enterprise/grafana/Chart.yaml b/charts/enterprise/grafana/Chart.yaml index c3b50115c35..b120404212d 100644 --- a/charts/enterprise/grafana/Chart.yaml +++ b/charts/enterprise/grafana/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "9.3.6" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 12.2.20 + version: 12.2.24 deprecated: false description: Grafana is an open source, feature rich metrics dashboard and graph editor for Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB. home: https://truecharts.org/charts/enterprise/grafana @@ -25,7 +25,7 @@ sources: - https://github.com/bitnami/bitnami-docker-grafana - https://grafana.com/ type: application -version: 7.0.7 +version: 7.0.8 annotations: truecharts.org/catagories: | - metrics diff --git a/charts/enterprise/metallb/Chart.yaml b/charts/enterprise/metallb/Chart.yaml index 4e6cddf9c5a..e43a5108c94 100644 --- a/charts/enterprise/metallb/Chart.yaml +++ b/charts/enterprise/metallb/Chart.yaml @@ -10,7 +10,7 @@ keywords: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 12.2.19 + version: 12.2.24 kubeVersion: ">=1.16.0-0" maintainers: - email: info@truecharts.org @@ -22,7 +22,7 @@ sources: - https://github.com/metallb/metallb - https://metallb.universe.tf type: application -version: 8.0.4 +version: 8.0.5 annotations: truecharts.org/catagories: | - core diff --git a/charts/enterprise/prometheus/Chart.yaml b/charts/enterprise/prometheus/Chart.yaml index b98ab11b356..2b1ac1fb152 100644 --- a/charts/enterprise/prometheus/Chart.yaml +++ b/charts/enterprise/prometheus/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.42.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 12.2.21 + version: 12.2.24 - condition: exporters.enabled,exporters.node-exporter.enabled name: node-exporter repository: https://charts.bitnami.com/bitnami @@ -30,7 +30,7 @@ sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus type: application -version: 8.0.5 +version: 8.0.6 annotations: truecharts.org/catagories: | - metrics diff --git a/charts/enterprise/prometheus/templates/alertmanager/_alertmanager.tpl b/charts/enterprise/prometheus/templates/alertmanager/_alertmanager.tpl index 92a93cabdfd..ed5e24e9da6 100644 --- a/charts/enterprise/prometheus/templates/alertmanager/_alertmanager.tpl +++ b/charts/enterprise/prometheus/templates/alertmanager/_alertmanager.tpl @@ -51,7 +51,7 @@ spec: resources: requests: storage: {{ .Values.alertmanager.persistence.size | quote }} - {{- with (include "tc.v1.common.lib.storage.storageClassName" (dict "persistence" .Values.prometheus.persistence "root" . )) | trim }} + {{- with (include "tc.v1.common.lib.storage.storageClassName" ( dict "rootCtx" . "objectData" .Values.prometheus.persistence )) | trim }} storageClassName: {{ . }} {{- end }} {{- end }} diff --git a/charts/enterprise/prometheus/templates/prometheus/_prometheus.tpl b/charts/enterprise/prometheus/templates/prometheus/_prometheus.tpl index a1f62eb36f3..b0578f2d4a7 100644 --- a/charts/enterprise/prometheus/templates/prometheus/_prometheus.tpl +++ b/charts/enterprise/prometheus/templates/prometheus/_prometheus.tpl @@ -145,7 +145,7 @@ spec: resources: requests: storage: {{ .Values.prometheus.persistence.size | quote }} - {{- with (include "tc.v1.common.lib.storage.storageClassName" (dict "persistence" .Values.prometheus.persistence "root" . )) | trim }} + {{- with (include "tc.v1.common.lib.storage.storageClassName" ( dict "rootCtx" . "objectData" .Values.prometheus.persistence )) | trim }} storageClassName: {{ . }} {{- end }} {{- end }} diff --git a/charts/enterprise/traefik/Chart.yaml b/charts/enterprise/traefik/Chart.yaml index 6d171a6a9ad..27cfdfe99d9 100644 --- a/charts/enterprise/traefik/Chart.yaml +++ b/charts/enterprise/traefik/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.9.8" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 12.2.19 + version: 12.2.24 deprecated: false description: Traefik is a flexible reverse proxy and Ingress Provider. home: https://truecharts.org/charts/enterprise/traefik @@ -24,7 +24,7 @@ sources: - https://github.com/traefik/traefik-helm-chart - https://traefik.io/ type: application -version: 17.0.5 +version: 17.0.6 annotations: truecharts.org/catagories: | - network diff --git a/charts/enterprise/vaultwarden/Chart.yaml b/charts/enterprise/vaultwarden/Chart.yaml index f981a43864f..175498a688d 100644 --- a/charts/enterprise/vaultwarden/Chart.yaml +++ b/charts/enterprise/vaultwarden/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.27.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 12.2.19 + version: 12.2.24 deprecated: false description: Unofficial Bitwarden compatible server written in Rust home: https://truecharts.org/charts/enterprise/vaultwarden @@ -25,7 +25,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/enterprise/vaultwarden - https://github.com/dani-garcia/vaultwarden type: application -version: 20.0.5 +version: 20.0.6 annotations: truecharts.org/catagories: | - security From 7b37008571952d25024a75954ece7c973ff117e3 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Tue, 7 Mar 2023 22:00:35 +0200 Subject: [PATCH 2/2] fix(traefik): actually fix labels (#7763) --- charts/enterprise/traefik/Chart.yaml | 2 +- charts/enterprise/traefik/templates/_ingressclass.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/enterprise/traefik/Chart.yaml b/charts/enterprise/traefik/Chart.yaml index 27cfdfe99d9..50661b72eff 100644 --- a/charts/enterprise/traefik/Chart.yaml +++ b/charts/enterprise/traefik/Chart.yaml @@ -24,7 +24,7 @@ sources: - https://github.com/traefik/traefik-helm-chart - https://traefik.io/ type: application -version: 17.0.6 +version: 17.0.7 annotations: truecharts.org/catagories: | - network diff --git a/charts/enterprise/traefik/templates/_ingressclass.tpl b/charts/enterprise/traefik/templates/_ingressclass.tpl index a9b432449a9..004d4a6dcda 100644 --- a/charts/enterprise/traefik/templates/_ingressclass.tpl +++ b/charts/enterprise/traefik/templates/_ingressclass.tpl @@ -16,7 +16,7 @@ metadata: annotations: ingressclass.kubernetes.io/is-default-class: {{ .Values.ingressClass.isDefaultClass | quote }} labels: - {{- include "tc.v1.common.allLabels" . | nindent 4 }} + {{- include "tc.v1.common.lib.metadata.allLabels" . | nindent 4 }} name: {{ .Release.Name }} spec: controller: traefik.io/ingress-controller