From ab898d1fbf09352a69833c9dc9bc0b16a101a754 Mon Sep 17 00:00:00 2001 From: Josh Inoa Date: Mon, 30 Sep 2024 15:20:33 -0400 Subject: [PATCH 1/6] add deploymentLabels option --- charts/retool/templates/deployment_backend.yaml | 3 +++ charts/retool/templates/deployment_jobs.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/charts/retool/templates/deployment_backend.yaml b/charts/retool/templates/deployment_backend.yaml index 86a1b51..3af9f00 100644 --- a/charts/retool/templates/deployment_backend.yaml +++ b/charts/retool/templates/deployment_backend.yaml @@ -5,6 +5,9 @@ metadata: labels: {{- include "retool.labels" . | nindent 4 }} {{- include "retool.selectorLabels" . | nindent 4 }} +{{- if .Values.deploymentLabels }} +{{ toYaml .Values.deploymentLabels | indent 4 }} +{{- end }} {{- if .Values.deployment.annotations }} annotations: {{ toYaml .Values.deployment.annotations | indent 4 }} diff --git a/charts/retool/templates/deployment_jobs.yaml b/charts/retool/templates/deployment_jobs.yaml index 54427e4..a8daef5 100644 --- a/charts/retool/templates/deployment_jobs.yaml +++ b/charts/retool/templates/deployment_jobs.yaml @@ -8,6 +8,9 @@ metadata: app.kubernetes.io/name: {{ include "retool.name" . }}-jobs-runner app.kubernetes.io/instance: {{ .Release.Name }} telemetry.retool.com/service-name: jobs-runner +{{- if .Values.deploymentLabels }} +{{ toYaml .Values.deploymentLabels | indent 4 }} +{{- end }} {{- if .Values.deployment.annotations }} annotations: {{ toYaml .Values.deployment.annotations | indent 4 }} From c47d3f2abfc2e57657c1b47a70bfeee911afa5b9 Mon Sep 17 00:00:00 2001 From: Josh Inoa Date: Wed, 2 Oct 2024 14:45:40 -0400 Subject: [PATCH 2/6] address feedback --- charts/retool/templates/deployment_backend.yaml | 4 ++-- charts/retool/templates/deployment_jobs.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/retool/templates/deployment_backend.yaml b/charts/retool/templates/deployment_backend.yaml index 3af9f00..1d88209 100644 --- a/charts/retool/templates/deployment_backend.yaml +++ b/charts/retool/templates/deployment_backend.yaml @@ -5,8 +5,8 @@ metadata: labels: {{- include "retool.labels" . | nindent 4 }} {{- include "retool.selectorLabels" . | nindent 4 }} -{{- if .Values.deploymentLabels }} -{{ toYaml .Values.deploymentLabels | indent 4 }} +{{- if .Values.deployment.labels }} +{{ toYaml .Values.deployment.labels | indent 4 }} {{- end }} {{- if .Values.deployment.annotations }} annotations: diff --git a/charts/retool/templates/deployment_jobs.yaml b/charts/retool/templates/deployment_jobs.yaml index a8daef5..47b4a9a 100644 --- a/charts/retool/templates/deployment_jobs.yaml +++ b/charts/retool/templates/deployment_jobs.yaml @@ -8,8 +8,8 @@ metadata: app.kubernetes.io/name: {{ include "retool.name" . }}-jobs-runner app.kubernetes.io/instance: {{ .Release.Name }} telemetry.retool.com/service-name: jobs-runner -{{- if .Values.deploymentLabels }} -{{ toYaml .Values.deploymentLabels | indent 4 }} +{{- if .Values.deployment.labels }} +{{ toYaml .Values.deployment.labels | indent 4 }} {{- end }} {{- if .Values.deployment.annotations }} annotations: From 1871e5acd1a20bdf31cfa240fa9372acb26b92d8 Mon Sep 17 00:00:00 2001 From: Anna Y <7955711+anna-yn@users.noreply.github.com> Date: Thu, 3 Oct 2024 09:48:03 -0700 Subject: [PATCH 3/6] add the labels field --- charts/retool/templates/deployment_backend.yaml | 1 + charts/retool/templates/deployment_jobs.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/charts/retool/templates/deployment_backend.yaml b/charts/retool/templates/deployment_backend.yaml index 1d88209..4efd07c 100644 --- a/charts/retool/templates/deployment_backend.yaml +++ b/charts/retool/templates/deployment_backend.yaml @@ -6,6 +6,7 @@ metadata: {{- include "retool.labels" . | nindent 4 }} {{- include "retool.selectorLabels" . | nindent 4 }} {{- if .Values.deployment.labels }} + labels: {{ toYaml .Values.deployment.labels | indent 4 }} {{- end }} {{- if .Values.deployment.annotations }} diff --git a/charts/retool/templates/deployment_jobs.yaml b/charts/retool/templates/deployment_jobs.yaml index 47b4a9a..51a3913 100644 --- a/charts/retool/templates/deployment_jobs.yaml +++ b/charts/retool/templates/deployment_jobs.yaml @@ -9,6 +9,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} telemetry.retool.com/service-name: jobs-runner {{- if .Values.deployment.labels }} + labels: {{ toYaml .Values.deployment.labels | indent 4 }} {{- end }} {{- if .Values.deployment.annotations }} From 706ecbc2e45e921d0eb60bb5b644f4047a77320b Mon Sep 17 00:00:00 2001 From: Anna Y <7955711+anna-yn@users.noreply.github.com> Date: Thu, 3 Oct 2024 09:50:23 -0700 Subject: [PATCH 4/6] oops --- charts/retool/templates/deployment_backend.yaml | 1 - charts/retool/templates/deployment_jobs.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/charts/retool/templates/deployment_backend.yaml b/charts/retool/templates/deployment_backend.yaml index 4efd07c..1d88209 100644 --- a/charts/retool/templates/deployment_backend.yaml +++ b/charts/retool/templates/deployment_backend.yaml @@ -6,7 +6,6 @@ metadata: {{- include "retool.labels" . | nindent 4 }} {{- include "retool.selectorLabels" . | nindent 4 }} {{- if .Values.deployment.labels }} - labels: {{ toYaml .Values.deployment.labels | indent 4 }} {{- end }} {{- if .Values.deployment.annotations }} diff --git a/charts/retool/templates/deployment_jobs.yaml b/charts/retool/templates/deployment_jobs.yaml index 51a3913..47b4a9a 100644 --- a/charts/retool/templates/deployment_jobs.yaml +++ b/charts/retool/templates/deployment_jobs.yaml @@ -9,7 +9,6 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} telemetry.retool.com/service-name: jobs-runner {{- if .Values.deployment.labels }} - labels: {{ toYaml .Values.deployment.labels | indent 4 }} {{- end }} {{- if .Values.deployment.annotations }} From 8201d47d3bb84f31ec33858c2081b6f94b484dfe Mon Sep 17 00:00:00 2001 From: Anna Y Date: Thu, 3 Oct 2024 09:55:36 -0700 Subject: [PATCH 5/6] increment version --- charts/retool/Chart.yaml | 2 +- charts/retool/values.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/retool/Chart.yaml b/charts/retool/Chart.yaml index 2f86220..b242b30 100644 --- a/charts/retool/Chart.yaml +++ b/charts/retool/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: retool description: A Helm chart for Kubernetes type: application -version: 6.2.9 +version: 6.2.10 maintainers: - name: Retool Engineering email: engineering+helm@retool.com diff --git a/charts/retool/values.yaml b/charts/retool/values.yaml index cad00bc..fb3110d 100644 --- a/charts/retool/values.yaml +++ b/charts/retool/values.yaml @@ -118,6 +118,7 @@ externalSecrets: files: {} deployment: + labels: {} annotations: {} service: From a717ac7787e084452234e7dc3800eae54a2f40b2 Mon Sep 17 00:00:00 2001 From: Anna Y Date: Thu, 3 Oct 2024 10:08:29 -0700 Subject: [PATCH 6/6] add missing value in values file --- values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/values.yaml b/values.yaml index cad00bc..fb3110d 100644 --- a/values.yaml +++ b/values.yaml @@ -118,6 +118,7 @@ externalSecrets: files: {} deployment: + labels: {} annotations: {} service: