helm: add infra labels and annotations (MAPCO-9062)

.gitignore

@@ -421,3 +421,4 @@ FodyWeavers.xsd
 
 # Local value yaml
 helm/local.yaml
+Chart.lock

helm/Chart.yaml

@@ -4,3 +4,7 @@ description: A Helm chart for gpkg-merger service # refers to MergerService
 type: application
 version: 2.0.0
 appVersion: 2.0.0
+dependencies:
+  - name: mclabels
+    version: 1.0.1
+    repository: oci://acrarolibotnonprod.azurecr.io/helm/infra

helm/templates/_helpers.tpl

@@ -31,11 +31,11 @@ Common labels
 */}}
 {{- define "gpkg-merger.labels" -}}
 helm.sh/chart: {{ include "gpkg-merger.chart" . }}
-{{ include "gpkg-merger.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{ include "mclabels.labels" . }}
 {{- end }}
 
 {{/*
@@ -51,6 +51,7 @@ Selector labels
 {{- define "gpkg-merger.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "gpkg-merger.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
+{{ include "mclabels.selectorLabels" . }}
 {{- end }}
 
 {{/*

helm/templates/deployment.yaml

@@ -40,12 +40,9 @@ spec:
         run: {{ $releaseName }}-{{ $chartName }}
         {{- include "gpkg-merger.selectorLabels" . | nindent 8 }}
       annotations:
+        {{ include "mclabels.annotations" . | nindent 8 }}
       {{- if .Values.resetOnConfigChange }}
         checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        {{- if .Values.env.metrics.enabled }}
-        prometheus.io/port: {{ .Values.env.metrics.port | quote }}
-        prometheus.io/scrape: {{ .Values.env.metrics.scrape | quote }}
-        {{- end }}
         {{- if .Values.podAnnotations }}
         {{- toYaml .Values.podAnnotations | nindent 8 }}
         {{- end }}

helm/values.yaml

@@ -32,6 +32,17 @@ global:
     path: '/usr/local/share/ca-certificates'
     key: 'ca.crt'
 
+
+mclabels:
+  #environment: development
+  component: backend
+  partOf: ingestion
+  owner: raster
+  gisDomain: raster
+  prometheus:
+    enabled: true
+    port: 8080
+
 enabled: true
 environment: development
 replicaCount: 1