Merge pull request #1830 from jfrog/jp-10.15.3

[jfrog-platform] 10.15.3 release
jfrog · Oct 17, 2023 · 8d78a4f · 8d78a4f
2 parents 13dffae + b3c16ef
commit 8d78a4f
Show file tree

Hide file tree

Showing 22 changed files with 270 additions and 161 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.68.11] - Jul 20, 2023
+## [107.68.14] - Jul 20, 2023
 * Disabled federation services when splitServicesToContainers=true
 
 ## [107.45.0] - Aug 25, 2022

diff --git a/stable/artifactory-cpp-ce/Chart.yaml b/stable/artifactory-cpp-ce/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.68.11
+appVersion: 7.68.14
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.68.11
+  version: 107.68.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.68.11
+version: 107.68.14
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.68.11] - Sep 20, 2023
+## [107.68.14] - Sep 20, 2023
 * Fixed rtfs context
 * Fixed - Metadata service does not respect customVolumeMounts for DB CAs [GH-1815](https://github.com/jfrog/charts/issues/1815)
 

diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.68.11
+appVersion: 7.68.14
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -21,4 +21,4 @@ name: artifactory-ha
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.68.11
+version: 107.68.14
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.68.11] - Jul 20, 2023
+## [107.68.14] - Jul 20, 2023
 * Disabled federation services when splitServicesToContainers=true
 
 ## [107.45.0] - Aug 25, 2022

diff --git a/stable/artifactory-jcr/Chart.yaml b/stable/artifactory-jcr/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.68.11
+appVersion: 7.68.14
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.68.11
+  version: 107.68.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.68.11
+version: 107.68.14
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.68.11] - Jul 20, 2023
+## [107.68.14] - Jul 20, 2023
 * Disabled federation services when splitServicesToContainers=true
 
 ## [107.45.0] - Aug 25, 2022

