[xray] 3.111.9 release

jfrog · Jan 30, 2025 · c277c35 · c277c35
1 parent bb4e693
commit c277c35
Show file tree

Hide file tree

Showing 21 changed files with 217 additions and 162 deletions.
diff --git a/stable/xray/CHANGELOG.md b/stable/xray/CHANGELOG.md
@@ -1,8 +1,12 @@
 # JFrog Xray Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [103.107.21] - November 27, 2024
-* Added support to read rabbitmq and database secrets from mounted secret files
+## [103.111.9] - Jan 15, 2025
+* Fix an issue with a warning in the rabbitmq password check
+* Updated rabbitmq multi-arch tag version to to `3.13.7-debian-12-r5`
+* Updated bitnami kubectl multi-arch tag version to to `1.32.0`
+
+## [103.109.0] - Nov 27, 2024
 * **Important changes**
 * Upgrade rabbitmq chart version to 14.6.6
 * Added catalog as a dependency chart
@@ -13,6 +17,14 @@ All changes to this chart will be documented in this file.
     * if you have customised any keys, make sure to validate it with the 15.5.20 chart
     * Delete the postgresql statefulset and postgresql secret before the upgrade. for more information, please refer the [xray upgrade docs](https://jfrog.com/help/r/jfrog-installation-setup-documentation/upgrading-xray)
 
+## [103.108.0] - Nov 11, 2024
+* Introduced a validation check in the template to warn users against using the default RabbitMQ password. If a default password is found, the installation will be paused, prompting users to update their credentials before proceeding.
+* Fix for panoramic env indentation [GH-1919](https://github.com/jfrog/charts/pull/1919)
+* Added memory metric targetMemoryUtilizationPercentage to Xray Horizontal Pod Scaler
+
+## [103.107.0] - 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`

diff --git a/stable/xray/Chart.lock b/stable/xray/Chart.lock
@@ -7,6 +7,6 @@ dependencies:
   version: 14.6.6
 - name: catalog
   repository: https://charts.jfrog.io/
-  version: 101.7.3
-digest: sha256:64d23e13fb197b92e3c3dfe7497a933c87656b575182485b4d28ca8a0b5967ca
-generated: "2024-12-02T15:25:33.588122+05:30"
+  version: 101.10.0
+digest: sha256:f5128e32fcfd3e3e9e163779bba2e576c24709ac38f7d58ce3217c114a4ca4c8
+generated: "2025-01-08T14:54:51.409033+05:30"
diff --git a/stable/xray/Chart.yaml b/stable/xray/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 3.107.21
+appVersion: 3.111.9
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -12,7 +12,7 @@ dependencies:
 - condition: catalog.enabled
   name: catalog
   repository: https://charts.jfrog.io/
-  version: 101.7.3
+  version: 101.10.0
 description: Universal component scan for security and license inventory and impact
   analysis
 home: https://www.jfrog.com/xray/
@@ -28,4 +28,4 @@ name: xray
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 103.107.21
+version: 103.111.9
diff --git a/stable/xray/ci/default-values.yaml b/stable/xray/ci/default-values.yaml
@@ -19,7 +19,7 @@ postgresql:
 rabbitmq:
   auth:
     username: guest
-    password: password
+    password: rabbitmqpass
   persistence:
     enabled: false
 
@@ -81,7 +81,6 @@ panoramic:
 
 
 policyenforcer:
-  enabled: false
   resources:
     requests:
       memory: "300Mi"

diff --git a/stable/xray/files/system.yaml b/stable/xray/files/system.yaml
@@ -67,10 +67,6 @@ server:
     migrate_msgs_from_other_rabbitmq: {{ toYaml .Values.global.xray.rabbitmq.migrateMessagesFromOtherRabbitMq | nindent 6 }}
   {{- end }}
 {{- end }}
-{{- if .Values.policyenforcer.enabled }}
-policyenforcer:
-  enabled: true
-{{- end }}
 {{- if (include "xray.imagePullSecretsStrList" .) }}
 executionService:
   pullSecret:

diff --git a/stable/xray/sizing/xray-2xlarge.yaml b/stable/xray/sizing/xray-2xlarge.yaml
@@ -76,7 +76,7 @@ observability:
       memory: 250Mi
 
 panoramic:
-  enabled: true
+  enabled: false
   resources:
     requests:
       cpu: "100m"

diff --git a/stable/xray/sizing/xray-large.yaml b/stable/xray/sizing/xray-large.yaml
@@ -76,7 +76,7 @@ observability:
       memory: 250Mi
 
 panoramic:
-  enabled: true
+  enabled: false
   resources:
     requests:
       cpu: "100m"

diff --git a/stable/xray/sizing/xray-medium.yaml b/stable/xray/sizing/xray-medium.yaml
@@ -76,7 +76,7 @@ observability:
       memory: 250Mi
 
 panoramic:
-  enabled: true
+  enabled: false
   resources:
     requests:
       cpu: "100m"

diff --git a/stable/xray/sizing/xray-small.yaml b/stable/xray/sizing/xray-small.yaml
@@ -76,7 +76,7 @@ observability:
       memory: 250Mi
 
 panoramic:
-  enabled: true
+  enabled: false
   resources:
     requests:
       cpu: "100m"

diff --git a/stable/xray/sizing/xray-xlarge.yaml b/stable/xray/sizing/xray-xlarge.yaml
@@ -76,7 +76,7 @@ observability:
       memory: 250Mi
 
 panoramic:
-  enabled: true
+  enabled: false
   resources:
     requests:
       cpu: "100m"

diff --git a/stable/xray/sizing/xray-xsmall.yaml b/stable/xray/sizing/xray-xsmall.yaml
@@ -76,7 +76,7 @@ observability:
       memory: 250Mi
 
 panoramic:
-  enabled: true
+  enabled: false
   resources:
     requests:
       cpu: "30m"

diff --git a/stable/xray/templates/_helpers.tpl b/stable/xray/templates/_helpers.tpl
@@ -449,7 +449,7 @@ Return the proper xray chart image names
 {{- $registryName := index $dot.Values $indexReference "image" "registry" -}}
 {{- $repositoryName := index $dot.Values $indexReference "image" "repository" -}}
 {{- $tag := default $dot.Chart.AppVersion (index $dot.Values $indexReference "image" "tag") | toString -}}
-{{- if and $dot.Values.common.xrayVersion (or (eq $indexReference "persist") (eq $indexReference "server") (eq $indexReference "analysis") (eq $indexReference "sbom") (eq $indexReference "indexer") (eq $indexReference "panoramic")) }}
+{{- if and $dot.Values.common.xrayVersion (or (eq $indexReference "persist") (eq $indexReference "server") (eq $indexReference "analysis") (eq $indexReference "sbom") (eq $indexReference "indexer") (eq $indexReference "policyenforcer") (eq $indexReference "panoramic")) }}
 {{- $tag = $dot.Values.common.xrayVersion | toString -}}
 {{- end -}}
 {{- if $dot.Values.global }}
@@ -459,7 +459,7 @@ Return the proper xray chart image names
     {{- if and $dot.Values.global.versions.initContainers (eq $indexReference "initContainers") }}
     {{- $tag = $dot.Values.global.versions.initContainers | toString -}}
     {{- end -}}
-    {{- if and $dot.Values.global.versions.xray (or (eq $indexReference "persist") (eq $indexReference "server") (eq $indexReference "analysis") (eq $indexReference "sbom") (eq $indexReference "indexer") (eq $indexReference "panoramic")) }}
+    {{- if and $dot.Values.global.versions.xray (or (eq $indexReference "persist") (eq $indexReference "server") (eq $indexReference "analysis") (eq $indexReference "sbom") (eq $indexReference "indexer") (eq $indexReference "policyenforcer") (eq $indexReference "panoramic")) }}
     {{- $tag = $dot.Values.global.versions.xray | toString -}}
     {{- end -}}
     {{- if $dot.Values.global.imageRegistry }}
@@ -526,15 +526,15 @@ for file in $(ls * | grep -v ":" | grep -v grep); do if [ -f "${file}" ]; then c
 Resolve xray requiredServiceTypes value
 */}}
 {{- define "xray.router.requiredServiceTypes" -}}
