From 7c3c523019f77617e1707ce8a551e31ee6168b1d Mon Sep 17 00:00:00 2001
From: Carsten Lohmann <carsten.lohmann@bosch.io>
Date: Thu, 9 Jun 2022 07:35:53 +0200
Subject: [PATCH] [#372] Update hawkBit chart dependencies.

---
 .jenkins/Jenkinsfile             |  2 --
 charts/hawkbit/Chart.yaml        | 15 ++++++++++++---
 charts/hawkbit/requirements.yaml | 22 ----------------------
 charts/hawkbit/values.yaml       | 11 +++++------
 4 files changed, 17 insertions(+), 33 deletions(-)
 delete mode 100644 charts/hawkbit/requirements.yaml

diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile
index 64af26e2..480bc23f 100644
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@ -93,9 +93,7 @@ podTemplate(
 
                 stage('Helm Build') {
                     dir("build") {
-                        // adding the bitnami repo below serves as a workaround for sporadic "no cached repository" errors when packaging the hawkbit chart
                         sh '''
-                            ${WORKSPACE}/helm repo add bitnami-full https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
                             mkdir -p helm-repository
                             for i in $(ls charts/*/Chart.yaml packages/*/Chart.yaml); do
                                 echo "Building $(dirname $i) ..."
diff --git a/charts/hawkbit/Chart.yaml b/charts/hawkbit/Chart.yaml
index 433e89f8..28b13706 100644
--- a/charts/hawkbit/Chart.yaml
+++ b/charts/hawkbit/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, 2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2020, 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -9,8 +9,8 @@
 #
 # SPDX-License-Identifier: EPL-2.0
 ---
-apiVersion: v1
-version: 1.4.2
+apiVersion: v2
+version: 1.5.0
 appVersion: "0.3.0M6-mysql"
 description: |
    Eclipse hawkBit™ is a domain independent back-end framework for rolling out software updates
@@ -31,3 +31,12 @@ maintainers:
   email: axel.koehler@kiwigrid.com
 - name: ctron
   email: ctron@dentrassi.de
+dependencies:
+- name: mysql
+  version: ^9.x
+  repository: "oci://registry-1.docker.io/bitnamicharts"
+  condition: mysql.enabled
+- name: rabbitmq
+  version: ^10.x
+  repository: "oci://registry-1.docker.io/bitnamicharts"
+  condition: rabbitmq.enabled
diff --git a/charts/hawkbit/requirements.yaml b/charts/hawkbit/requirements.yaml
deleted file mode 100644
index 74dea1ba..00000000
--- a/charts/hawkbit/requirements.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2020, 2022 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0
-#
-# SPDX-License-Identifier: EPL-2.0
----
-dependencies:
-  - name: mysql
-    version: 6.14.10
-    # referenced chart version not in main bitnami index any more, therefore using the full index (see https://github.com/bitnami/charts/issues/10833)
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-    condition: mysql.enabled
-  - name: rabbitmq
-    version: 7.8.0
-    # referenced chart version not in main bitnami index any more, therefore using the full index (see https://github.com/bitnami/charts/issues/10833)
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-    condition: rabbitmq.enabled
diff --git a/charts/hawkbit/values.yaml b/charts/hawkbit/values.yaml
index 8b0eaefd..c598a5f7 100644
--- a/charts/hawkbit/values.yaml
+++ b/charts/hawkbit/values.yaml
@@ -173,17 +173,16 @@ config:
 ## ref: https://github.com/bitnami/charts/blob/master/bitnami/mysql/values.yaml
 mysql:
   enabled: true
-  master:
+  primary:
     persistence:
       enabled: true
   volumePermissions:
     enabled: true
-  db:
-    user: hawkbit
+  architecture: standalone
+  auth:
+    username: hawkbit
     password: hawkbit
-    name: hawkbit
-  replication:
-    enabled: false
+    database: hawkbit
   metrics:
     enabled: true