From 424f29ab5e628a1257bfa374f744bd912e498883 Mon Sep 17 00:00:00 2001 From: Martin Schmidt Date: Mon, 9 Dec 2024 14:03:52 +0100 Subject: [PATCH] Fixes (#63) * Remove appVersion field from Chart.yaml * Remove default port value for PostgreSQL in values.yaml * Update image tag default to use Chart.Version instead of AppVersion * Set default PostgreSQL port to 5432 in run_kind_test.sh --- chart/Chart.yaml | 1 - chart/run_kind_test.sh | 1 + chart/templates/common/_image.yaml | 4 ++-- chart/values.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 2a2da35..ec12180 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -3,7 +3,6 @@ name: project-origin-chronicler description: A helm chart for deploying the Project Origin Chronicler type: application version: 0.1.0 -appVersion: "0.1.0" annotations: artifacthub.io/containsSecurityUpdates: "false" diff --git a/chart/run_kind_test.sh b/chart/run_kind_test.sh index 0db8f44..778ff2f 100755 --- a/chart/run_kind_test.sh +++ b/chart/run_kind_test.sh @@ -92,6 +92,7 @@ postgresql: host: postgresql database: postgres username: postgres + port: 5432 password: secretRef: name: postgresql diff --git a/chart/templates/common/_image.yaml b/chart/templates/common/_image.yaml index 2bdce47..cc452e8 100644 --- a/chart/templates/common/_image.yaml +++ b/chart/templates/common/_image.yaml @@ -1,8 +1,8 @@ {{- define "common.image" -}} {{ $registry := .root.Values.global.imageRegistry | default .image.registry }} {{- if $registry -}} -{{ $registry }}/{{ .image.repository }}:{{ .image.tag | default .root.Chart.AppVersion }} +{{ $registry }}/{{ .image.repository }}:{{ .image.tag | default .root.Chart.Version }} {{- else -}} -{{ .image.repository }}:{{ .image.tag | default .root.Chart.AppVersion }} +{{ .image.repository }}:{{ .image.tag | default .root.Chart.Version }} {{- end -}} {{- end -}} diff --git a/chart/values.yaml b/chart/values.yaml index 5268b9a..3313029 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -107,7 +107,7 @@ postgresql: # name: # key: # port defines the port of the postgresql database - port: "5432" + port: # secretRef: # name: # key: