Skip to content

Commit 2fd303c

Browse files
authored
helm: add infra labels and annotatios (MAPCO-9063) (#124)
* chore: add infra labels and annotatios * chore: removed log-scrapping * ci: upgrade pull_request action to v5 * ci: upgrade pull_request action to v5.0.1 * ci: upgrade pull_request action to v5.1.0 * ci: update pull_request action to use fix/helm-lint branch * trigger CI * trigger CI * trigger CI * ci: update pull_request action to use v5 * fix: upgrade redocly version + handle openapi lint errors * trigger CI
1 parent d69d9ae commit 2fd303c

File tree

11 files changed

+1195
-280
lines changed

11 files changed

+1195
-280
lines changed

.github/workflows/pull_request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ on: [pull_request]
44

55
jobs:
66
pull_request:
7-
uses: MapColonies/shared-workflows/.github/workflows/pull_request.yaml@v4
7+
uses: MapColonies/shared-workflows/.github/workflows/pull_request.yaml@v5
88
secrets: inherit

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,6 @@ jest_html_reporters.html
112112
reports
113113

114114
local*.json
115+
116+
# Helm
117+
Chart.lock

.redocly.yaml

Lines changed: 0 additions & 33 deletions
This file was deleted.

helm/Chart.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,8 @@ description: A Helm chart for exporter-trigger service
44
type: application
55
version: 3.1.6
66
appVersion: 3.1.6
7+
8+
dependencies:
9+
- name: mclabels
10+
version: 1.0.1
11+
repository: oci://acrarolibotnonprod.azurecr.io/helm/infra

helm/templates/_helpers.tpl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ Create chart name and version as used by the chart label.
3030
Common labels
3131
*/}}
3232
{{- define "exporter-trigger.labels" -}}
33+
app.kubernetes.io/name: {{ include "exporter-trigger.name" . }}
34+
app.kubernetes.io/instance: {{ .Release.Name }}
3335
helm.sh/chart: {{ include "exporter-trigger.chart" . }}
34-
{{ include "exporter-trigger.selectorLabels" . }}
36+
app.kubernetes.io/managed-by: {{ .Release.Service }}
3537
{{- if .Chart.AppVersion }}
3638
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
3739
{{- end }}
38-
app.kubernetes.io/managed-by: {{ .Release.Service }}
40+
{{ include "mclabels.labels" . }}
3941
{{- end }}
4042

4143
{{/*
@@ -51,6 +53,7 @@ Selector labels
5153
{{- define "exporter-trigger.selectorLabels" -}}
5254
app.kubernetes.io/name: {{ include "exporter-trigger.name" . }}
5355
app.kubernetes.io/instance: {{ .Release.Name }}
56+
{{ include "mclabels.selectorLabels" . }}
5457
{{- end }}
5558

5659
{{/*

helm/templates/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ spec:
4848
prometheus.io/port: {{ $metrics.prometheus.port | quote }}
4949
prometheus.io/scrape: {{ $metrics.prometheus.scrape | quote }}
5050
{{- end }}
51+
{{- include "mclabels.annotations" . | nindent 8 }}
5152
spec:
5253
{{- if $cloudProviderImagePullSecretName }}
5354
imagePullSecrets:

helm/values.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@ global:
1111
domain: ''
1212
configOfflineMode: false
1313

14+
mclabels:
15+
#environment: development
16+
component: backend
17+
partOf: export
18+
owner: raster
19+
gisDomain: raster
20+
prometheus:
21+
enabled: true
22+
port: 8080
23+
1424
jobDefinitions:
1525
jobs:
1626
export:

openapi3.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ paths:
119119
application/json:
120120
schema:
121121
$ref: '#/components/schemas/ErrorMessage'
122+
security:
123+
- {}
122124
components:
123125
requestBodies:
124126
ExportByRoiBody:

0 commit comments

Comments
 (0)