bump versions

windmill-labs · Jul 10, 2023 · 403f9e5 · 403f9e5
1 parent 7d1f035
commit 403f9e5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/charts/windmill/Chart.yaml b/charts/windmill/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: windmill
 type: application
-version: 1.6.33
-appVersion: 1.125.0
+version: 1.6.34
+appVersion: 1.127.0
 dependencies:
   - condition: postgresql.enabled
     name: postgresql

diff --git a/charts/windmill/README.md b/charts/windmill/README.md
@@ -1,6 +1,6 @@
 # windmill
 
-![Version: 1.6.32](https://img.shields.io/badge/Version-1.6.32-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.124.0](https://img.shields.io/badge/AppVersion-1.124.0-informational?style=flat-square)
+![Version: 1.6.34](https://img.shields.io/badge/Version-1.6.34-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.127.0](https://img.shields.io/badge/AppVersion-1.127.0-informational?style=flat-square)
 
 Windmill - Turn scripts into endpoints, workflows and UIs in minutes
 
@@ -68,6 +68,7 @@ Windmill - Turn scripts into endpoints, workflows and UIs in minutes
 | windmill.databaseUrlSecretName | string | `""` | name of the secret storing the database URI, take precedence over databaseUrl. The key of the url is 'url' |
 | windmill.exposeHostDocker | bool | `false` | mount the docker socket inside the container to be able to run docker command as docker client to the host docker daemon |
 | windmill.globalErrorHandlerPath | string | `""` | if set, the path to a script in the admins workspace that will be triggered upon any jobs failure |
+| windmill.image | string | `""` | windmill image tag, will use the Acorresponding ee or ce image from ghcr if not defined. Do not include tag in the image name. |
 | windmill.instanceEventsWebhook | string | `""` | send instance events to a webhook. Can be hooked back to windmill |
 | windmill.lsp.affinity | object | `{}` | Affinity rules to apply to the pods |
 | windmill.lsp.annotations | object | `{}` | Annotations to apply to the pods |

diff --git a/charts/windmill/templates/app.yaml b/charts/windmill/templates/app.yaml
@@ -43,9 +43,9 @@ spec:
           subPath: oauth.json
           readOnly: true
         {{ if .Values.enterprise.enabled }}
-        image: ghcr.io/windmill-labs/windmill-ee:{{ default .Chart.AppVersion .Values.windmill.tag }}
+        image: {{ default "ghcr.io/windmill-labs/windmill-ee" .Values.windmill.image }}:{{ default .Chart.AppVersion .Values.windmill.tag }}
         {{ else }}
-        image: ghcr.io/windmill-labs/windmill:{{ default .Chart.AppVersion .Values.windmill.tag }}
+        image: {{ default "ghcr.io/windmill-labs/windmill" .Values.windmill.image }}:{{ default .Chart.AppVersion .Values.windmill.tag }}
         {{ end }}
         imagePullPolicy: Always
         ports:

diff --git a/charts/windmill/templates/workers.yaml b/charts/windmill/templates/workers.yaml
@@ -54,9 +54,9 @@ spec:
           runAsUser: 0
         {{end}}
         {{ if .Values.enterprise.enabled }}
-        image: ghcr.io/windmill-labs/windmill-ee:{{ default .Chart.AppVersion .Values.windmill.tag }}
+        image: {{ default "ghcr.io/windmill-labs/windmill-ee" .Values.windmill.image }}:{{ default .Chart.AppVersion .Values.windmill.tag }}
         {{ else }}
-        image: ghcr.io/windmill-labs/windmill:{{ default .Chart.AppVersion .Values.windmill.tag }}
+        image: {{ default "ghcr.io/windmill-labs/windmill" .Values.windmill.image }}:{{ default .Chart.AppVersion .Values.windmill.tag }}
         {{ end }}
         imagePullPolicy: Always
         ports:
@@ -238,9 +238,9 @@ spec:
           runAsUser: 0
         {{end}}
         {{ if $.Values.enterprise.enabled }}
-        image: ghcr.io/windmill-labs/windmill-ee:{{ default $.Chart.AppVersion $.Values.windmill.tag }}
+        image: {{ default "ghcr.io/windmill-labs/windmill-ee" $.Values.windmill.image }}:{{ default $.Chart.AppVersion $.Values.windmill.tag }}
         {{ else }}
-        image: ghcr.io/windmill-labs/windmill:{{ default $.Chart.AppVersion $.Values.windmill.tag }}
+        image: {{ default "ghcr.io/windmill-labs/windmill" $.Values.windmill.image }}:{{ default $.Chart.AppVersion $.Values.windmill.tag }}
         {{ end }}
         imagePullPolicy: Always
         ports:

diff --git a/charts/windmill/values.yaml b/charts/windmill/values.yaml
@@ -23,6 +23,8 @@ minio:
 windmill:
   # -- windmill app image tag, will use the App version if not defined
   tag: ""
+  # -- windmill image tag, will use the Acorresponding ee or ce image from ghcr if not defined. Do not include tag in the image name.
+  image: ""
   # -- replica for the application app
   appReplicas: 2
   # -- replicas for the workers, jobs are executed on the workers