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
1 change: 1 addition & 0 deletions .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ jobs:
secrets: inherit
with:
openApiFilePath: './bundledApi.yaml'
chartDirs: 'helm'
6 changes: 6 additions & 0 deletions helm/Chart.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dependencies:
- name: mc-labels-and-annotations
repository: oci://acrarolibotnonprod.azurecr.io/helm/infra
version: 0.7.0
digest: sha256:2be5f55b663b3888821a0bc9d1b8f382a5836f40b066b114c9c90f6804295d8e
generated: "2025-08-27T09:12:57.0437616+03:00"
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 store-trigger service
type: application
version: 2.0.0
appVersion: 2.0.0
dependencies:
- name: mc-labels-and-annotations
version: 0.7.0
repository: oci://acrarolibotnonprod.azurecr.io/helm/infra
alias: mcLabelsAndAnnotations
13 changes: 2 additions & 11 deletions helm/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ helm.sh/chart: {{ include "store-trigger.chart" . }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{ include "mc-labels-and-annotations.labels" . }}
{{- end }}

{{/*
Expand All @@ -44,19 +45,9 @@ Selector labels
{{- define "store-trigger.selectorLabels" -}}
app.kubernetes.io/name: {{ include "store-trigger.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{ include "mc-labels-and-annotations.selectorLabels" . }}
{{- end }}

{{/*
Returns the environment from the chart's values if exists or from global, defaults to development
*/}}
{{- define "store-trigger.environment" -}}
{{- if .Values.environment }}
{{- .Values.environment -}}
{{- else -}}
{{- .Values.global.environment | default "development" -}}
{{- end -}}
{{- end -}}

{{/*
Returns the cloud provider name from the chart's values if exists or from global, defaults to minikube
*/}}
Expand Down
2 changes: 1 addition & 1 deletion helm/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ metadata:
labels:
app: {{ $chartName }}
component: {{ $chartName }}
environment: {{ include "store-trigger.environment" . }}
release: {{ $releaseName }}
{{- include "store-trigger.labels" . | nindent 4 }}
spec:
Expand All @@ -38,6 +37,7 @@ spec:
run: {{ $fullName }}
{{- include "store-trigger.selectorLabels" . | nindent 8 }}
annotations:
{{ include "mc-labels-and-annotations.annotations" . | nindent 8 }}
{{ include "merged.podAnnotations" . | nindent 8 }}
{{- if .Values.resetOnConfigChange }}
checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
Expand Down
1 change: 0 additions & 1 deletion helm/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ metadata:
labels:
app: {{ $chartName }}
component: {{ $chartName }}
environment: {{ include "store-trigger.environment" . }}
release: {{ $releaseName }}
{{- include "store-trigger.labels" . | nindent 4 }}
spec:
Expand Down
12 changes: 10 additions & 2 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ global:
imagePullPolicy: IfNotPresent
tracing: {}
metrics: {}
environment: development

providers:
source: NFS
destination: S3
Expand Down Expand Up @@ -41,8 +41,16 @@ cloudProvider:
dockerRegistryUrl:
flavor:
imagePullSecretName:

imagePullPolicy:
environment:

mcLabelsAndAnnotations:
component: backend
partOf: ingestion
owner: 3d
gisDomain: 3d
prometheus:
enabled: true

image:
repository: store-trigger
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"prelint:fix": "npm run format:fix",
"prelint": "npm run format",
"lint:openapi": "npx @redocly/cli lint --format=github-actions ./bundledApi.yaml",
"lint": "eslint . && helm lint ./helm",
"lint:fix": "eslint --fix . && helm lint ./helm",
"lint": "eslint .",
"lint:fix": "eslint --fix .",
"test": "npm run test:unit && npm run test:integration",
"prebuild": "npm run clean",
"build": "tsc --project tsconfig.build.json && npm run assets:copy",
Expand Down
Loading