From c8aaea9d69acd170273f16faac045c967f7297a5 Mon Sep 17 00:00:00 2001
From: John Peterson <johnp@jfrog.com>
Date: Fri, 10 Apr 2020 12:47:40 -0700
Subject: [PATCH] Updates to operator to version 2.2.9 of helm ha chart

---
 ...a-operator.v1.0.0.clusterserviceversion.yaml |  9 +++++----
 Openshift4/openshift-artifactory-ha/values.yaml | 17 +++++------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Openshift4/artifactory-ha-operator/bundle/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml b/Openshift4/artifactory-ha-operator/bundle/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml
index 5fbcf18..f699c0c 100644
--- a/Openshift4/artifactory-ha-operator/bundle/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml
+++ b/Openshift4/artifactory-ha-operator/bundle/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml
@@ -13,10 +13,11 @@ metadata:
           "spec": {
             "artifactory-ha": {
               "artifactory": {
-                "customInitContainersBegin": "- name: \"redhat-custom-setup\"\n  image: {{ index .Values \"initContainerImage\" }}\n  imagePullPolicy: \"{{ .Values.artifactory.image.pullPolicy }}\"\n  command:\n    - 'sh'\n    - '-c'\n    - 'chown -R 1030:1030 {{ .Values.artifactory.persistence.mountPath }}'\n  securityContext:\n      runAsUser: 0\n  volumeMounts:\n    - mountPath: \"{{ .Values.artifactory.persistence.mountPath }}\"\n      name: volume\n",
+                "customInitContainersBegin": "- name: \"redhat-custom-setup\"\n  #image: \"{{ .Values.initContainerImage }}\"\n  image: {{ index .Values \"initContainerImage\" }}\n  imagePullPolicy: \"{{ .Values.artifactory.image.pullPolicy }}\"\n  command:\n    - 'sh'\n    - '-c'\n    - 'chown -R 1030:1030 {{ .Values.artifactory.persistence.mountPath }}'\n  securityContext:\n      runAsUser: 0\n  volumeMounts:\n    - mountPath: \"{{ .Values.artifactory.persistence.mountPath }}\"\n      name: volume\n",
                 "image": {
                   "repository": "registry.connect.redhat.com/jfrog/artifactory-pro:7.3.2"
                 },
+                "masterKey": "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
                 "node": {
                   "waitForPrimaryStartup": {
                     "enabled": false
@@ -31,7 +32,7 @@ metadata:
                 "user": "OVERRIDE"
               },
               "initContainerImage": "registry.redhat.io/ubi8-minimal",
-              "installerInfo": "{ \"productId\": \"Openshift_artifactory-ha/{{ .Chart.Version }}\", \"features\": [ { \"featureId\": \"ArtifactoryVersion/{{ default .Chart.AppVersion .Values.artifactory.image.version }}\" }, { \"featureId\": \"{{ if .Values.postgresql.enabled }}postgresql{{ else }}{{ .Values.database.type }}{{ end }}/0.0.0\" }, { \"featureId\": \"Platform/openshift\" }, { \"featureId\": \"Partner/ACC-006983\" }, { \"featureId\": \"Channel/Openshift\" } ] }",
+              "installerInfo": "{ \"productId\": \"Openshift_artifactory-ha/{{ .Chart.Version }}\", \"features\": [ { \"featureId\": \"ArtifactoryVersion/{{ default .Chart.AppVersion .Values.artifactory.image.version }}\" }, { \"featureId\": \"{{ if .Values.postgresql.enabled }}postgresql{{ else }}{{ .Values.database.type }}{{ end }}/0.0.0\" }, { \"featureId\": \"Platform/Openshift\" }, { \"featureId\": \"Partner/ACC-006983\" }, { \"featureId\": \"Channel/Openshift\" } ] }",
               "nginx": {
                 "http": {
                   "externalPort": 80,
@@ -56,8 +57,8 @@ metadata:
       ]
     capabilities: Basic Install
     categories: "Developer Tools,Integration & Delivery"
-    description: "Artifactory HA deploys Artifactory in a high availability environment across multiple pods"
-    containerImage: quay.io/jfrog/artifactory-ha-operator
+    description: "JFrog Artifactory Enterprise deploys Artifactory in a high availability environment across multiple pods"
+    containerImage: registry.connect.redhat.com/jfrog/artifactory-operator:7.3.2
     createdAt: 2020-03-25T00:00:00Z
     support: JFrog
     certified: "true"
diff --git a/Openshift4/openshift-artifactory-ha/values.yaml b/Openshift4/openshift-artifactory-ha/values.yaml
index 1839a7e..180ae4b 100755
--- a/Openshift4/openshift-artifactory-ha/values.yaml
+++ b/Openshift4/openshift-artifactory-ha/values.yaml
@@ -5,19 +5,12 @@ artifactory-ha:
   ###################################
   # EDIT TO YOUR DB CONFIGURATION
   ###################################
-  #database:
-  #  type: "OVERRIDE"
-  #  driver: "OVERRIDE"
-  #  url: "OVERRIDE"
-  #  user: "postgres"
-  #  password: "OVERRIDE"
-
   database:
-    type: "postgresql"
-    driver: "org.postgresql.Driver"
-    url: "jdbc:postgresql://postgres-postgresql:5432/artifactory"
-    user: "artifactory"
-    password: "password"
+    type: "OVERRIDE"
+    driver: "OVERRIDE"
+    url: "OVERRIDE"
+    user: "postgres"
+    password: "OVERRIDE"
 
   ###################################
   # DO NOT EDIT FURTHER