[xray] 3.107.11 release

jfrog · Nov 26, 2024 · 22da377 · 22da377
1 parent 9702937
commit 22da377
Show file tree

Hide file tree

Showing 10 changed files with 223 additions and 413 deletions.
diff --git a/stable/xray/CHANGELOG.md b/stable/xray/CHANGELOG.md
@@ -1,7 +1,14 @@
 # JFrog Xray Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [103.104.18] - July 17, 2024
+## [103.107.11] - September 26, 2024
+* Added support to read rabbitmq and database secrets from mounted secret files
+
+## [103.105.0] - August 22, 2024
+* Added support for `serviceAccount.annotations`to be passed to chart [GH-1841](https://github.com/jfrog/charts/pull/1841)
+* Updated rabbitmq multi-arch tag version to to `3.13.6-debian-12-r1`
+
+## [103.102.0] - 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.18
+appVersion: 3.107.11
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -24,4 +24,4 @@ name: xray
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 103.104.18
+version: 103.107.11
diff --git a/stable/xray/files/system.yaml b/stable/xray/files/system.yaml
@@ -82,4 +82,9 @@ contextualAnalysis:
 exposures:
   container:
     registry: {{ include "xray.getRegistryByService" (list . "exposures") }}
-    image: {{ .Values.exposures.image.repository }}
+    image: {{ .Values.exposures.image.repository }}
+{{- if .Values.jas.healthcheck.enabled }}
+jas:
+  healthCheckApi:
+    enabled: true
+{{- end }}
diff --git a/stable/xray/templates/_helpers.tpl b/stable/xray/templates/_helpers.tpl
@@ -693,6 +693,26 @@ Set xray env variables if rabbitmq.tls is enabled.
 {{- end }}
 {{- end -}}
 
+{{- define "xray.resolveUsedMasterKeySecretName" -}}
+{{- if or .Values.xray.masterKey .Values.xray.masterKeySecretName .Values.global.masterKey .Values.global.masterKeySecretName -}}
+{{- if or (not .Values.xray.unifiedSecretInstallation) (or .Values.xray.masterKeySecretName .Values.global.masterKeySecretName) -}}
+{{- include "xray.masterKeySecretName" . -}}
+{{- else -}}
+{{ template "xray.name" . }}-unified-secret
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "xray.resolveUsedJoinKeySecretName" -}}
+{{- if or .Values.xray.joinKey .Values.xray.joinKeySecretName .Values.global.joinKey .Values.global.joinKeySecretName -}}
+{{- if or (not .Values.xray.unifiedSecretInstallation) (or .Values.xray.joinKeySecretName .Values.global.joinKeySecretName) -}}
+{{- include "xray.joinKeySecretName" . -}}
+{{- else -}}
+{{ template "xray.name" . }}-unified-secret
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
 {{- define "xray.envVariables" }}
 - name: XRAY_CHART_FULL_NAME
   value: '{{ include "xray.fullname" . }}'
@@ -704,6 +724,10 @@ Set xray env variables if rabbitmq.tls is enabled.
   value: "{{ .Values.systemYamlOverride.existingSecret }}"
 - name: XRAY_CHART_SYSTEM_YAML_OVERRIDE_DATA_KEY
   value: "{{ .Values.systemYamlOverride.dataKey }}"
+- name: XRAY_CHART_MASTER_KEY_SECRET_NAME
+  value: '{{ include "xray.resolveUsedMasterKeySecretName" . }}'
+- name: XRAY_CHART_JOIN_KEY_SECRET_NAME
+  value: '{{ include "xray.resolveUsedJoinKeySecretName" . }}'
 {{- end }}
 
 {{/*

diff --git a/stable/xray/templates/migration-hook.yaml b/stable/xray/templates/migration-hook.yaml
@@ -16,6 +16,9 @@ metadata:
     annotations:
         helm.sh/hook: "pre-upgrade"
         helm.sh/hook-weight: "-10"
+{{- with .Values.rabbitmq.migration.serviceAccount.annotations }}
+{{ toYaml . | indent 8 }}
+{{- end }}
 automountServiceAccountToken: {{ .Values.rabbitmq.migration.serviceAccount.automountServiceAccountToken }}
 {{- end }}
 {{- end }}