helm: add infra labels and annotatios (MAPCO-9063) (#124)

Release-As: 3.1.7

Author: roicohen326

.github/workflows/pull_request.yaml

@@ -4,5 +4,5 @@ on: [pull_request]
 
 jobs:
   pull_request:
-    uses: MapColonies/shared-workflows/.github/workflows/pull_request.yaml@v4
+    uses: MapColonies/shared-workflows/.github/workflows/pull_request.yaml@v5
     secrets: inherit

.gitignore

@@ -112,3 +112,6 @@ jest_html_reporters.html
 reports
 
 local*.json
+
+# Helm
+Chart.lock

.redocly.yaml

@@ -4,3 +4,8 @@ description: A Helm chart for exporter-trigger service
 type: application
 version: 3.1.6
 appVersion: 3.1.6
+
+dependencies:
+  - name: mclabels
+    version: 1.0.1
+    repository: oci://acrarolibotnonprod.azurecr.io/helm/infra

helm/Chart.yaml

@@ -30,12 +30,14 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "exporter-trigger.labels" -}}
+app.kubernetes.io/name: {{ include "exporter-trigger.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 helm.sh/chart: {{ include "exporter-trigger.chart" . }}
-{{ include "exporter-trigger.selectorLabels" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{ include "mclabels.labels" . }}
 {{- end }}
 
 {{/*
@@ -51,6 +53,7 @@ Selector labels
 {{- define "exporter-trigger.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "exporter-trigger.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
+{{ include "mclabels.selectorLabels" . }}
 {{- end }}
 
 {{/*

helm/templates/_helpers.tpl

@@ -48,6 +48,7 @@ spec:
         prometheus.io/port: {{ $metrics.prometheus.port | quote }}
         prometheus.io/scrape: {{ $metrics.prometheus.scrape | quote }}
         {{- end }}
+        {{- include "mclabels.annotations" . | nindent 8 }}
     spec:
       {{- if $cloudProviderImagePullSecretName }}
       imagePullSecrets:

helm/templates/deployment.yaml

@@ -11,6 +11,16 @@ global:
   domain: ''
   configOfflineMode: false
 
+mclabels:
+  #environment: development
+  component: backend
+  partOf: export
+  owner: raster
+  gisDomain: raster
+  prometheus:
+    enabled: true
+    port: 8080
+
 jobDefinitions:
   jobs:
     export:

helm/values.yaml

@@ -119,6 +119,8 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/ErrorMessage'
+security:
+  - {}
 components:
   requestBodies:
     ExportByRoiBody: