From 782e83435fafac4e9487b35288d30a73c24ef90d Mon Sep 17 00:00:00 2001 From: Christoph Keller Date: Mon, 18 Nov 2024 21:42:15 +0100 Subject: [PATCH 1/2] Fix broken PodDisruptionBudget due to introduction of extraLabels. https://github.com/apache/superset/pull/30710 introduced extraLabels but broke the PodDisruptionBudgets due to pdb configs using "with" statements. This is not catched by the linting since linting only checks with default values. --- helm/superset/templates/pdb-beat.yaml | 4 ++-- helm/superset/templates/pdb-flower.yaml | 4 ++-- helm/superset/templates/pdb-worker.yaml | 4 ++-- helm/superset/templates/pdb-ws.yaml | 4 ++-- helm/superset/templates/pdb.yaml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/helm/superset/templates/pdb-beat.yaml b/helm/superset/templates/pdb-beat.yaml index 91cf5ddc58503..f7d5bce27a2f6 100644 --- a/helm/superset/templates/pdb-beat.yaml +++ b/helm/superset/templates/pdb-beat.yaml @@ -31,8 +31,8 @@ metadata: chart: {{ template "superset.chart" $ }} release: {{ $.Release.Name }} heritage: {{ $.Release.Service }} - {{- if .Values.extraLabels }} - {{- toYaml .Values.extraLabels | nindent 4 }} + {{- if $.Values.extraLabels }} + {{- toYaml $.Values.extraLabels | nindent 4 }} {{- end }} spec: {{- if .minAvailable }} diff --git a/helm/superset/templates/pdb-flower.yaml b/helm/superset/templates/pdb-flower.yaml index 241de3143cd7e..1be15b65bba94 100644 --- a/helm/superset/templates/pdb-flower.yaml +++ b/helm/superset/templates/pdb-flower.yaml @@ -31,8 +31,8 @@ metadata: chart: {{ template "superset.chart" $ }} release: {{ $.Release.Name }} heritage: {{ $.Release.Service }} - {{- if .Values.extraLabels }} - {{- toYaml .Values.extraLabels | nindent 4 }} + {{- if $.Values.extraLabels }} + {{- toYaml $.Values.extraLabels | nindent 4 }} {{- end }} spec: {{- if .minAvailable }} diff --git a/helm/superset/templates/pdb-worker.yaml b/helm/superset/templates/pdb-worker.yaml index d4ec768fba2a5..a23c6d93086c5 100644 --- a/helm/superset/templates/pdb-worker.yaml +++ b/helm/superset/templates/pdb-worker.yaml @@ -31,8 +31,8 @@ metadata: chart: {{ template "superset.chart" $ }} release: {{ $.Release.Name }} heritage: {{ $.Release.Service }} - {{- if .Values.extraLabels }} - {{- toYaml .Values.extraLabels | nindent 4 }} + {{- if $.Values.extraLabels }} + {{- toYaml $.Values.extraLabels | nindent 4 }} {{- end }} spec: {{- if .minAvailable }} diff --git a/helm/superset/templates/pdb-ws.yaml b/helm/superset/templates/pdb-ws.yaml index 0e303880aa115..9fe62b4adea7c 100644 --- a/helm/superset/templates/pdb-ws.yaml +++ b/helm/superset/templates/pdb-ws.yaml @@ -31,8 +31,8 @@ metadata: chart: {{ template "superset.chart" $ }} release: {{ $.Release.Name }} heritage: {{ $.Release.Service }} - {{- if .Values.extraLabels }} - {{- toYaml .Values.extraLabels | nindent 4 }} + {{- if $.Values.extraLabels }} + {{- toYaml $.Values.extraLabels | nindent 4 }} {{- end }} spec: {{- if .minAvailable }} diff --git a/helm/superset/templates/pdb.yaml b/helm/superset/templates/pdb.yaml index 3f86836f68d3b..9b6be221d0707 100644 --- a/helm/superset/templates/pdb.yaml +++ b/helm/superset/templates/pdb.yaml @@ -31,8 +31,8 @@ metadata: chart: {{ template "superset.chart" $ }} release: {{ $.Release.Name }} heritage: {{ $.Release.Service }} - {{- if .Values.extraLabels }} - {{- toYaml .Values.extraLabels | nindent 4 }} + {{- if $.Values.extraLabels }} + {{- toYaml $.Values.extraLabels | nindent 4 }} {{- end }} spec: {{- if .minAvailable }} From f4f7bb1e2c15d8ff08db89009c66abf66b6dc550 Mon Sep 17 00:00:00 2001 From: Christoph Keller Date: Tue, 19 Nov 2024 13:56:39 +0100 Subject: [PATCH 2/2] Bump superset helm-chart version to 0.13.2. --- helm/superset/Chart.yaml | 2 +- helm/superset/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml index 0d29b8833428b..e16de86fc81c1 100644 --- a/helm/superset/Chart.yaml +++ b/helm/superset/Chart.yaml @@ -29,7 +29,7 @@ maintainers: - name: craig-rueda email: craig@craigrueda.com url: https://github.com/craig-rueda -version: 0.13.1 +version: 0.13.2 dependencies: - name: postgresql version: 12.1.6 diff --git a/helm/superset/README.md b/helm/superset/README.md index 2031af326413f..3bb4c1351bade 100644 --- a/helm/superset/README.md +++ b/helm/superset/README.md @@ -23,7 +23,7 @@ NOTE: This file is generated by helm-docs: https://github.com/norwoodj/helm-docs # superset -![Version: 0.13.1](https://img.shields.io/badge/Version-0.13.1-informational?style=flat-square) +![Version: 0.13.2](https://img.shields.io/badge/Version-0.13.2-informational?style=flat-square) Apache Superset is a modern, enterprise-ready business intelligence web application