[xray] 3.83.9 release

jfrog · Oct 17, 2023 · 5264718 · 5264718
1 parent f3db985
commit 5264718
Show file tree

Hide file tree

Showing 6 changed files with 230 additions and 127 deletions.
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 }}