From 2362664624fb9b4f29a6eaee4bee341e740b20a7 Mon Sep 17 00:00:00 2001 From: Jainish Shah Date: Tue, 16 Apr 2019 22:26:49 -0700 Subject: [PATCH] Fix for issue #293 (#313) --- stable/artifactory-ha/CHANGELOG.md | 3 +++ stable/artifactory-ha/Chart.yaml | 2 +- stable/artifactory-ha/ReverseProxyConfiguration.md | 9 ++++++--- stable/artifactory/CHANGELOG.md | 3 +++ stable/artifactory/Chart.yaml | 2 +- stable/artifactory/ReverseProxyConfiguration.md | 10 +++++++--- 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md index a222662db..8ece08803 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. +## [0.12.17] - Apr 16, 2019 +* Updated documentation for Reverse Proxy Configuration + ## [0.12.16] - Apr 12, 2019 * Added support for `customVolumeMounts` diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml index d973315f4..d68bb2802 100644 --- 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: 0.12.16 +version: 0.12.17 appVersion: 6.9.1 description: Universal Repository Manager supporting all major packaging formats, build tools and CI servers. diff --git a/stable/artifactory-ha/ReverseProxyConfiguration.md b/stable/artifactory-ha/ReverseProxyConfiguration.md index 991a268b1..d8919f08e 100644 --- a/stable/artifactory-ha/ReverseProxyConfiguration.md +++ b/stable/artifactory-ha/ReverseProxyConfiguration.md @@ -30,10 +30,13 @@ the required configuration snippet which you can then download and install direc * Once configuration is saved Nginx will automatically fetch reverse proxy configuration snippet from Artifactory and apply it immediately. #### Steps to use static configuration for reverse proxy in nginx. -1. Create `artifactory-ha.conf` file with nginx configuration. More [nginx configuration examples](https://github.com/jfrog/artifactory-docker-examples/tree/master/files/nginx/conf.d) +1. Get Artifactory service name using this command `kubectl get svc -n $NAMESPACE` + +2. Create `artifactory-ha.conf` file with nginx configuration. More [nginx configuration examples](https://github.com/jfrog/artifactory-docker-examples/tree/master/files/nginx/conf.d) * Following is example `artifactory-ha.conf` ```bash ## add HA entries when ha is configure + ## Replace server names with Artifactory service names (primary and member service names) upstream artifactory { server artifactory-ha-artifactory-ha-primary:8081; server artifactory-ha:8081; @@ -78,11 +81,11 @@ the required configuration snippet which you can then download and install direc } ``` -2. Create configMap of `artifactory-ha.conf` created with step above. +3. Create configMap of `artifactory-ha.conf` created with step above. ```bash kubectl create configmap art-nginx-conf --from-file=artifactory-ha.conf ``` -3. Deploy Artifactory using helm chart with auto configuration update disabled in nginx. +4. Deploy Artifactory using helm chart with auto configuration update disabled in nginx. You can achieve it by setting value to `true` for `nginx.env.skipAutoConfigUpdate` and providing name of configMap created above to `nginx.customArtifactoryConfigMap` in [values.yaml](values.yaml) Which sets Environment Variable `SKIP_AUTO_UPDATE_CONFIG=true` in Nginx container. diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md index edf556d4f..97477897e 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. +## [7.13.15] - Apr 16, 2019 +* Updated documentation for Reverse Proxy Configuration + ## [7.13.14] - Apr 15, 2019 * Added support for `customVolumeMounts` diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml index ad1107b7e..4842cf100 100644 --- 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: 7.13.14 +version: 7.13.15 appVersion: 6.9.1 description: Universal Repository Manager supporting all major packaging formats, build tools and CI servers. diff --git a/stable/artifactory/ReverseProxyConfiguration.md b/stable/artifactory/ReverseProxyConfiguration.md index 36f10292f..fa077c824 100644 --- a/stable/artifactory/ReverseProxyConfiguration.md +++ b/stable/artifactory/ReverseProxyConfiguration.md @@ -30,8 +30,12 @@ the required configuration snippet which you can then download and install direc * Once configuration is saved Nginx will automatically fetch reverse proxy configuration snippet from Artifactory and apply it immediately. #### Steps to use static configuration for reverse proxy in nginx. -1. Create `artifactory.conf` file with nginx configuration. More [nginx configuration examples](https://github.com/jfrog/artifactory-docker-examples/tree/master/files/nginx/conf.d) +1. Get Artifactory service name using this command `kubectl get svc -n $NAMESPACE` + +2. Create `artifactory.conf` file with nginx configuration. More [nginx configuration examples](https://github.com/jfrog/artifactory-docker-examples/tree/master/files/nginx/conf.d) * Following is example `artifactory.conf` + + **Note**: Replace `artifactory-artifactory` with service name taken from step 1. ```bash ## add ssl entries when https has been set in config ssl_certificate /var/opt/jfrog/nginx/ssl/tls.crt; @@ -72,11 +76,11 @@ the required configuration snippet which you can then download and install direc } ``` -2. Create configMap of `artifactory.conf` created with step above. +3. Create configMap of `artifactory.conf` created with step above. ```bash kubectl create configmap art-nginx-conf --from-file=artifactory.conf ``` -3. Deploy Artifactory using helm chart with auto configuration update disabled in nginx. +4. Deploy Artifactory using helm chart with auto configuration update disabled in nginx. You can achieve it by setting value to `true` for `nginx.env.skipAutoConfigUpdate` and providing name of configMap created above to `nginx.customArtifactoryConfigMap` in [values.yaml](values.yaml) Which sets Environment Variable `SKIP_AUTO_UPDATE_CONFIG=true` in Nginx container.