Add support for custom labels in the Nginx pods

jfrog · Oct 27, 2023 · dce3804 · dce3804
1 parent 7a7916b
commit dce3804
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file
 
+## [107.71.4] - Oct 27, 2023
+* Added support for custom labels in the Nginx pods
+
 ## [107.71.3] - Sep 18, 2023
 * Adjust rtfs context
 * Fixed - Metadata service does not respect customVolumeMounts for DB CAs [GH-1815](https://github.com/jfrog/charts/issues/1815)

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
@@ -1,6 +1,9 @@
 # JFrog Artifactory Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [107.71.4] - Oct 27, 2023
+* Added support for custom labels in the Nginx pods
+
 ## [107.71.3] - Sep 18, 2023
 * Adjust rtfs context
 * Fixed - Metadata service does not respect customVolumeMounts for DB CAs [GH-1815](https://github.com/jfrog/charts/issues/1815)

diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.71.3
+appVersion: 7.71.4
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -21,4 +21,4 @@ name: artifactory
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.71.3
+version: 107.71.4
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 }}