Skip to content

Commit 7c3c523

Browse files
committed
[#372] Update hawkBit chart dependencies.
1 parent 7bfc42c commit 7c3c523

4 files changed

Lines changed: 17 additions & 33 deletions

File tree

.jenkins/Jenkinsfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@ podTemplate(
9393

9494
stage('Helm Build') {
9595
dir("build") {
96-
// adding the bitnami repo below serves as a workaround for sporadic "no cached repository" errors when packaging the hawkbit chart
9796
sh '''
98-
${WORKSPACE}/helm repo add bitnami-full https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
9997
mkdir -p helm-repository
10098
for i in $(ls charts/*/Chart.yaml packages/*/Chart.yaml); do
10199
echo "Building $(dirname $i) ..."

charts/hawkbit/Chart.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2020, 2022 Contributors to the Eclipse Foundation
1+
# Copyright (c) 2020, 2023 Contributors to the Eclipse Foundation
22
#
33
# See the NOTICE file(s) distributed with this work for additional
44
# information regarding copyright ownership.
@@ -9,8 +9,8 @@
99
#
1010
# SPDX-License-Identifier: EPL-2.0
1111
---
12-
apiVersion: v1
13-
version: 1.4.2
12+
apiVersion: v2
13+
version: 1.5.0
1414
appVersion: "0.3.0M6-mysql"
1515
description: |
1616
Eclipse hawkBit™ is a domain independent back-end framework for rolling out software updates
@@ -31,3 +31,12 @@ maintainers:
3131
email: axel.koehler@kiwigrid.com
3232
- name: ctron
3333
email: ctron@dentrassi.de
34+
dependencies:
35+
- name: mysql
36+
version: ^9.x
37+
repository: "oci://registry-1.docker.io/bitnamicharts"
38+
condition: mysql.enabled
39+
- name: rabbitmq
40+
version: ^10.x
41+
repository: "oci://registry-1.docker.io/bitnamicharts"
42+
condition: rabbitmq.enabled

charts/hawkbit/requirements.yaml

Lines changed: 0 additions & 22 deletions
This file was deleted.

charts/hawkbit/values.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,17 +173,16 @@ config:
173173
## ref: https://github.com/bitnami/charts/blob/master/bitnami/mysql/values.yaml
174174
mysql:
175175
enabled: true
176-
master:
176+
primary:
177177
persistence:
178178
enabled: true
179179
volumePermissions:
180180
enabled: true
181-
db:
182-
user: hawkbit
181+
architecture: standalone
182+
auth:
183+
username: hawkbit
183184
password: hawkbit
184-
name: hawkbit
185-
replication:
186-
enabled: false
185+
database: hawkbit
187186
metrics:
188187
enabled: true
189188

0 commit comments

Comments
 (0)