Merge branch 'jp-10.19.6' into patch-1

jfrog · Oct 8, 2024 · ae5a83f · ae5a83f
2 parents fc69833 + 18c141e
commit ae5a83f
Show file tree

Hide file tree

Showing 22 changed files with 45 additions and 37 deletions.
diff --git a/stable/artifactory-cpp-ce/CHANGELOG.md b/stable/artifactory-cpp-ce/CHANGELOG.md
@@ -1,7 +1,7 @@
 # JFrog Artifactory CE for C++ Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.90.10] - Feb 20, 2024
+## [107.90.14] - Feb 20, 2024
 * Updated `artifactory.installerInfo` content
 
 ## [107.80.0] - Feb 1, 2024

diff --git a/stable/artifactory-cpp-ce/Chart.yaml b/stable/artifactory-cpp-ce/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.90.10
+appVersion: 7.90.14
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.90.10
+  version: 107.90.14
 description: JFrog Artifactory CE for C++
 home: https://www.jfrog.com/artifactory/
 icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-cpp-ce/logo/conan.png
@@ -21,4 +21,4 @@ name: artifactory-cpp-ce
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.90.10
+version: 107.90.14
diff --git a/stable/artifactory-cpp-ce/values.yaml b/stable/artifactory-cpp-ce/values.yaml
@@ -69,7 +69,7 @@ postgresql:
   enabled: true
 router:
   image:
-    tag: 7.118.2
+    tag: 7.118.3
 initContainers:
   image:
     tag: 9.4.949.1716471857
diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md
@@ -1,7 +1,7 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [107.90.10] - July 18, 2024
+## [107.90.14] - July 18, 2024
 * Fixed #adding colon in image registry which breaks deployment [GH-1892](https://github.com/jfrog/charts/pull/1892)
 * Added new `nginx.hosts` to use Nginx server_name directive instead of `ingress.hosts`
 * Added a deprecation notice of ingress.hosts when `ngnix.enabled` is true

diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
@@ -1,7 +1,7 @@
 annotations:
-  artifactoryServiceVersion: 7.90.13
+  artifactoryServiceVersion: 7.90.20
 apiVersion: v2
-appVersion: 7.90.10
+appVersion: 7.90.14
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -23,4 +23,4 @@ name: artifactory-ha
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.90.10
+version: 107.90.14
diff --git a/stable/artifactory-ha/values.yaml b/stable/artifactory-ha/values.yaml
@@ -255,7 +255,7 @@ router:
   image:
     registry: releases-docker.jfrog.io
     repository: jfrog/router
-    tag: 7.118.2
+    tag: 7.118.3
     pullPolicy: IfNotPresent
   serviceRegistry:
     ## Service registry (Access) TLS verification skipped if enabled

diff --git a/stable/artifactory-jcr/CHANGELOG.md b/stable/artifactory-jcr/CHANGELOG.md
@@ -1,7 +1,7 @@
 # JFrog Container Registry Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [107.90.10] - Feb 20, 2024
+## [107.90.14] - Feb 20, 2024
 * Updated `artifactory.installerInfo` content
 
 ## [107.80.0] - Feb 1, 2024

diff --git a/stable/artifactory-jcr/Chart.yaml b/stable/artifactory-jcr/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.90.10
+appVersion: 7.90.14
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.90.10
+  version: 107.90.14
 description: JFrog Container Registry
 home: https://jfrog.com/container-registry/
 icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-jcr/logo/jcr-logo.png
@@ -22,4 +22,4 @@ name: artifactory-jcr
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.90.10
+version: 107.90.14
diff --git a/stable/artifactory-jcr/values.yaml b/stable/artifactory-jcr/values.yaml
@@ -69,7 +69,7 @@ postgresql:
   enabled: true
 router:
   image:
-    tag: 7.118.2
+    tag: 7.118.3
 initContainers:
   image:
     tag: 9.4.949.1716471857
diff --git a/stable/artifactory-oss/CHANGELOG.md b/stable/artifactory-oss/CHANGELOG.md
@@ -1,7 +1,7 @@
 # JFrog Artifactory OSS Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.90.10] - Feb 20, 2024
+## [107.90.14] - Feb 20, 2024
 * Updated `artifactory.installerInfo` content
 
 ## [107.80.0] - Feb 1, 2024

diff --git a/stable/artifactory-oss/Chart.yaml b/stable/artifactory-oss/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.90.10
+appVersion: 7.90.14
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.90.10
+  version: 107.90.14
 description: JFrog Artifactory OSS
 home: https://www.jfrog.com/artifactory/
 icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory/logo/artifactory-logo.png
@@ -20,4 +20,4 @@ name: artifactory-oss
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.90.10
+version: 107.90.14
diff --git a/stable/artifactory-oss/values.yaml b/stable/artifactory-oss/values.yaml
@@ -69,7 +69,7 @@ postgresql:
   enabled: true
 router:
   image:
-    tag: 7.118.2
+    tag: 7.118.3
 initContainers:
   image:
     tag: 9.4.949.1716471857
diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md
@@ -1,7 +1,7 @@
 # JFrog Artifactory Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [107.90.10] - July 18, 2024
+## [107.90.14] - July 18, 2024
 * Fixed #adding colon in image registry which breaks deployment [GH-1892](https://github.com/jfrog/charts/pull/1892)
 * Added new `nginx.hosts` to use Nginx server_name directive instead of `ingress.hosts`
 * Added a deprecation notice of ingress.hosts when `ngnix.enabled` is true

diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.90.10
+appVersion: 7.90.14
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -21,4 +21,4 @@ name: artifactory
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.90.10
+version: 107.90.14
diff --git a/stable/artifactory/values.yaml b/stable/artifactory/values.yaml
@@ -198,7 +198,7 @@ router:
   image:
     registry: releases-docker.jfrog.io
     repository: jfrog/router
