From f7665111b1b0ebdce1db6674a2b633198442b17f Mon Sep 17 00:00:00 2001
From: Lukas Harzenetter <lharzenetter@gmx.de>
Date: Mon, 7 Oct 2024 08:06:16 +0200
Subject: [PATCH] Update hawkBit to Application Version 0.5.0 (#549)

* update image version
fix readiness probes
fix default jdbc driver

Signed-off-by: Lukas Harzenetter <lharzenetter@gmx.de>

* update test to use access userinfo

* use curl

* add protocol to test

* use quotes

* try using fullname override

* reformat curl

* use values for creating admin request

* remove name overide

---------

Signed-off-by: Lukas Harzenetter <lharzenetter@gmx.de>
---
 charts/hawkbit/Chart.yaml                           |  4 ++--
 charts/hawkbit/templates/deployment.yaml            |  6 +++---
 charts/hawkbit/templates/tests/test-connection.yaml | 12 ++++++++----
 charts/hawkbit/values.yaml                          |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/charts/hawkbit/Chart.yaml b/charts/hawkbit/Chart.yaml
index 84d2f587..f2bfa03f 100644
--- a/charts/hawkbit/Chart.yaml
+++ b/charts/hawkbit/Chart.yaml
@@ -10,8 +10,8 @@
 # SPDX-License-Identifier: EPL-2.0
 ---
 apiVersion: v2
-version: 1.6.1
-appVersion: "0.3.0M6-mysql"
+version: 1.7.0
+appVersion: "0.5.0-mysql"
 description: |
    Eclipse hawkBit™ is a domain independent back-end framework for rolling out software updates
    to constrained edge devices as well as more powerful controllers and gateways connected to
diff --git a/charts/hawkbit/templates/deployment.yaml b/charts/hawkbit/templates/deployment.yaml
index 389ebf37..614581af 100644
--- a/charts/hawkbit/templates/deployment.yaml
+++ b/charts/hawkbit/templates/deployment.yaml
@@ -40,7 +40,7 @@ spec:
               {{- if .Values.env.springDatasourceUrl }}
               value: "{{ .Values.env.springDatasourceUrl }}"
               {{- else }}
-              value: "jdbc:mysql://{{ if .Values.mysql.enabled }}{{ .Release.Name }}-mysql{{ else }}{{ .Values.env.springDatasourceHost }}{{ end }}:3306/{{ .Values.env.springDatasourceDb }}"
+              value: "jdbc:mariadb://{{ if .Values.mysql.enabled }}{{ .Release.Name }}-mysql{{ else }}{{ .Values.env.springDatasourceHost }}{{ end }}:3306/{{ .Values.env.springDatasourceDb }}"
               {{- end }}
             - name: "SPRING_APPLICATION_JSON"
               valueFrom:
@@ -70,13 +70,13 @@ spec:
               protocol: TCP
           livenessProbe:
             httpGet:
-              path: /VAADIN/themes/hawkbit/favicon.ico
+              path: /swagger-ui/index.html
               port: http
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
             timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
           readinessProbe:
             httpGet:
-              path: /VAADIN/themes/hawkbit/favicon.ico
+              path: /swagger-ui/index.html
               port: http
             initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
             timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
diff --git a/charts/hawkbit/templates/tests/test-connection.yaml b/charts/hawkbit/templates/tests/test-connection.yaml
index 43e10ee2..1cc847ab 100644
--- a/charts/hawkbit/templates/tests/test-connection.yaml
+++ b/charts/hawkbit/templates/tests/test-connection.yaml
@@ -11,8 +11,12 @@ metadata:
     "helm.sh/hook": test-success
 spec:
   containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args:  ['{{ include "hawkbit.fullname" . }}:{{ .Values.service.port }}']
+    - name: curl
+      image: curlimages/curl
+      command: ['curl']
+      args: [
+        "-X", "GET",
+        "-u", "{{ .Values.config.application.spring.security.user.name }}:{{ trimPrefix "{noop}" .Values.config.secrets.spring.security.user.password }}",
+        "http://{{ include "hawkbit.fullname" . }}:{{ .Values.service.port }}/rest/v1/userinfo"
+      ]
   restartPolicy: Never
diff --git a/charts/hawkbit/values.yaml b/charts/hawkbit/values.yaml
index 29cb44ed..44a4c17b 100644
--- a/charts/hawkbit/values.yaml
+++ b/charts/hawkbit/values.yaml
@@ -15,7 +15,7 @@
 
 image:
   repository: "hawkbit/hawkbit-update-server"
-  tag: 0.3.0M6-mysql
+  tag: 0.5.0-mysql
   pullPolicy: IfNotPresent
 
 replicaCount: 1