From 81e5e7422c8e387dd2d479bd9b4bd7560d41dece Mon Sep 17 00:00:00 2001 From: Elisabeth Seite Date: Fri, 11 Feb 2022 13:27:31 +0100 Subject: [PATCH 1/2] feat: add support for sidecar containers --- templates/deployment_backend.yaml | 3 +++ values.yaml | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/templates/deployment_backend.yaml b/templates/deployment_backend.yaml index 66d8b1b..fe25fed 100644 --- a/templates/deployment_backend.yaml +++ b/templates/deployment_backend.yaml @@ -185,6 +185,9 @@ spec: - name: {{ .name }} mountPath: {{ .mountPath }} subPath: {{ .subPath }} +{{- end }} +{{- if .Values.extraSidecarContainers.enabled }} +{{ toYaml .Values.extraSidecarContainers.containers | indent 8 }} {{- end }} {{- if .Values.image.pullSecrets }} imagePullSecrets: diff --git a/values.yaml b/values.yaml index 3751eba..6528a8c 100644 --- a/values.yaml +++ b/values.yaml @@ -235,3 +235,29 @@ extraManifests: [] # spec: # securityPolicy: # name: "my-gcp-cloud-armor-policy" + +extraSidecarContainers: + enabled: false + containers: [] + # containers: + # - name: mySidecarContainer + # image: "resourceAddress:version" + # imagePullPolicy: IfNotPresent + # resources: + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + # env: + # - name: POD_NAME + # valueFrom: + # fieldRef: + # apiVersion: v1 + # fieldPath: metadata.name + # - name: POD_NAMESPACE + # valueFrom: + # fieldRef: + # apiVersion: v1 + # fieldPath: metadata.namespace \ No newline at end of file From 7d034f4b3993d8954f951d3682614ae3e892fd9d Mon Sep 17 00:00:00 2001 From: Sergio Millan Rodriguez Date: Mon, 7 Mar 2022 14:30:47 +0100 Subject: [PATCH 2/2] feat: add sidecar containers support for retool HA --- Chart.yaml | 2 +- templates/deployment_backend.yaml | 2 +- templates/deployment_jobs.yaml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 8f7b318..af923f5 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: retool description: A Helm chart for Kubernetes type: application -version: 4.8.0 +version: 4.9.0 maintainers: - name: Retool Engineering email: engineering+helm@retool.com diff --git a/templates/deployment_backend.yaml b/templates/deployment_backend.yaml index fe25fed..c002357 100644 --- a/templates/deployment_backend.yaml +++ b/templates/deployment_backend.yaml @@ -187,7 +187,7 @@ spec: subPath: {{ .subPath }} {{- end }} {{- if .Values.extraSidecarContainers.enabled }} -{{ toYaml .Values.extraSidecarContainers.containers | indent 8 }} +{{ toYaml .Values.extraSidecarContainers.containers | indent 6 }} {{- end }} {{- if .Values.image.pullSecrets }} imagePullSecrets: diff --git a/templates/deployment_jobs.yaml b/templates/deployment_jobs.yaml index 26b4202..2a9f19a 100644 --- a/templates/deployment_jobs.yaml +++ b/templates/deployment_jobs.yaml @@ -41,6 +41,9 @@ spec: {{- end }} {{- end }} containers: +{{- if .Values.extraSidecarContainers.enabled }} +{{ toYaml .Values.extraSidecarContainers.containers | indent 6 }} +{{- end }} - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ required "Please set a value for .Values.image.tag" .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }}