[artifactory] Fix Nginx SSH (jfrog#972)

* Use a separate service for SSH * Add information about the new `artifactory.ssh.service` configuration to the README * Remove nginx `load_module` directive for the stream_module because it has now become a core nginx module. * Revert the separate nginx service * Add CHANGELOG.md entry about the Nginx load_module * Bump artifactory chart version * Fix Artifactory chart version and CHANGELOG.md
rahulnlb1 · Jun 25, 2020 · 8089899 · 8089899
1 parent 356dfd2
commit 8089899
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 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.
 
+## [2.5.8] - Jun 25, 2020
+* Stop loading the Nginx stream module because it is now a core module
+
 ## [2.5.7] - Jun 18, 2020
 * Fixes bootstrap configMap issue on member node
 

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

diff --git a/stable/artifactory-ha/values.yaml b/stable/artifactory-ha/values.yaml
@@ -1227,8 +1227,6 @@ nginx:
     pid        /tmp/nginx.pid;
 
     {{- if .Values.artifactory.ssh.enabled }}
-    # Load the stream module to support TCP streaming
-    load_module /usr/lib/nginx/modules/ngx_stream_module.so;
     ## SSH Server Configuration
     stream {
       server {

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.
 
+## [9.5.5] - Jun 25, 2020
+* Stop loading the Nginx stream module because it is now a core module
+
 ## [9.5.4] - Jun 25, 2020
 * Notes.txt update - add --namespace parameter
 

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

diff --git a/stable/artifactory/values.yaml b/stable/artifactory/values.yaml
@@ -878,8 +878,6 @@ nginx:
     pid        /tmp/nginx.pid;
 
     {{- if .Values.artifactory.ssh.enabled }}
-    # Load the stream module to support TCP streaming
-    load_module /usr/lib/nginx/modules/ngx_stream_module.so;
     ## SSH Server Configuration
     stream {
       server {