MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix how version is processed in helm chart (#10277)

This commit is contained in:
Rory Powell 2023-04-12 16:30:10 +01:00 committed by GitHub
parent 201c886f5a
commit b71169deee
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/deploy-cloud.yaml vendored
View File

@ -55,7 +55,7 @@ jobs:
config-files: values.production.yaml config-files: values.production.yaml
chart-path: charts/budibase chart-path: charts/budibase
namespace: budibase namespace: budibase
values: globals.appVersion=${{ env.RELEASE_VERSION }},services.couchdb.url=${{ secrets.PRODUCTION_COUCHDB_URL }},services.couchdb.password=${{ secrets.PRODUCTION_COUCHDB_PASSWORD }} values: globals.appVersion=v${{ env.RELEASE_VERSION }},services.couchdb.url=${{ secrets.PRODUCTION_COUCHDB_URL }},services.couchdb.password=${{ secrets.PRODUCTION_COUCHDB_PASSWORD }}
name: budibase-prod name: budibase-prod
- name: Discord Webhook Action - name: Discord Webhook Action

2
.github/workflows/release-master.yml vendored
View File

@ -107,7 +107,7 @@ jobs:
git pull git pull
mkdir sync mkdir sync
echo "Packaging chart to sync dir" echo "Packaging chart to sync dir"
helm package charts/budibase --version 0.0.0-master --app-version "$RELEASE_VERSION" --destination sync helm package charts/budibase --version 0.0.0-master --app-version v"$RELEASE_VERSION" --destination sync
echo "Packaging successful" echo "Packaging successful"
git checkout gh-pages git checkout gh-pages
echo "Indexing helm repo" echo "Indexing helm repo"

11
charts/budibase/templates/app-service-deployment.yaml
View File

@ -199,11 +199,12 @@ spec:
value: {{ .Values.services.tlsRejectUnauthorized }} value: {{ .Values.services.tlsRejectUnauthorized }}
{{ end }} {{ end }}
{{ if .Values.globals.appVersion }} image: >-
image: budibase/apps:v{{ .Values.globals.appVersion }} {{- if .Values.globals.appVersion }}
{{ else }} budibase/apps:{{ .Values.globals.appVersion }}
image: budibase/apps:v{{ .Chart.AppVersion }} {{- else }}
{{ end }} budibase/apps:{{ .Chart.AppVersion }}
{{- end }}
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
httpGet: httpGet:

11
charts/budibase/templates/proxy-service-deployment.yaml
View File

@ -37,11 +37,12 @@ spec:
{{ end }} {{ end }}
spec: spec:
containers: containers:
{{ if .Values.globals.appVersion }} image: >-
image: budibase/proxy:v{{ .Values.globals.appVersion }} {{- if .Values.globals.appVersion }}
{{ else }} budibase/proxy:{{ .Values.globals.appVersion }}
image: budibase/proxy:v{{ .Chart.AppVersion }} {{- else }}
{{ end }} budibase/proxy:{{ .Chart.AppVersion }}
{{- end }}
imagePullPolicy: Always imagePullPolicy: Always
name: proxy-service name: proxy-service
ports: ports:

12
charts/budibase/templates/worker-service-deployment.yaml
View File

@ -188,12 +188,12 @@ spec:
- name: NODE_TLS_REJECT_UNAUTHORIZED - name: NODE_TLS_REJECT_UNAUTHORIZED
value: {{ .Values.services.tlsRejectUnauthorized }} value: {{ .Values.services.tlsRejectUnauthorized }}
{{ end }} {{ end }}
image: >-
{{ if .Values.globals.appVersion }} {{- if .Values.globals.appVersion }}
image: budibase/worker:v{{ .Values.globals.appVersion }} budibase/worker:{{ .Values.globals.appVersion }}
{{ else }} {{- else }}
image: budibase/worker:v{{ .Chart.AppVersion }} budibase/worker:{{ .Chart.AppVersion }}
{{ end }} {{- end }}
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
httpGet: httpGet: