Merge pull request #50 from tryretool/release-v4-9-0

Release v4.9.0
tryretool · Apr 1, 2022 · 657d8a1 · 657d8a1
2 parents 5afeb14 + 0dce2f1
commit 657d8a1
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 23 deletions.
diff --git 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: [email protected]

diff --git a/templates/deployment_backend.yaml b/templates/deployment_backend.yaml
@@ -19,11 +19,17 @@ spec:
       annotations:
 {{- if .Values.podAnnotations }}
 {{ toYaml .Values.podAnnotations | indent 8 }}
+{{- end }}
+{{- if .Values.backend.annotations }}
+{{ toYaml .Values.backend.annotations | indent 8 }}
 {{- end }}
       labels:
 {{- include "retool.selectorLabels" . | nindent 8 }}
 {{- if .Values.podLabels }}
 {{ toYaml .Values.podLabels | indent 8 }}
+{{- end }}
+{{- if .Values.backend.labels }}
+{{ toYaml .Values.backend.labels | indent 8 }}
 {{- end }}
     spec:
       serviceAccountName: {{ template "retool.serviceAccountName" . }}

diff --git a/templates/deployment_jobs.yaml b/templates/deployment_jobs.yaml
@@ -21,12 +21,18 @@ spec:
       annotations:
 {{- if .Values.podAnnotations }}
 {{ toYaml .Values.podAnnotations | indent 8 }}
+{{- end }}
+{{- if .Values.jobRunner.annotations }}
+{{ toYaml .Values.jobRunner.annotations | indent 8 }}
 {{- end }}
       labels:
         app.kubernetes.io/name: {{ include "retool.name" . }}-jobs-runner
         app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.podLabels }}
 {{ toYaml .Values.podLabels | indent 8 }}
+{{- end }}
+{{- if .Values.jobRunner.labels }}
+{{ toYaml .Values.jobRunner.labels | indent 8 }}
 {{- end }}
     spec:
       serviceAccountName: {{ template "retool.serviceAccountName" . }}

diff --git a/templates/ingress.yaml b/templates/ingress.yaml
@@ -1,4 +1,7 @@
 {{- if .Values.ingress.enabled }}
+{{- $fullName := include "retool.fullname" . -}}
+{{- $svcPort := .Values.service.externalPort -}}
+{{- $pathType := .Values.ingress.pathType -}}
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
 {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
@@ -19,26 +22,51 @@ metadata:
 {{- end }}
   name: {{ template "retool.fullname" . }}
 spec:
+  {{- if and .Values.ingress.ingressClassName (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- end }}
   rules:
-  - http:
-      paths:
-      - path: {{ .path }}
-        {{- if and .Values.ingress.pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
-        pathType: {{ .Values.ingress.pathType }}
-        {{- end }}
-        backend:
-          {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
-          service:
-            name: {{ template "retool.fullname" . }}
-            port: 
-              number: {{ .Values.service.externalPort }}
-          {{- else }}
-          serviceName: {{ template "retool.fullname" . }}
-          servicePort: {{ .Values.service.externalPort }}
+    {{- if .Values.ingress.hostName }}
+    - host: {{ .Values.ingress.hostName | quote }}
+      http:
+        paths:
+          - path:
+            {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ $pathType }}
+            {{- end }}
+            backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+              {{- end }}
+    {{- else }}
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ $pathType }}
+            {{- end }}
+            backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+              {{- end }}
           {{- end }}
-{{- if .Values.ingress.hostName }}
-    host: {{ .Values.ingress.hostName | quote }}
-{{- end }}
+    {{- end }}
+  {{- end }}
 {{- if .Values.ingress.tls }}
   tls:
 {{ toYaml .Values.ingress.tls | indent 4 }}

diff --git a/values.yaml b/values.yaml
@@ -90,13 +90,17 @@ service:
   # portName: service-port
 
 ingress:
-  enabled: false
+  enabled: true
+  # For k8s 1.18+
+  # ingressClassName:
   labels: {}
   annotations: {}
   # kubernetes.io/ingress.class: nginx
   # kubernetes.io/tls-acme: "true"
-  # configures the hostname e.g. retool.example.com
-  hostName:
+  hosts:
+  # - host: retool.example.com
+  #   paths:
+  #     - path: /
   tls:
   # - secretName: retool.example.com
   #   hosts:
@@ -179,7 +183,9 @@ tolerations: []
 # Ref: https://kubernetes.io/docs/user-guide/node-selection/
 nodeSelector: {}
 
+# Common annotations for all pods (backend and job runner).
 podAnnotations: {}
+
 # Increasing replica count will deploy a separate pod for backend and jobs
 # Example: with 3 replicas, you will end up with 3 backends + 1 jobs pod
 replicaCount: 1
@@ -194,9 +200,23 @@ revisionHistoryLimit: 3
 # podDisruptionBudget:
 #   maxUnavailable: 1
 
-# Custom labels for pod assignment
+# Common labels for all pods (backend and job runner) for pod assignment
 podLabels: {}
 
+jobRunner:
+  # Annotations for job runner pods
+  annotations: {}
+
+  # Labels for job runner pods
+  labels: {}
+
+backend:
+  # Annotations for backendpods
+  annotations: {}
+
+  # Labels for backend pods
+  labels: {}
+
 persistentVolumeClaim:
   # set to true to use pvc
   enabled: false