From d6bce09ac32d3146d22a14d205139551637170af Mon Sep 17 00:00:00 2001 From: Mathieu Herbert Date: Thu, 5 Jan 2023 18:05:54 +0100 Subject: [PATCH] feat(helm): add deploymentLabels variable (#22541) --- helm/superset/Chart.yaml | 2 +- helm/superset/README.md | 4 +++- helm/superset/templates/deployment-worker.yaml | 3 +++ helm/superset/templates/deployment.yaml | 3 +++ helm/superset/values.yaml | 5 +++++ 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml index 2f5d0c950726..3d5b7280c49c 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.8.0 +version: 0.8.1 dependencies: - name: postgresql version: 12.1.6 diff --git a/helm/superset/README.md b/helm/superset/README.md index aa39bff7cd46..1258ed096345 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.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) +![Version: 0.8.1](https://img.shields.io/badge/Version-0.8.1-informational?style=flat-square) Apache Superset is a modern, enterprise-ready business intelligence web application @@ -161,6 +161,7 @@ helm install my-superset superset/superset | supersetNode.connections.redis_port | string | `"6379"` | | | supersetNode.containerSecurityContext | object | `{}` | | | supersetNode.deploymentAnnotations | object | `{}` | Annotations to be added to supersetNode deployment | +| supersetNode.deploymentLabels | object | `{}` | Labels to be added to supersetNode deployment | | supersetNode.env | object | `{}` | | | supersetNode.forceReload | bool | `false` | If true, forces deployment to reload on each upgrade | | supersetNode.initContainers | list | a container waiting for postgres | Init containers | @@ -234,6 +235,7 @@ helm install my-superset superset/superset | supersetWorker.command | list | a `celery worker` command | Worker startup command | | supersetWorker.containerSecurityContext | object | `{}` | | | supersetWorker.deploymentAnnotations | object | `{}` | Annotations to be added to supersetWorker deployment | +| supersetWorker.deploymentLabels | object | `{}` | Labels to be added to supersetWorker deployment | | supersetWorker.forceReload | bool | `false` | If true, forces deployment to reload on each upgrade | | supersetWorker.initContainers | list | a container waiting for postgres and redis | Init container | | supersetWorker.livenessProbe.exec.command | list | a `celery inspect ping` command | Liveness probe command | diff --git a/helm/superset/templates/deployment-worker.yaml b/helm/superset/templates/deployment-worker.yaml index 06b52a7c7c66..178b5ac26f2e 100644 --- a/helm/superset/templates/deployment-worker.yaml +++ b/helm/superset/templates/deployment-worker.yaml @@ -23,6 +23,9 @@ metadata: chart: {{ template "superset.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} +{{- if .Values.supersetWorker.deploymentLabels }} + {{- toYaml .Values.supersetWorker.deploymentLabels | nindent 4 }} +{{- end }} {{- if .Values.supersetWorker.deploymentAnnotations }} annotations: {{- toYaml .Values.supersetWorker.deploymentAnnotations | nindent 4 }} diff --git a/helm/superset/templates/deployment.yaml b/helm/superset/templates/deployment.yaml index d668cb7a0b35..8869280f67b8 100644 --- a/helm/superset/templates/deployment.yaml +++ b/helm/superset/templates/deployment.yaml @@ -23,6 +23,9 @@ metadata: chart: {{ template "superset.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} +{{- if .Values.supersetNode.deploymentLabels }} + {{- toYaml .Values.supersetNode.deploymentLabels | nindent 4 }} +{{- end }} {{- if .Values.supersetNode.deploymentAnnotations }} annotations: {{- toYaml .Values.supersetNode.deploymentAnnotations | nindent 4 }} diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml index 178a5fdf05d4..143d6c13f18e 100644 --- a/helm/superset/values.yaml +++ b/helm/superset/values.yaml @@ -278,8 +278,11 @@ supersetNode: - /bin/sh - -c - dockerize -wait "tcp://$DB_HOST:$DB_PORT" -timeout 120s + # -- Annotations to be added to supersetNode deployment deploymentAnnotations: {} + # -- Labels to be added to supersetNode deployment + deploymentLabels: {} # -- Annotations to be added to supersetNode pods podAnnotations: {} # -- Labels to be added to supersetNode pods @@ -355,6 +358,8 @@ supersetWorker: - dockerize -wait "tcp://$DB_HOST:$DB_PORT" -wait "tcp://$REDIS_HOST:$REDIS_PORT" -timeout 120s # -- Annotations to be added to supersetWorker deployment deploymentAnnotations: {} + # -- Labels to be added to supersetWorker deployment + deploymentLabels: {} # -- Annotations to be added to supersetWorker pods podAnnotations: {} # -- Labels to be added to supersetWorker pods