-    tag: 7.118.2
+    tag: 7.118.3
     pullPolicy: IfNotPresent
   serviceRegistry:
     ## Service registry (Access) TLS verification skipped if enabled

diff --git a/stable/jfrog-platform/CHANGELOG.md b/stable/jfrog-platform/CHANGELOG.md
@@ -1,8 +1,11 @@
 # JFrog Platform Chart Changelog (GA releases only)
 All changes to this chart will be documented in this file.
 
-## [10.19.6] - Sep 13, 2024
-* Setup postgres script default on fourth argument if no CHART_NAME variable is defined.
+## [10.19.6] - Oct 8, 2024
+* Fixed typo to get fourth parameter for setupPostgres.sh [GH-1992](https://github.com/jfrog/charts/pull/1992)
+* Added `preUpgradeHook.tolerations`
+* Update dependency artifactory chart version to 107.90.14
+* Update dependency xray chart version to 103.104.17
 
 ## [10.19.5] - Sep 11, 2024
 * Update dependency artifactory chart version to 107.90.10

diff --git a/stable/jfrog-platform/Chart.lock b/stable/jfrog-platform/Chart.lock
@@ -7,10 +7,10 @@ dependencies:
   version: 11.9.3
 - name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.90.10
+  version: 107.90.14
 - name: xray
   repository: https://charts.jfrog.io/
-  version: 103.104.8
+  version: 103.104.17
 - name: distribution
   repository: https://charts.jfrog.io/
   version: 102.26.1
@@ -20,5 +20,5 @@ dependencies:
 - name: pipelines
   repository: https://charts.jfrog.io/
   version: 101.59.7
-digest: sha256:fb50efce66803cefab39d3efc0a32c0842b97703a8bec572453b2217a56d8934
-generated: "2024-09-11T16:49:29.381655+02:00"
+digest: sha256:a6071a02ef3029d1aba4ed221e61566dc2a098e2b4c6b85108b839d5fdf5d89a
+generated: "2024-10-08T17:20:56.179314+05:30"
diff --git a/stable/jfrog-platform/Chart.yaml b/stable/jfrog-platform/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.90.10
+appVersion: 7.90.14
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -12,11 +12,11 @@ dependencies:
 - condition: artifactory.enabled
   name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.90.10
+  version: 107.90.14
 - condition: xray.enabled
   name: xray
   repository: https://charts.jfrog.io/
-  version: 103.104.8
+  version: 103.104.17
 - condition: distribution.enabled
   name: distribution
   repository: https://charts.jfrog.io/

diff --git a/stable/jfrog-platform/templates/upgrade-hook.yaml b/stable/jfrog-platform/templates/upgrade-hook.yaml
@@ -165,5 +165,9 @@ spec:
                 {{- end }}
       restartPolicy: Never
       terminationGracePeriodSeconds: 10
+{{- with .Values.preUpgradeHook.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
 {{- end }}
 {{- end }}
diff --git a/stable/jfrog-platform/values.yaml b/stable/jfrog-platform/values.yaml
@@ -232,7 +232,7 @@ rabbitmq:
 artifactory:
   enabled: true
   unifiedUpgradeAllowed: true
-  installerInfo: '{"productId":"Helm_JFrogPlatform/{{ printf "10.19.5-%s" .Chart.AppVersion  }}","features":[{"featureId":"Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"},{"featureId":"Database/{{ .Values.database.type }}"},{"featureId":"Nginx_Enabled/{{ .Values.nginx.enabled }}"},{"featureId":"ArtifactoryPersistence_Type/{{ .Values.artifactory.persistence.type }}"},{"featureId":"SplitServicesToContainers_Enabled/{{ .Values.splitServicesToContainers }}"},{"featureId":"Filebeat_Enabled/{{ .Values.filebeat.enabled }}"},{"featureId":"ReplicaCount/{{ .Values.artifactory.replicaCount }}"}]}'
+  installerInfo: '{"productId":"Helm_JFrogPlatform/{{ printf "10.19.6-%s" .Chart.AppVersion  }}","features":[{"featureId":"Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"},{"featureId":"Database/{{ .Values.database.type }}"},{"featureId":"Nginx_Enabled/{{ .Values.nginx.enabled }}"},{"featureId":"ArtifactoryPersistence_Type/{{ .Values.artifactory.persistence.type }}"},{"featureId":"SplitServicesToContainers_Enabled/{{ .Values.splitServicesToContainers }}"},{"featureId":"Filebeat_Enabled/{{ .Values.filebeat.enabled }}"},{"featureId":"ReplicaCount/{{ .Values.artifactory.replicaCount }}"}]}'
   postgresql:
     enabled: false
   waitForDatabase: false
@@ -366,3 +366,4 @@ preUpgradeHook:
     limits:
       cpu: 1
       memory: 1Gi
+  tolerations: []
diff --git a/stable/xray/CHANGELOG.md b/stable/xray/CHANGELOG.md
@@ -1,7 +1,7 @@
 # JFrog Xray Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [103.104.8] - July 17, 2024
+## [103.104.17] - July 17, 2024
 * Added support of specifying resources constraints for RabbitMQ's pre-upgrade-hook job
 * Fixed formatting error associated to the `volumeMounts` for the `panoramic` microservice [GH-1895](https://github.com/jfrog/charts/issues/1895)
 

diff --git a/stable/xray/Chart.yaml b/stable/xray/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 3.104.8
+appVersion: 3.104.17
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -24,4 +24,4 @@ name: xray
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 103.104.8
+version: 103.104.17