From b47a77744873ffae26c171b45f126afb95801c33 Mon Sep 17 00:00:00 2001
From: John Peterson <johnp@jfrog.com>
Date: Tue, 6 Oct 2020 16:54:01 -0700
Subject: [PATCH] Openshift Xray Helm chart 6.0.6

---
 Openshift4/helm/openshift-xray/helminstall.sh |  2 +-
 Openshift4/helm/openshift-xray/values.yaml    | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Openshift4/helm/openshift-xray/helminstall.sh b/Openshift4/helm/openshift-xray/helminstall.sh
index e19987c..c488669 100755
--- a/Openshift4/helm/openshift-xray/helminstall.sh
+++ b/Openshift4/helm/openshift-xray/helminstall.sh
@@ -60,7 +60,7 @@ then
   # HELM
   JFROGURL="http://artifactory-ha-nginx"
   # OPERATOR
-  # JFROGURL="http://openshiftartifactoryha-nginx"
+  #JFROGURL="http://openshiftartifactoryha-nginx"
 else
   JFROGURL=$4
 fi
diff --git a/Openshift4/helm/openshift-xray/values.yaml b/Openshift4/helm/openshift-xray/values.yaml
index b242f3d..ab9d4c7 100755
--- a/Openshift4/helm/openshift-xray/values.yaml
+++ b/Openshift4/helm/openshift-xray/values.yaml
@@ -13,9 +13,24 @@ xray:
     url: "OVERRIDE"
     user: "OVERRIDE"
     password: "OVERRIDE"
+  initContainerImage: registry.connect.redhat.com/jfrog/init:1.0.1
   common:
     xrayUserId: "1000721035"
     xrayGroupId: "1000721035"
+    customInitContainers: |
+      - name: "prepare-uid-persistent-volume"
+        image: "{{ .Values.initContainerImage }}"
+        imagePullPolicy: "{{ .Values.imagePullPolicy }}"
+        command:
+          - 'sh'
+          - '-c'
+          - >
+            chown -Rv {{ .Values.common.xrayUserId }}:{{ .Values.common.xrayGroupId }} {{ .Values.xray.persistence.mountPath }}
+        securityContext:
+            runAsUser: 0
+        volumeMounts:
+          - mountPath: "{{ .Values.xray.persistence.mountPath }}"
+            name: data-volume
   analysis:
     name: xray-analysis
     image: