Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,6 @@ jest_html_reporters.html
reports

local*.json

# Helm
Chart.lock
33 changes: 0 additions & 33 deletions .redocly.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 5 additions & 2 deletions helm/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

{{/*
Expand All @@ -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 }}

{{/*
Expand Down
1 change: 1 addition & 0 deletions helm/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 10 additions & 0 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions openapi3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
- storage
summary: Get free and total storage size for exporting (in bytes)
operationId: getStorage
responses:

Check warning on line 16 in openapi3.yaml

View workflow job for this annotation

GitHub Actions / pull_request / Run openapi-lint

operation-4xx-response

Operation must have at least one `4XX` response.
'200':
description: OK
content:
Expand Down Expand Up @@ -119,6 +119,8 @@
application/json:
schema:
$ref: '#/components/schemas/ErrorMessage'
security:
- {}
components:
requestBodies:
ExportByRoiBody:
Expand Down
Loading