Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[artifactory] Add support for custom labels in the Nginx pods #1836

Merged
merged 2 commits into from
Jan 24, 2024
Merged

[artifactory] Add support for custom labels in the Nginx pods #1836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dce3804
Add support for custom labels in the Nginx pods
jiyeonmolloy Oct 27, 2023
c1ac106
Merge branch 'jp-10.17.0' into nginx-custom-labels
chukka Jan 24, 2024
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 stable/artifactory-ha/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ All changes to this chart will be documented in this file
* Fixed - StatefulSet pod annotations changed from range to toYaml [GH-1828](https://github.com/jfrog/charts/issues/1828)
* Fixed - Invalid format for awsS3V3 `multiPartLimit,multipartElementSize` in binarystore.xml
* Fixed - Artifactory primary service condition
* Added support for custom labels in the Nginx pods

## [107.69.0] - Sep 18, 2023
* Adjust rtfs context
Expand Down
4 changes: 4 additions & 0 deletions stable/artifactory-ha/templates/nginx-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ spec:
component: {{ .Values.nginx.name }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
{{- if .Values.nginx.labels }}
{{ toYaml .Values.nginx.labels | indent 8 }}
{{- end }}
{{- with .Values.nginx.deployment.annotations }}
spec:
securityContext:
runAsUser: {{ .Values.nginx.uid }}
Expand Down
3 changes: 2 additions & 1 deletion stable/artifactory/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ All changes to this chart will be documented in this file.

## [107.71.11] - Oct 31, 2023
* Fixed - StatefulSet pod annotations changed from range to toYaml [GH-1828](https://github.com/jfrog/charts/issues/1828)
* Fixed - Invalid format for awsS3V3 `multiPartLimit,multipartElementSize` in binarystore.xml.
* Fixed - Invalid format for awsS3V3 `multiPartLimit,multipartElementSize` in binarystore.xml
* Added support for custom labels in the Nginx pods

## [107.69.0] - Sep 18, 2023
* Adjust rtfs context
Expand Down
4 changes: 4 additions & 0 deletions stable/artifactory/templates/nginx-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ spec:
component: {{ .Values.nginx.name }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
{{- if .Values.nginx.labels }}
{{ toYaml .Values.nginx.labels | indent 8 }}
{{- end }}
{{- with .Values.nginx.deployment.annotations }}
spec:
securityContext:
runAsUser: {{ .Values.nginx.uid }}
Expand Down
Loading