Skip to content

Commit e9d5f98

Browse files
authored
fix(helm): Add individual ingress annotations (#10231)
<!-- Raise an issue to propose your change (https://github.com/cvat-ai/cvat/issues). It helps to avoid duplication of efforts from multiple independent contributors. Discuss your ideas with maintainers to be sure that changes will be approved and merged. Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/). --> <!-- Provide a general summary of your changes in the Title above --> ### Motivation and context <!-- Why is this change required? What problem does it solve? If it fixes an open issue, please link to the issue here. Describe your changes in detail, add screenshots. --> ### How has this been tested? <!-- Please describe in detail how you tested your changes. Include details of your testing environment, and the tests you ran to see how your change affects other areas of the code, etc. --> ### Checklist <!-- Go over all the following points, and put an `x` in all the boxes that apply. If an item isn't applicable for some reason, then ~~explicitly strikethrough~~ the whole line. If you don't do that, GitHub will show incorrect progress for the pull request. If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [x] I submit my changes into the `develop` branch - [x] I have created a changelog fragment <!-- see top comment in CHANGELOG.md --> - [ ] I have updated the documentation accordingly - [ ] I have added tests to cover my changes - [ ] I have linked related issues (see [GitHub docs]( https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword)) ### License - [x] I submit _my code changes_ under the same [MIT License]( https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the project. Feel free to contact the maintainers if that's a concern.
1 parent b4e0a6d commit e9d5f98

4 files changed

Lines changed: 12 additions & 2 deletions

File tree

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
### Added
2+
3+
- Individual annotations for CVAT and analytics ingress in Helm chart
4+
(<https://github.com/cvat-ai/cvat/pull/10231>)

helm-chart/templates/analytics/ingress.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{{- if and .Values.ingress.enabled .Values.analytics.enabled -}}
22
{{- $fullName := include "cvat.fullname" . -}}
3+
{{- $localValues := .Values.analytics.ingress -}}
34
apiVersion: networking.k8s.io/v1
45
kind: Ingress
56
metadata:
@@ -12,7 +13,7 @@ metadata:
1213
traefik.ingress.kubernetes.io/router.middlewares: {{ $.Release.Namespace }}-stripprefix@kubernetescrd,
1314
{{ $.Release.Namespace }}-forwardauth@kubernetescrd
1415
{{- end }}
15-
{{- with .Values.ingress.annotations }}
16+
{{- with merge $localValues.annotations .Values.ingress.annotations }}
1617
{{- toYaml . | nindent 4 }}
1718
{{- end }}
1819
spec:

helm-chart/templates/ingress.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{{- if .Values.ingress.enabled -}}
22
{{- $fullName := include "cvat.fullname" . -}}
3+
{{- $localValues := .Values.cvat.ingress -}}
34
apiVersion: networking.k8s.io/v1
45
kind: Ingress
56
metadata:
67
name: {{ $fullName }}
78
namespace: {{ .Release.Namespace }}
89
labels:
910
{{- include "cvat.labels" . | nindent 4 }}
10-
{{- with .Values.ingress.annotations }}
11+
{{- with merge $localValues.annotations .Values.ingress.annotations }}
1112
annotations:
1213
{{- toYaml . | nindent 4 }}
1314
{{- end }}

helm-chart/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ nameOverride: ""
88
fullnameOverride: ""
99

1010
cvat:
11+
ingress:
12+
annotations: {}
1113
backend:
1214
labels: {}
1315
annotations: {}
@@ -396,6 +398,8 @@ nuclio:
396398
analytics:
397399
# Set clickhouse.enabled to false if you disable analytics or use an external database
398400
enabled: true
401+
ingress:
402+
annotations: {}
399403
clickhouseDb: cvat
400404
clickhouseUser: user
401405
clickhousePassword: user

0 commit comments

Comments
 (0)