From dce3804be778236647af22bca4cfb5bf5267a5ef Mon Sep 17 00:00:00 2001 From: Ji Date: Fri, 27 Oct 2023 17:27:51 +1300 Subject: [PATCH] Add support for custom labels in the Nginx pods --- stable/artifactory-ha/CHANGELOG.md | 3 +++ stable/artifactory-ha/templates/nginx-deployment.yaml | 4 ++++ stable/artifactory/CHANGELOG.md | 3 +++ stable/artifactory/Chart.yaml | 4 ++-- stable/artifactory/templates/nginx-deployment.yaml | 4 ++++ 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md index 047545b2d..596ec37d3 100644 --- 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 index 80e2def21..7cf5400fd 100644 --- 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 index 4dd59a269..50c214fc9 100644 --- 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 index b67e42de4..c4f4dbe9f 100644 --- 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 index ff7c78c5d..313499589 100644 --- 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 }}