From b4c91a8cfedac38608ab1c7783c70c520c42f4ff Mon Sep 17 00:00:00 2001 From: Richard87 Date: Fri, 11 Oct 2024 11:20:26 +0200 Subject: [PATCH 1/2] feat: release helm charts --- .github/workflows/release.yaml | 2 +- charts/radix-prometheus-proxy/Chart.yaml | 2 +- charts/radix-prometheus-proxy/templates/_helpers.tpl | 4 ++-- charts/radix-prometheus-proxy/templates/deployment.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cdd03a8..90928b3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -3,7 +3,7 @@ name: Build Release Docker Image on: push: tags: - - 'v*' + - 'v.*' jobs: diff --git a/charts/radix-prometheus-proxy/Chart.yaml b/charts/radix-prometheus-proxy/Chart.yaml index 6a55a93..d46843f 100644 --- a/charts/radix-prometheus-proxy/Chart.yaml +++ b/charts/radix-prometheus-proxy/Chart.yaml @@ -3,7 +3,7 @@ name: radix-prometheus-proxy icon: https://radix.equinor.com/images/logos/logo.svg description: Simple Prometheus Proxy to expose a simple metric version: 1.0.0 -appVersion: 0.1.0 # appVersion should always be equal to version! +appVersion: 0.0.0 # Not used! kubeVersion: ">=1.24.0" keywords: - radix diff --git a/charts/radix-prometheus-proxy/templates/_helpers.tpl b/charts/radix-prometheus-proxy/templates/_helpers.tpl index 3d3ce8f..7f0ede3 100644 --- a/charts/radix-prometheus-proxy/templates/_helpers.tpl +++ b/charts/radix-prometheus-proxy/templates/_helpers.tpl @@ -36,8 +36,8 @@ Common labels {{- define "prometheus-proxy.labels" -}} helm.sh/chart: {{ include "prometheus-proxy.chart" . }} {{ include "prometheus-proxy.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- if .Chart.Version }} +app.kubernetes.io/version: {{ .Chart.Version | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end }} diff --git a/charts/radix-prometheus-proxy/templates/deployment.yaml b/charts/radix-prometheus-proxy/templates/deployment.yaml index 679aa70..a883649 100644 --- a/charts/radix-prometheus-proxy/templates/deployment.yaml +++ b/charts/radix-prometheus-proxy/templates/deployment.yaml @@ -43,7 +43,7 @@ spec: {{- end }} containers: - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}" + image: "{{ .Values.image.repository }}:{{ default .Chart.Version .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: 8000 From c77ea00c4f5c36039388d02318d9e8324870a038 Mon Sep 17 00:00:00 2001 From: Richard87 Date: Fri, 11 Oct 2024 11:21:42 +0200 Subject: [PATCH 2/2] bump chart version --- charts/radix-prometheus-proxy/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/radix-prometheus-proxy/Chart.yaml b/charts/radix-prometheus-proxy/Chart.yaml index d46843f..be64640 100644 --- a/charts/radix-prometheus-proxy/Chart.yaml +++ b/charts/radix-prometheus-proxy/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: radix-prometheus-proxy icon: https://radix.equinor.com/images/logos/logo.svg description: Simple Prometheus Proxy to expose a simple metric -version: 1.0.0 +version: 1.1.0 appVersion: 0.0.0 # Not used! kubeVersion: ">=1.24.0" keywords: