fix: remove changing-values from labels and move to annotations

AtomiCloud · Oct 21, 2023 · 34b7442 · 34b7442
1 parent 286e775
commit 34b7442
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/infra/api_chart/templates/_helpers.tpl b/infra/api_chart/templates/_helpers.tpl
@@ -42,12 +42,7 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "dotnet-chart.labels" -}}
-helm.sh/chart: {{ include "dotnet-chart.chart" . }}
 {{ include "dotnet-chart.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-atomi.cloud/chart: {{ include "dotnet-chart.chart" . }}
 {{- range $k, $v := .Values.serviceTree }}
 "atomi.cloud/{{ $k }}": "{{ $v }}"
 {{- end }}
@@ -58,6 +53,11 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Common annotations
 */}}
 {{- define "dotnet-chart.annotations" -}}
+helm.sh/chart: {{ include "dotnet-chart.chart" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+atomi.cloud/chart: {{ include "dotnet-chart.chart" . }}
 {{- range $k, $v := .Values.serviceTree }}
 "atomi.cloud/{{ $k }}": "{{ $v }}"
 {{- end }}

diff --git a/infra/migration_chart/templates/_helpers.tpl b/infra/migration_chart/templates/_helpers.tpl
@@ -42,12 +42,7 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "dotnet-migration.labels" -}}
-helm.sh/chart: {{ include "dotnet-migration.chart" . }}
 {{ include "dotnet-migration.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-atomi.cloud/chart: {{ include "dotnet-migration.chart" . }}
 {{- range $k, $v := .Values.serviceTree }}
 "atomi.cloud/{{ $k }}": "{{ $v }}"
 {{- end }}
@@ -58,6 +53,11 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Common annotations
 */}}
 {{- define "dotnet-migration.annotations" -}}
+helm.sh/chart: {{ include "dotnet-migration.chart" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+atomi.cloud/chart: {{ include "dotnet-migration.chart" . }}
 {{- range $k, $v := .Values.serviceTree }}
 "atomi.cloud/{{ $k }}": "{{ $v }}"
 {{- end }}

diff --git a/infra/root_chart/templates/_helpers.tpl b/infra/root_chart/templates/_helpers.tpl
@@ -42,12 +42,7 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "root-chart.labels" -}}
-helm.sh/chart: {{ include "root-chart.chart" . }}
 {{ include "root-chart.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-atomi.cloud/chart: {{ include "root-chart.chart" . }}
 {{- range $k, $v := .Values.serviceTree }}
 "atomi.cloud/{{ $k }}": "{{ $v }}"
 {{- end }}
@@ -58,6 +53,11 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Common annotations
 */}}
 {{- define "root-chart.annotations" -}}
+helm.sh/chart: {{ include "root-chart.chart" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+atomi.cloud/chart: {{ include "root-chart.chart" . }}
 {{- range $k, $v := .Values.serviceTree }}
 "atomi.cloud/{{ $k }}": "{{ $v }}"
 {{- end }}