Openshift Xray Helm and relocated to helm or operator folder

Openshift4/helm/openshift-pipelines/values.yaml

@@ -871,14 +871,15 @@ pipelines:
     #  registry: registry.connect.redhat.com
     #  repository: jfrog/xray-rabbitmq
     #  tag: 3.8.6
-    #image:
-    #  registry: quay.io
-    #  repository: jfrog/rabbitmq
-    #  tag: 3.8.3
+    image:
+      registry: quay.io
+      repository: jfrog/rabbitmq
+      tag: 3.9.1
 
+    # DO NOT CHANGE CUSTOM INIT USER
     rabbitmq:
-      username: admin
-      password: ""
+      username: user
+      password: bitnami
 
       ## Erlang cookie to determine whether different nodes are allowed to communicate with each other
       erlangCookie: PIPELINESRABBITMQCLUSTER

Openshift4/helm/openshift-xray/CHANGELOG.md

@@ -1,6 +1,9 @@
 # JFrog  Openshift Artifactory-Xray Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [6.0.6] Oct 1st, 2020
+* Updating to Xray chart version 6.0.6 and Xray app version 3.8.8
+
 ## [4.2.0] Aug 17, 2020
 * Updating to Xray chart version 4.2.0 and Xray app version 3.8.0
 

Openshift4/helm/openshift-xray/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 3.8.0
+appVersion: 3.8.8
 description: Universal component scan for security and license inventory and impact analysis
 sources:
 - https://bintray.com/jfrog/product/xray/view
@@ -13,4 +13,4 @@ maintainers:
 - email: johnp@jfrog.com
   name: John Peterson
 name: openshift-xray
-version: 4.2.0
+version: 6.0.6

Openshift4/helm/openshift-xray/helminstall.sh

@@ -57,7 +57,10 @@ fi
 JFROGURL=""
 if [[ -z "$4" ]]
 then
-  JFROGURL="http://openshiftartifactoryha-nginx"
+  # HELM
+  JFROGURL="http://artifactory-ha-nginx"
+  # OPERATOR
+  # JFROGURL="http://openshiftartifactoryha-nginx"
 else
   JFROGURL=$4
 fi
@@ -68,4 +71,6 @@ helm install xray . \
                --set xray.database.url=$DBURL \
                --set xray.database.user=$DBUSER \
                --set xray.database.password=$DBPASS \
-               --set xray.xray.jfrogUrl=$JFROGURL
+               --set xray.xray.jfrogUrl=$JFROGURL \
+               --set xray.xray.joinKey=EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE \
+               --set xray.xray.masterKey=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

Openshift4/helm/openshift-xray/rabbitmq.yaml

@@ -16,10 +16,10 @@ spec:
         app: rabbitmq
     spec:
       containers:
-        - image: quay.io/jfrog/xray-rabbitmq-rh:3.8.0
+        - image: registry.connect.redhat.com/jfrog/xray-rabbitmq:3.8.9
           imagePullPolicy: "Always"
           name: xray-rabbitmq
           ports:
             -  containerPort: 4369
             -  containerPort: 5672
-            -  containerPort: 25672
+            -  containerPort: 15672

Openshift4/helm/openshift-xray/rabbitmqservice.yaml

@@ -8,17 +8,17 @@ spec:
   selector:
     app: rabbitmq
   ports:
-  - name: port1
+  - name: epmd
     protocol: TCP
     port: 4369
     targetPort: 4369
-  - name: port3
+  - name: ampq
     protocol: TCP
     port: 5672
     targetPort: 5672
-  - name: port4
+  - name: management
     protocol: TCP
-    port: 25672
+    port: 15672
     targetPort: 25672
   type: ClusterIP
 

Openshift4/helm/openshift-xray/requirements.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: xray
+  repository: https://charts.jfrog.io/
+  version: 6.0.6
+digest: sha256:339b5ec4e309ce2970ed34ebc700d6fe8f436d6cbe8dd5d352f0b080401752af
+generated: "2020-10-01T15:04:29.008985-07:00"

Openshift4/helm/openshift-xray/requirements.yaml

@@ -1,4 +1,4 @@
 dependencies:
   - name: xray
-    version: 4.2.0
+    version: 6.0.6
     repository: https://charts.jfrog.io/

Openshift4/helm/openshift-xray/values.yaml

