Updates to openshift for new marketplace submission

Openshift4/openshift-artifactory-ha/helminstall.sh

@@ -1,8 +1,22 @@
 #!/usr/bin/env bash
 
-if [[ -z "$1" ]]
-then 
-  echo "Skipping creation of persistent volume examples. Ensure there is available PVs 200Gi per node for HA." 
+# PreReq'd:
+# helm install postgres bitnami/postgresql
+# follow artifactory postgresql db setup:
+# https://www.jfrog.com/confluence/display/JFROG/PostgreSQL
+POSTGRES=$(helm ls | grep postgres | wc -l)
+
+if [[ "$POSTGRES" =~ (0) ]]
+then
+  echo "External DB is required to run Jfrog Openshift Artifactory Helm chart"
+  echo ""
+  echo "Postgresql helm chart must be installed prior to installing this helm installer script."
+  echo ""
+  echo "helm install postgres bitnami/postgresql"
+  echo ""
+  echo "follow artifactory postgresql db setup:"
+  echo "https://www.jfrog.com/confluence/display/JFROG/PostgreSQL"
+  exit 1
 else
   # patch the restricted scc to allow the pods to run as anyuid
   oc patch scc restricted --patch '{"fsGroup":{"type":"RunAsAny"},"runAsUser":{"type":"RunAsAny"},"seLinuxContext":{"type":"RunAsAny"}}' --type=merge
@@ -12,9 +26,14 @@ else
 
   # create the tls secret
   oc create secret tls tls-ingress --cert=tls.crt --key=tls.key
-fi  
+fi
 
-# install via helm
+# install via helm with default postgresql configuration
 helm install artifactory-ha . \
                --set artifactory-ha.nginx.tlsSecretName=tls-ingress \
-               --set artifactory-ha.artifactory.license.secret=artifactory-license,artifactory-ha.artifactory.license.dataKey=artifactory.cluster.license
+               --set artifactory-ha.artifactory.license.secret=artifactory-license,artifactory-ha.artifactory.license.dataKey=artifactory.cluster.license \
+               --set artifactory-ha.database.type=postgresql \
+               --set artifactory-ha.database.driver=org.postgresql.Driver \
+               --set artifactory-ha.database.url=jdbc:postgresql://postgres-postgresql:5432/artifactory \
+               --set artifactory-ha.database.user=artifactory \
+               --set artifactory-ha.database.password=password

Openshift4/openshift-artifactory-ha/requirements.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: artifactory-ha
   repository: https://charts.jfrog.io/
-  version: 2.2.9
-digest: sha256:65c1deae2ede50a40b62012243657a2ebfcc05bbd5b7f95bd8786bbb9425f13b
-generated: "2020-04-10T10:49:58.221628-07:00"
+  version: 2.3.0
+digest: sha256:1a0b97f17a29da8dfe7f7dfbf5860258f216d1d82b06ffb55733b85f09e7cbaf
+generated: "2020-04-13T11:22:22.813393-07:00"

Openshift4/openshift-artifactory-ha/values.yaml

@@ -12,10 +12,6 @@ artifactory-ha:
     url: "OVERRIDE"
     user: "OVERRIDE"
     password: "OVERRIDE"
-
-  ###################################
-  # DO NOT EDIT FURTHER
-  ###################################
   initContainerImage: registry.redhat.io/ubi8-minimal
   waitForDatabase: false
   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" } ] }'
@@ -40,6 +36,7 @@ artifactory-ha:
       repository: registry.connect.redhat.com/jfrog/artifactory-pro
       version: 7.3.2
     node:
+      replicaCount: 2
       waitForPrimaryStartup:
         enabled: false
     masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
@@ -49,6 +46,7 @@ artifactory-ha:
     image:
       repository: registry.redhat.io/rhel8/nginx-116
       version: latest
+    ## K8S secret name for the TLS secret to be used for SSL
     tlsSecretName: "OVERRIDE"
     http:
       externalPort: 80