Merge branch 'master' of https://github.com/jfrog/charts into mission…

…-control-3.2.0 # Conflicts: # stable/mission-control/Chart.yaml # stable/mission-control/values.yaml
omerh1 · Oct 17, 2018 · 0626a8d · 0626a8d
2 parents 7227d33 + b7f1541
commit 0626a8d
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 11 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.
 
+## [1.1.0] - Oct 14, 2018
+* Upgrade MongoDB version (chart 4.3.10, app 3.6.8-debian-9)
+
 ## [1.0.6] - Oct 11, 2018
 * Update Distribution version 1.3.0
 

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: 1.0.6
+version: 1.1.0
 appVersion: 1.3.0
 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
@@ -122,7 +122,7 @@ The following table lists the configurable parameters of the distribution chart
 | `ingress.hosts`                              | distribution Ingress hostnames                | `[]`                            |
 | `ingress.tls`                                | distribution Ingress TLS configuration (YAML) | `[]`                            |
 | `mongodb.enabled`                            | Enable Mongodb                             | `true`                             |
-| `mongodb.image.tag`                          | Mongodb docker image tag                   | `3.6.3`                            |
+| `mongodb.image.tag`                          | Mongodb docker image tag                   | `3.6.8-debian-9`                   |
 | `mongodb.image.pullPolicy`                   | Mongodb Container pull policy              | `IfNotPresent`                     |
 | `mongodb.persistence.enabled`                | Mongodb persistence volume enabled         | `true`                             |
 | `mongodb.persistence.existingClaim`          | Mongodb use an existing PVC to persist data        | `nil`                      |

diff --git a/stable/distribution/requirements.lock b/stable/distribution/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: mongodb
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 2.0.5
-digest: sha256:600cf841b87376e59e6cac1b4c1bc667edeadfc6392b2e07404c173f756433ed
-generated: 2018-09-07T11:50:59.515948345+03:00
+  version: 4.3.10
+digest: sha256:4b73e049c22266044d5ac107752a71e7462fd6df8cd3954ffaa8ddca0e9848d0
+generated: 2018-10-14T16:26:46.724574227+03:00
diff --git a/stable/distribution/requirements.yaml b/stable/distribution/requirements.yaml
@@ -1,5 +1,5 @@
 dependencies:
 - name: mongodb
-  version: 2.0.5
+  version: 4.3.10
   repository: https://kubernetes-charts.storage.googleapis.com/
-  condition: mongodb.enabled
+  condition: mongodb.enabled
diff --git a/stable/distribution/values.yaml b/stable/distribution/values.yaml
@@ -60,7 +60,7 @@ ingress:
 mongodb:
   enabled: true
   image:
-    tag: 3.6.3
+    tag: 3.6.8-debian-9
     pullPolicy: IfNotPresent
   port: 27017
   persistence:

diff --git a/stable/xray/CHANGELOG.md b/stable/xray/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Xray Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [0.6.2] - Oct 16, 2018
+* Updated Xray version to 2.4.1
+
 ## [0.6.1] - Oct 11, 2018
 * Allows ingress default `backend` to be enabled or disabled (defaults to enabled)
 * Allows rabbitmq to be used instead of rabbitmq-ha by settings rabbitmq-ha.enabled: false and rabbitmq.enabled: true

diff --git a/stable/xray/Chart.yaml b/stable/xray/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: xray
-version: 0.6.1
-appVersion: 2.4.0
+version: 0.6.2
+appVersion: 2.4.1
 home: https://www.jfrog.com/xray/
 description: Universal component scan for security and license inventory and impact analysis
 keywords:

diff --git a/stable/xray/values.yaml b/stable/xray/values.yaml
@@ -170,7 +170,7 @@ rabbitmq:
 # Common Xray settings
 common:
   ## Note that by default we use appVersion to get image tag
-  # xrayVersion: 2.4.0
+  # xrayVersion:
   xrayConfigPath: /var/opt/jfrog/xray/data
   xrayUserId: 1035
   xrayGroupId: 1035