Openshift xray helm rabbitmq-ha deprecation and operator v2.0.0

Openshift4/helm/openshift-xray/values.yaml

@@ -11,11 +11,13 @@ xray:
     url: "OVERRIDE"
     user: "OVERRIDE"
     password: "OVERRIDE"
-  initContainerImage: registry.connect.redhat.com/jfrog/init:1.0.1
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.12.8-0
   common:
+    rabbitmq:
+      connectionConfigFromEnvironment: true
     xrayUserId: "1000721035"
     xrayGroupId: "1000721035"
-    xrayVersion: "3.16.0-1"
+    xrayVersion: "3.17.4-1"
     customInitContainers: |
       - name: "prepare-uid-persistent-volume"
         image: "{{ .Values.initContainerImage }}"
@@ -69,13 +71,48 @@ xray:
       registry: registry.connect.redhat.com
       repository: jfrog/xray-router
       imagePullPolicy: IfNotPresent
-      tag: 3.16.0-1
+      tag: 3.17.4-1
   rabbitmq-ha:
+    enabled: false
+  # RabbitMQ
+  ## Configuration values for the rabbitmq dependency
+  ## ref: https://github.com/bitnami/charts/blob/master/bitnami/rabbitmq/README.md
+  rabbitmq:
     enabled: true
     replicaCount: 1
+    rbac:
+      create: true
+    image:
+      registry: registry.connect.redhat.com
+      repository: xray-rabbitmq
+      tag: 3.17.4-1
+    podSecurityContext:
+      fsGroup: 1000721001
+      runAsUser: 1000721001  
+    auth:
+      username: xray
+      password: xray
+      # existingPasswordSecret: name-of-existing-secret
+      ## Alternatively, you can use a pre-existing secret with a key called rabbitmq-password by specifying existingPasswordSecret
+      # existingPasswordSecret: <name-of-existing-secret>
+      erlangCookie: XRAYRABBITMQCLUSTER
+      # existingErlangSecret: <name-of-existing-secret>
+      ## Enable encryption to rabbitmq
+      ## ref: https://www.rabbitmq.com/ssl.html
+      ##
+      tls:
+        enabled: false
+        failIfNoPeerCert: true
+        sslOptionsVerify: verify_peer
+        #caCertificate: |-
+        #serverCertificate: |-
+        #serverKey: |-
+  rabbitmq-ha:
+    enabled: false
+    replicaCount: 1
     image:
       repository: registry.connect.redhat.com/jfrog/xray-rabbitmq
-      tag: 3.16.0-1
+      tag: 3.17.2-1
     rabbitmqEpmdPort: 4369
     rabbitmqNodePort: 5672
     rabbitmqManagerPort: 15672
@@ -108,4 +145,4 @@ xray:
         command:
           - /bin/sh
           - -c
-          - 'rabbitmqctl status'
+          - 'rabbitmqctl status'