From 8e6617e02682cdfec3fa27f712dd6dc58521d8dd Mon Sep 17 00:00:00 2001 From: Lukas Harzenetter Date: Thu, 5 Sep 2024 17:38:20 +0200 Subject: [PATCH 1/9] update image version fix readiness probes fix default jdbc driver Signed-off-by: Lukas Harzenetter --- charts/hawkbit/Chart.yaml | 4 ++-- charts/hawkbit/templates/deployment.yaml | 6 +++--- charts/hawkbit/values.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/hawkbit/Chart.yaml b/charts/hawkbit/Chart.yaml index 7eb39b7c..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.0 -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/values.yaml b/charts/hawkbit/values.yaml index 5fb06c2d..0713ad31 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 From cb7f1783fab06a803e2e8d1cb26a1726fd1a1d79 Mon Sep 17 00:00:00 2001 From: Lukas Harzenetter Date: Mon, 9 Sep 2024 08:39:15 +0200 Subject: [PATCH 2/9] update test to use access userinfo --- charts/hawkbit/templates/tests/test-connection.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/hawkbit/templates/tests/test-connection.yaml b/charts/hawkbit/templates/tests/test-connection.yaml index 43e10ee2..6c4acc5d 100644 --- a/charts/hawkbit/templates/tests/test-connection.yaml +++ b/charts/hawkbit/templates/tests/test-connection.yaml @@ -14,5 +14,5 @@ spec: - name: wget image: busybox command: ['wget'] - args: ['{{ include "hawkbit.fullname" . }}:{{ .Values.service.port }}'] + args: ['--user', 'admin', '--password', 'admin', '{{ include "hawkbit.fullname" . }}:{{ .Values.service.port }}/rest/v1/userinfo'] restartPolicy: Never From 6cfbbb11c2d81d67db08ab0be664bb801dfb3c77 Mon Sep 17 00:00:00 2001 From: Lukas Harzenetter Date: Mon, 9 Sep 2024 08:56:29 +0200 Subject: [PATCH 3/9] use curl --- charts/hawkbit/templates/tests/test-connection.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/charts/hawkbit/templates/tests/test-connection.yaml b/charts/hawkbit/templates/tests/test-connection.yaml index 6c4acc5d..f04c271a 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: ['--user', 'admin', '--password', 'admin', '{{ include "hawkbit.fullname" . }}:{{ .Values.service.port }}/rest/v1/userinfo'] + - name: curl + image: curlimages/curl + command: ['curl'] + args: [ + "-X 'GET'", + "-u admin:admin", + "'{{ include "hawkbit.fullname" . }}:{{ .Values.service.port }}/rest/v1/userinfo'" + ] restartPolicy: Never From ddf279b0aeb6e0e1e8bdc4265a598aeb83fc8703 Mon Sep 17 00:00:00 2001 From: Lukas Harzenetter Date: Mon, 9 Sep 2024 09:09:27 +0200 Subject: [PATCH 4/9] add protocol to test --- charts/hawkbit/templates/tests/test-connection.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/hawkbit/templates/tests/test-connection.yaml b/charts/hawkbit/templates/tests/test-connection.yaml index f04c271a..a2e0907c 100644 --- a/charts/hawkbit/templates/tests/test-connection.yaml +++ b/charts/hawkbit/templates/tests/test-connection.yaml @@ -17,6 +17,6 @@ spec: args: [ "-X 'GET'", "-u admin:admin", - "'{{ include "hawkbit.fullname" . }}:{{ .Values.service.port }}/rest/v1/userinfo'" + "'http://{{ include "hawkbit.fullname" . }}:{{ .Values.service.port }}/rest/v1/userinfo'" ] restartPolicy: Never From 71c5073c2849ea3dd1b4ad3275497f5e64e8f81b Mon Sep 17 00:00:00 2001 From: Lukas Harzenetter Date: Mon, 9 Sep 2024 09:24:13 +0200 Subject: [PATCH 5/9] use quotes --- charts/hawkbit/templates/tests/test-connection.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/hawkbit/templates/tests/test-connection.yaml b/charts/hawkbit/templates/tests/test-connection.yaml index a2e0907c..9e5cbcf0 100644 --- a/charts/hawkbit/templates/tests/test-connection.yaml +++ b/charts/hawkbit/templates/tests/test-connection.yaml @@ -16,7 +16,7 @@ spec: command: ['curl'] args: [ "-X 'GET'", - "-u admin:admin", + "-u 'admin:admin'", "'http://{{ include "hawkbit.fullname" . }}:{{ .Values.service.port }}/rest/v1/userinfo'" ] restartPolicy: Never From 37feadfe1bf9b835c3b42627c081fe051d09aede Mon Sep 17 00:00:00 2001 From: Lukas Harzenetter Date: Mon, 9 Sep 2024 10:37:00 +0200 Subject: [PATCH 6/9] try using fullname override --- charts/hawkbit/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/hawkbit/values.yaml b/charts/hawkbit/values.yaml index 0713ad31..57eef7aa 100644 --- a/charts/hawkbit/values.yaml +++ b/charts/hawkbit/values.yaml @@ -41,7 +41,7 @@ updateStrategy: type: Recreate nameOverride: "" -fullnameOverride: "" +fullnameOverride: "eclipse-hawkbit" service: type: ClusterIP From 75270c71c33175e124ced1c3598e5c3daf733d66 Mon Sep 17 00:00:00 2001 From: Lukas Harzenetter Date: Mon, 9 Sep 2024 10:50:06 +0200 Subject: [PATCH 7/9] reformat curl --- charts/hawkbit/templates/tests/test-connection.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/hawkbit/templates/tests/test-connection.yaml b/charts/hawkbit/templates/tests/test-connection.yaml index 9e5cbcf0..6702bb5a 100644 --- a/charts/hawkbit/templates/tests/test-connection.yaml +++ b/charts/hawkbit/templates/tests/test-connection.yaml @@ -15,8 +15,8 @@ spec: image: curlimages/curl command: ['curl'] args: [ - "-X 'GET'", - "-u 'admin:admin'", - "'http://{{ include "hawkbit.fullname" . }}:{{ .Values.service.port }}/rest/v1/userinfo'" + "-X", "GET", + "-u", "admin:admin", + "http://{{ include "hawkbit.fullname" . }}:{{ .Values.service.port }}/rest/v1/userinfo" ] restartPolicy: Never From f2dad38523309b1225b0fbcc9d558e4a94d7ade7 Mon Sep 17 00:00:00 2001 From: Lukas Harzenetter Date: Mon, 23 Sep 2024 13:24:19 +0200 Subject: [PATCH 8/9] use values for creating admin request --- charts/hawkbit/templates/tests/test-connection.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/hawkbit/templates/tests/test-connection.yaml b/charts/hawkbit/templates/tests/test-connection.yaml index 6702bb5a..1cc847ab 100644 --- a/charts/hawkbit/templates/tests/test-connection.yaml +++ b/charts/hawkbit/templates/tests/test-connection.yaml @@ -16,7 +16,7 @@ spec: command: ['curl'] args: [ "-X", "GET", - "-u", "admin:admin", + "-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 From cde5ab446b0cf87e252a50d05144f60bc12760bb Mon Sep 17 00:00:00 2001 From: Lukas Harzenetter Date: Mon, 7 Oct 2024 07:35:49 +0200 Subject: [PATCH 9/9] remove name overide --- charts/hawkbit/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/hawkbit/values.yaml b/charts/hawkbit/values.yaml index 57eef7aa..0713ad31 100644 --- a/charts/hawkbit/values.yaml +++ b/charts/hawkbit/values.yaml @@ -41,7 +41,7 @@ updateStrategy: type: Recreate nameOverride: "" -fullnameOverride: "eclipse-hawkbit" +fullnameOverride: "" service: type: ClusterIP