Merge pull request jfrog#212 from jfrog/distribution-svc-whitelist

Add support for Distribution service loadBalancerSourceRanges
omerh1 · Feb 14, 2019 · f8c25e5 · f8c25e5
2 parents 5e44880 + 7c8d238
commit f8c25e5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/stable/distribution/CHANGELOG.md b/stable/distribution/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Distribution Chart Changelog
 All changes to this project chart be documented in this file.
 
+## [3.0.1] - Feb 14, 2019
+* Add support for `distribution.service.loadBalancerSourceRanges` to set whitelist on load balancer
+
 ## [3.0.0] - Feb 04, 2019
 * Join distribution, distributor and redis to a single pod
 * Distributor internal communication token generated and consumed automatically

diff --git a/stable/distribution/Chart.yaml b/stable/distribution/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: distribution
 description: A Helm chart for JFrog Distribution
-version: 3.0.0
+version: 3.0.1
 appVersion: 1.5.1
 home: https://jfrog.com/platform/
 icon: https://raw.githubusercontent.com/jfrog/artifactory-dcos/master/images/jfrog_med.png

diff --git a/stable/distribution/README.md b/stable/distribution/README.md
@@ -177,13 +177,14 @@ The following table lists the configurable parameters of the distribution chart
 | `redis.nodeSelector`                         | Redis node selector                        | `{}`                               |
 | `redis.affinity`                             | Redis node affinity                        | `{}`                               |
 | `redis.tolerations`                          | Redis node tolerations                     | `[]`                               |
-| `common.uid`                                 | Distribution and Distributor process user ID               | `1020`                             |
-| `common.gid`                                 | Distribution and Distributor process group ID              | `1020`                             |
+| `common.uid`                                 | Distribution and Distributor process user ID               | `1020`             |
+| `common.gid`                                 | Distribution and Distributor process group ID              | `1020`             |
 | `distribution.name`                          | Distribution name                          | `distribution`                     |
 | `distribution.image.pullPolicy`              | Container pull policy                      | `IfNotPresent`                     |
 | `distribution.image.repository`              | Container image                            | `docker.jfrog.io/jf-distribution`  |
 | `distribution.image.version`                 | Container image tag                        | `.Chart.AppVersion`                |
 | `distribution.service.type`                  | Distribution service type                  | `LoadBalancer`                     |
+| `distribution.service.loadBalancerSourceRanges`  | Distribution service whitelist         | `[]`                               |
 | `distribution.customInitContainers`          | Custom init containers for Distribution    |                                    |
 | `distribution.externalPort`                  | Distribution service external port         | `80`                               |
 | `distribution.internalPort`                  | Distribution service internal port         | `8080`                             |

diff --git a/stable/distribution/templates/distribution-svc.yaml b/stable/distribution/templates/distribution-svc.yaml
@@ -13,6 +13,10 @@ metadata:
 {{- end }}
 spec:
   type: {{ .Values.distribution.service.type }}
+{{- if .Values.distribution.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+{{ toYaml .Values.distribution.service.loadBalancerSourceRanges | indent 4 }}
+{{- end }}
   ports:
   - name: distribution
     port: {{ .Values.distribution.externalPort }}

diff --git a/stable/distribution/values.yaml b/stable/distribution/values.yaml
@@ -167,6 +167,9 @@ distribution:
     artifactoryEdge3Url:
   service:
     type: LoadBalancer
+    # Whitelist IPs allowed to LoadBalancer type services
+    # Example: loadBalancerSourceRanges={82.82.190.51/32,141.141.8.8/32}
+    loadBalancerSourceRanges: []
 
   ## Add custom init containers
   customInitContainers: |