@@ -0,0 +1,101 @@
+# Openshift Jfrog Xray
+xray:
+  unifiedUpgradeAllowed: true
+  replicaCount: 1
+  xray:
+    masterKey: "OVERRIDE"
+    joinKey: "OVERRIDE"
+    consoleLog: false
+    jfrogUrl: "OVERRIDE"
+  postgresql:
+    enabled: false
+  database:
+    url: "OVERRIDE"
+    user: "OVERRIDE"
+    password: "OVERRIDE"
+  common:
+    xrayUserId: "1000721035"
+    xrayGroupId: "1000721035"
+  analysis:
+    name: xray-analysis
+    image:
+      registry: registry.connect.redhat.com
+      repository: jfrog/xray-analysis
+      tag: 3.8.8
+    updateStrategy: RollingUpdate
+    podManagementPolicy: Parallel
+    preStartCommand:
+  indexer:
+    name: xray-indexer
+    image:
+      registry: registry.connect.redhat.com
+      repository: jfrog/xray-indexer
+      tag: 3.8.8
+    updateStrategy: RollingUpdate
+    podManagementPolicy: Parallel
+  persist:
+    name: xray-persist
+    image:
+      registry: registry.connect.redhat.com
+      repository: jfrog/xray-persist
+      tag: 3.8.8
+    updateStrategy: RollingUpdate
+    podManagementPolicy: Parallel
+    persistence:
+      size: 10Gi
+    preStartCommand:
+  server:
+    name: xray-server
+    image:
+      registry: registry.connect.redhat.com
+      repository: jfrog/xray-server
+      tag: 3.8.8
+    updateStrategy: RollingUpdate
+    podManagementPolicy: Parallel
+    replicaCount: 1
+  router:
+    name: router
+    image:
+      registry: registry.connect.redhat.com
+      repository: jfrog/xray-router
+      tag: 1.4.3
+      imagePullPolicy: IfNotPresent
+  rabbitmq-ha:
+    enabled: true
+    replicaCount: 1
+    image:
+      repository: registry.connect.redhat.com/jfrog/xray-rabbitmq
+      tag: 3.8.9
+    rabbitmqEpmdPort: 4369
+    rabbitmqNodePort: 5672
+    rabbitmqManagerPort: 15672
+    rabbitmqUsername: guest
+    rabbitmqPassword: guest
+    managementUsername: management
+    managementPassword: management
+    initContainer:
+      enabled: false
+    securityContext:
+      fsGroup: 1000721035
+      runAsUser: 1000721035
+      runAsGroup: 1000721035
+    livenessProbe:
+      initialDelaySeconds: 120
+      periodSeconds: 10
+      timeoutSeconds: 5
+      failureThreshold: 6
+      exec:
+        command:
+          - /bin/sh
+          - -c
+          - 'rabbitmqctl status'
+    readinessProbe:
+      initialDelaySeconds: 20
+      periodSeconds: 5
+      timeoutSeconds: 3
+      failureThreshold: 6
+      exec:
+        command:
+          - /bin/sh
+          - -c
+          - 'rabbitmqctl status'

Openshift4/openshift-xray/values.yaml

@@ -1,78 +0,0 @@
-# Openshift Jfrog Xray
-xray:
-  unifiedUpgradeAllowed: true
-  replicaCount: 1
-  xray:
-    masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-    joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-    consoleLog: false
-    jfrogUrl: "OVERRIDE"
-  postgresql:
-    enabled: false
-  database:
-    url: "OVERRIDE"
-    user: "OVERRIDE"
-    password: "OVERRIDE"
-  rabbitmq-ha:
-    enabled: true
-    replicaCount: 1
-    image:
-      tag: 3.7.21-alpine
-    rabbitmqUsername: guest
-    rabbitmqPassword: ""
-    persistentVolume:
-      enabled: true
-      size: 20Gi
-    rbac:
-      create: true
-    preStartCommand:
-  global:
-    postgresqlTlsSecret:
-  analysis:
-    name: xray-analysis
-    image:
-      repository: registry.connect.redhat.com/jfrog/xray-analysis
-      version: 3.6.2
-    updateStrategy: RollingUpdate
-    podManagementPolicy: Parallel
-    preStartCommand:
-  indexer:
-    name: xray-indexer
-    image:
-      repository: registry.connect.redhat.com/jfrog/xray-indexer
-      version: 3.6.2
-    updateStrategy: RollingUpdate
-    podManagementPolicy: Parallel
-  persist:
-    name: xray-persist
-    image:
-      repository: registry.connect.redhat.com/jfrog/xray-persist
-      version: 3.6.2
-    updateStrategy: RollingUpdate
-    podManagementPolicy: Parallel
-    persistence:
-      size: 10Gi
-    preStartCommand:
-  server:
-    name: xray-server
-    image:
-      repository: registry.connect.redhat.com/jfrog/xray-server
-      version: 3.6.2
-    updateStrategy: RollingUpdate
-    podManagementPolicy: Parallel
-    replicaCount: 1
-  router:
-    name: router
-    image:
-      repository: registry.connect.redhat.com/jfrog/xray-router
-      version: 1.4.2
-      imagePullPolicy: IfNotPresent
-  rabbitmq-ha:
-    enabled: true
-    replicaCount: 1
-    image:
-      repository: registry.connect.redhat.com/jfrog/xray-rabbitmq
-      tag: 3.8.0
-    rabbitmqEpmdPort: 4369
-    rabbitmqNodePort: 5672
-    rabbitmqManagerPort: 15672