Skip to content

Commit

Permalink
Fix for issue #293 (#313)
Browse files Browse the repository at this point in the history
  • Loading branch information
jainishshah17 authored and eldada committed Apr 17, 2019
1 parent a1cefa6 commit 2362664
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 8 deletions.
3 changes: 3 additions & 0 deletions stable/artifactory-ha/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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`

Expand Down
2 changes: 1 addition & 1 deletion stable/artifactory-ha/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
9 changes: 6 additions & 3 deletions stable/artifactory-ha/ReverseProxyConfiguration.md
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions stable/artifactory/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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`

Expand Down
2 changes: 1 addition & 1 deletion stable/artifactory/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
10 changes: 7 additions & 3 deletions stable/artifactory/ReverseProxyConfiguration.md
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 2362664

Please sign in to comment.