[artifactory/artifactory-ha] 7.15.4 release (jfrog#1383)

* [artifactory] Fixed creation of nginx-certificate-secret when Nginx is disabled * Artifactory release 7.15.4 Co-authored-by: koalaty-code <[email protected]>
rahulnlb1 · Mar 5, 2021 · d49e783 · d49e783
1 parent 5ae37f9
commit d49e783
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md
@@ -1,6 +1,12 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [4.9.3] - Mar 04, 2021
+* Updated Artifactory version to 7.15.4 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.15.4)
+
+## [4.9.2] - Mar 04, 2021
+* Fixed creation of nginx-certificate-secret when Nginx is disabled
+
 ## [4.9.1] - Feb 19, 2021
 * Update busybox tag version to `1.32.1`
 

diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: artifactory-ha
 home: https://www.jfrog.com/artifactory/
-version: 4.9.1
-appVersion: 7.15.3
+version: 4.9.3
+appVersion: 7.15.4
 description: Universal Repository Manager supporting all major packaging formats,
   build tools and CI servers.
 keywords:

diff --git a/stable/artifactory-ha/templates/nginx-certificate-secret.yaml b/stable/artifactory-ha/templates/nginx-certificate-secret.yaml
@@ -1,4 +1,4 @@
-{{- if and (not .Values.nginx.tlsSecretName) .Values.nginx.https.enabled }}
+{{- if and (not .Values.nginx.tlsSecretName) .Values.nginx.enabled .Values.nginx.https.enabled }}
 apiVersion: v1
 kind: Secret
 type: kubernetes.io/tls

diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md
@@ -1,6 +1,12 @@
 # JFrog Artifactory Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [11.9.3] - Mar 04, 2021
+* Updated Artifactory version to 7.15.4 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.15.4)
+
+## [11.9.2] - Mar 04, 2021
+* Fixed creation of nginx-certificate-secret when Nginx is disabled
+
 ## [11.9.1] - Feb 19, 2021
 * Update busybox tag version to `1.32.1`
 

diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: artifactory
 home: https://www.jfrog.com/artifactory/
-version: 11.9.1
-appVersion: 7.15.3
+version: 11.9.3
+appVersion: 7.15.4
 description: Universal Repository Manager supporting all major packaging formats,
   build tools and CI servers.
 keywords:

diff --git a/stable/artifactory/templates/nginx-certificate-secret.yaml b/stable/artifactory/templates/nginx-certificate-secret.yaml
@@ -1,4 +1,4 @@
-{{- if and (not .Values.nginx.tlsSecretName) .Values.nginx.https.enabled }}
+{{- if and (not .Values.nginx.tlsSecretName) .Values.nginx.enabled .Values.nginx.https.enabled }}
 apiVersion: v1
 kind: Secret
 type: kubernetes.io/tls