Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow other database than mysql #518

Merged
merged 4 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/hawkbit/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# SPDX-License-Identifier: EPL-2.0
---
apiVersion: v2
version: 1.5.0
version: 1.6.0
appVersion: "0.3.0M6-mysql"
description: |
Eclipse hawkBit™ is a domain independent back-end framework for rolling out software updates
Expand Down
4 changes: 4 additions & 0 deletions charts/hawkbit/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ spec:
- name: SPRING_PROFILES_ACTIVE
value: "{{ .Values.spring.profiles }}"
- name: "SPRING_DATASOURCE_URL"
{{- if .Values.env.springDatasourceUrl }}
value: "{{ .Values.env.springDatasourceUrl }}"
{{ else }}
flobz marked this conversation as resolved.
Show resolved Hide resolved
value: "jdbc:mysql://{{ if .Values.mysql.enabled }}{{ .Release.Name }}-mysql{{ else }}{{ .Values.env.springDatasourceHost }}{{ end }}:3306/{{ .Values.env.springDatasourceDb }}"
{{- end }}
- name: "SPRING_APPLICATION_JSON"
valueFrom:
secretKeyRef:
Expand Down
2 changes: 2 additions & 0 deletions charts/hawkbit/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ fileStorage:
env:
springDatasourceHost: "hawkbit-mysql"
springDatasourceDb: "hawkbit"
# if springDatasourceUrl is set override default mysql db url
springDatasourceUrl: ""
calohmn marked this conversation as resolved.
Show resolved Hide resolved
springRabbitmqHost: "hawkbit-rabbitmq"
springRabbitmqUsername: "hawkbit"
springRabbitmqPassword: "hawkbit"
Expand Down