-{{- $requiredTypes := "jfxr,jfxana,jfxidx,jfxpst,jfob" -}}
+{{- $requiredTypes := "jfxr,jfxana,jfxidx,jfxpst,jfxpe,jfob" -}}
 {{- $requiredTypes -}}
 {{- end -}}
 
 {{/*
 Resolve xray ipa requiredServiceTypes value
 */}}
 {{- define "xray.router.ipa.requiredServiceTypes" -}}
-{{- $requiredTypes := "jfxana,jfxidx,jfxpst,jfob" -}}
+{{- $requiredTypes := "jfxana,jfxidx,jfxpst,jfxpe,jfob" -}}
 {{- $requiredTypes -}}
 {{- end -}}
 
@@ -624,6 +624,9 @@ Resolve autoscalingQueues value for ipa
     queueName: {{ .name }}
     mode: QueueLength
     value: "{{ .value }}"
+{{- if $.Values.global.xray.rabbitmq.haQuorum.enabled }}
+    vhostName: "{{ $.Values.global.xray.rabbitmq.haQuorum.vhost }}"
+{{- end }}
   authenticationRef:
     name: keda-trigger-auth-rabbitmq-conn-xray
 {{- end }}
@@ -643,6 +646,9 @@ Resolve autoscalingQueues value for server
     queueName: {{ .name }}
     mode: QueueLength
     value: "{{ .value }}"
+{{- if $.Values.global.xray.rabbitmq.haQuorum.enabled }}
+    vhostName: "{{ $.Values.global.xray.rabbitmq.haQuorum.vhost }}"
+{{- end }}
   authenticationRef:
     name: keda-trigger-auth-rabbitmq-conn-xray
 {{- end }}

diff --git a/stable/xray/templates/keys-warnings.yaml b/stable/xray/templates/keys-warnings.yaml
@@ -1,3 +1,7 @@
+{{- if and (not .Release.IsUpgrade) (eq .Values.rabbitmq.auth.password "password") .Values.rabbitmq.enabled }}
+{{- fail "\n\n**************************************\nSTOP! INSTALLATION not allowed with the default RabbitMQ password!\nPlease change the RabbitMQ password from the default value before proceeding with the installation.\n**************************************\n" }}
+{{- end }}
+
 {{- if .Values.postgresql.enabled }}
     {{- if .Values.postgresql.postgresqlPassword  }}
         {{- fail "\n\nThe key 'postgresql.postgresqlPassword' is not supported in the latest packaged version of Postgres in this chart.\nUse the new key 'postgresql.auth.postgresPassword' to proceed with installation.\n" }}

diff --git a/stable/xray/templates/xray-hpa.yaml b/stable/xray/templates/xray-hpa.yaml
@@ -27,5 +27,11 @@ spec:
         target:
           type: Utilization
           averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
 {{- end }}
 {{- end }}