diff --git a/stable/artifactory-oss/Chart.yaml b/stable/artifactory-oss/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.68.11
+appVersion: 7.68.14
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.68.11
+  version: 107.68.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.68.11
+version: 107.68.14
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.68.11] - Sep 20, 2023
+## [107.68.14] - Sep 20, 2023
 * Fixed rtfs context
 * Fixed - Metadata service does not respect customVolumeMounts for DB CAs [GH-1815](https://github.com/jfrog/charts/issues/1815)
 

diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.68.11
+appVersion: 7.68.14
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -21,4 +21,4 @@ name: artifactory
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.68.11
+version: 107.68.14
diff --git a/stable/distribution/CHANGELOG.md b/stable/distribution/CHANGELOG.md
@@ -1,7 +1,7 @@
 # JFrog Distribution Chart Changelog
 All changes to this project chart be documented in this file.
 
-## [102.20.2] - Aug 29, 2023
+## [102.20.3] - Aug 29, 2023
 * Updated redis version tag to `7.2.0-debian-11-r2`
 * Enabled `unifiedSecretInstallation` by default
 

diff --git a/stable/distribution/Chart.yaml b/stable/distribution/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 2.20.2
+appVersion: 2.20.3
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -19,4 +19,4 @@ name: distribution
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 102.20.2
+version: 102.20.3
diff --git a/stable/jfrog-platform/CHANGELOG.md b/stable/jfrog-platform/CHANGELOG.md
@@ -1,6 +1,12 @@
 # JFrog Platform Chart Changelog (GA releases only)
 All changes to this chart will be documented in this file.
 
+## [10.15.3] - Oct 16, 2023
+* Update dependency artifactory chart version to 107.68.14
+* Update dependency xray chart version to 103.83.9
+* Update dependency distribution chart version to 102.20.3
+* Update dependency pipelines chart version to 101.44.5
+
 ## [10.15.2] - Sep 28, 2023
 * Update dependency artifactory chart version to 107.68.11
 * Update dependency xray chart version to 103.82.11

diff --git a/stable/jfrog-platform/Chart.lock b/stable/jfrog-platform/Chart.lock
@@ -10,18 +10,18 @@ dependencies:
   version: 12.10.1
 - name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.68.11
+  version: 107.68.14
 - name: xray
   repository: https://charts.jfrog.io/
-  version: 103.82.11
+  version: 103.83.9
 - name: distribution
   repository: https://charts.jfrog.io/
-  version: 102.20.2
+  version: 102.20.3
 - name: insight
   repository: https://charts.jfrog.io/
   version: 101.15.4
 - name: pipelines
   repository: https://charts.jfrog.io/
-  version: 101.43.2
-digest: sha256:44905adc601fc4e279ccefd75e57f7f57475c810da9114b339827a7cb0cc2d7b
-generated: "2023-09-28T08:26:41.419588+05:30"
+  version: 101.44.5
+digest: sha256:5a7e847fd17da2d2b9eaf0bfa4ff6fe43b00ccf51a7d57b163316520117c7cd7
+generated: "2023-10-16T09:20:21.037251+05:30"
diff --git a/stable/jfrog-platform/Chart.yaml b/stable/jfrog-platform/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.68.11
+appVersion: 7.68.14
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -16,23 +16,23 @@ dependencies:
 - condition: artifactory.enabled
   name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.68.11
+  version: 107.68.14
 - condition: xray.enabled
   name: xray
   repository: https://charts.jfrog.io/
-  version: 103.82.11
+  version: 103.83.9
 - condition: distribution.enabled
   name: distribution
   repository: https://charts.jfrog.io/
-  version: 102.20.2
+  version: 102.20.3
 - condition: insight.enabled
   name: insight
   repository: https://charts.jfrog.io/
   version: 101.15.4
 - condition: pipelines.enabled
   name: pipelines
   repository: https://charts.jfrog.io/
-  version: 101.43.2
+  version: 101.44.5
 description: The Helm chart for JFrog Platform (Universal, hybrid, end-to-end DevOps
   automation)
 home: https://jfrog.com/platform/
@@ -55,4 +55,4 @@ name: jfrog-platform
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 10.15.2
+version: 10.15.3
diff --git a/stable/jfrog-platform/values.yaml b/stable/jfrog-platform/values.yaml
@@ -224,7 +224,7 @@ redis:
 artifactory:
   enabled: true
   unifiedUpgradeAllowed: true
-  installerInfo: '{"productId": "Helm_JFrogPlatform/{{ printf "10.15.2-%s" .Chart.AppVersion  }}", "features": [ { "featureId": "Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"}]}'
+  installerInfo: '{"productId": "Helm_JFrogPlatform/{{ printf "10.15.3-%s" .Chart.AppVersion  }}", "features": [ { "featureId": "Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"}]}'
   postgresql:
     enabled: false
   waitForDatabase: false

diff --git a/stable/xray/CHANGELOG.md b/stable/xray/CHANGELOG.md
@@ -1,7 +1,10 @@
 # JFrog Xray Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [103.82.11] - Jul 16, 2023
+## [103.83.9] - Sep 15,2023
+* Fixed - Support to configure privateRegistry for pre-upgrade-hook
+
+## [103.80.0] - Jul 16, 2023
 * Added `podSecurityContext.enabled` and `containerSecurityContext.enabled` to support openshift
 
 ## [103.79.0] - Jul 3, 2023

diff --git a/stable/xray/Chart.yaml b/stable/xray/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 3.82.11
+appVersion: 3.83.9
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -24,4 +24,4 @@ name: xray
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 103.82.11
+version: 103.83.9
diff --git a/stable/xray/logo/xray-logo.png b/stable/xray/logo/xray-logo.png
diff --git a/stable/xray/templates/_helpers.tpl b/stable/xray/templates/_helpers.tpl
@@ -461,7 +461,11 @@ Return the registry of a service
 {{- if $dot.Values.global.imageRegistry }}
     {{- $dot.Values.global.imageRegistry }}
 {{- else -}}
-    {{- index $dot.Values $service "image" "registry" -}}
+    {{- if (eq $service "migrationHook") -}}
+      {{- index $dot.Values.rabbitmq.migration.image.registry -}}
+   {{- else -}}
+      {{- index $dot.Values $service "image" "registry" -}}
+    {{- end -}}
 {{- end -}}
 {{- end -}}
 

diff --git a/stable/xray/templates/migration-hook.yaml b/stable/xray/templates/migration-hook.yaml
@@ -86,10 +86,13 @@ spec:
   {{- if .Values.rabbitmq.podSecurityContext.enabled }}
   securityContext: {{- omit .Values.rabbitmq.podSecurityContext "enabled" | toYaml | nindent 4 }}
   {{- end }}
+  {{- if or .Values.imagePullSecrets .Values.global.imagePullSecrets }}
+  {{- include "xray.imagePullSecrets" . | indent 2 }}
+  {{- end }}
   serviceAccountName: {{ template "xray.rabbitmq.migration.serviceAccountName" . }}
   containers:
     - name: pre-upgrade-container
-      image: releases-docker.jfrog.io/bitnami/kubectl:1.24.12
+      image: "{{ include "xray.getRegistryByService" (list . "migrationHook") }}/{{ .Values.rabbitmq.migration.image.repository }}:{{ .Values.rabbitmq.migration.image.tag }}"
       imagePullPolicy: IfNotPresent
       {{- if .Values.rabbitmq.containerSecurityContext.enabled }}
       securityContext: {{- omit .Values.rabbitmq.containerSecurityContext "enabled" | toYaml | nindent 8 }}