Merge pull request #1836 from jiyeonmolloy/nginx-custom-labels

[artifactory] Add support for custom labels in the Nginx pods
jfrog · Jan 24, 2024 · 24592b2 · 24592b2
2 parents aff8937 + c1ac106
commit 24592b2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md
@@ -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

diff --git a/stable/artifactory-ha/templates/nginx-deployment.yaml b/stable/artifactory-ha/templates/nginx-deployment.yaml
@@ -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 }}

diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md
@@ -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

diff --git a/stable/artifactory/templates/nginx-deployment.yaml b/stable/artifactory/templates/nginx-deployment.yaml
@@ -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 }}