From 554ca897a2bd0df3aa263cc441b8243905563aaf Mon Sep 17 00:00:00 2001
From: Ram <1331672+chukka@users.noreply.github.com>
Date: Sat, 1 Jul 2023 13:37:29 +0530
Subject: [PATCH] [xray] 3.76.7 release

---
 stable/xray/CHANGELOG.md            |  9 ++++++++-
 stable/xray/Chart.yaml              |  4 ++--
 stable/xray/templates/xray-hpa.yaml |  4 ++++
 stable/xray/values.yaml             | 10 +++++++---
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/stable/xray/CHANGELOG.md b/stable/xray/CHANGELOG.md
index 385f073ed..b38f3daee 100644
--- 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.75.12] - May 19, 2023
+## [103.76.7] - Jun 05, 2023
+* Set securePassword to false in a values yaml [GH-1763](https://github.com/jfrog/charts/pull/1763)
+* Upgraded to autoscaling/v2
+
+## [103.76.0] - May 24, 2023
+* Set Pod disruption budget to none by default if not set in `xray.minAvailable`
+
+## [103.75.0] - May 19, 2023
 * Fix lint issue when rabbitmq is disabled
 
 ## [103.74.0] - May 2, 2023
diff --git a/stable/xray/Chart.yaml b/stable/xray/Chart.yaml
index 6cc37ec69..484cce7bc 100644
--- a/stable/xray/Chart.yaml
+++ b/stable/xray/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 3.75.12
+appVersion: 3.76.7
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -24,4 +24,4 @@ name: xray
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 103.75.12
+version: 103.76.7
diff --git a/stable/xray/templates/xray-hpa.yaml b/stable/xray/templates/xray-hpa.yaml
index 3a65be825..6408b95d5 100644
--- a/stable/xray/templates/xray-hpa.yaml
+++ b/stable/xray/templates/xray-hpa.yaml
@@ -1,5 +1,9 @@
 {{- if .Values.autoscaling.enabled }}
+  {{- if semverCompare ">=v1.23.0-0" .Capabilities.KubeVersion.Version }}
+apiVersion: autoscaling/v2
+  {{- else }}
 apiVersion: autoscaling/v2beta2
+  {{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   labels:
diff --git a/stable/xray/values.yaml b/stable/xray/values.yaml
index ace7bc479..ad6b415be 100644
--- a/stable/xray/values.yaml
+++ b/stable/xray/values.yaml
@@ -78,7 +78,8 @@ xray:
   persistence:
     mountPath: /var/opt/jfrog/xray
   # adding minAvailable for Xray Pod Disruption Budget
-  minAvailable: 1
+  # minAvailable: 1
+
   # unifiedSecretInstallation flag enables single unified secret holding all xray secrets
   unifiedSecretInstallation: false
   ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
@@ -407,6 +408,9 @@ rabbitmq:
   auth:
     username: guest
     password: password
+    ## @param auth.securePassword Whether to set the RabbitMQ password securely. This is incompatible with loading external RabbitMQ definitions and 'true' when not setting the auth.password parameter.
+    ## ref: https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq#environment-variables
+    securePassword: false
     ## Alternatively, you can use a pre-existing secret with a key called rabbitmq-password by specifying existingPasswordSecret
     # existingPasswordSecret: <name-of-existing-secret>
     erlangCookie: XRAYRABBITMQCLUSTER
@@ -972,7 +976,7 @@ router:
   image:
     registry: releases-docker.jfrog.io
     repository: jfrog/router
-    tag: 7.67.0
+    tag: 7.70.1
     imagePullPolicy: IfNotPresent
   serviceRegistry:
     ## Service registry (Access) TLS verification skipped if enabled
@@ -1051,7 +1055,7 @@ observability:
   image:
     registry: releases-docker.jfrog.io
     repository: jfrog/observability
-    tag: 1.13.3
+    tag: 1.13.5
     imagePullPolicy: IfNotPresent
   internalPort: 8036
   resources: {}