updates to helm chart to subchart latest GA ha chart version 2.0.25 w/ redhat init container fix

Openshift4/.gitignore

@@ -1 +1,3 @@
 artifactory.cluster.license
+jfrog.team.crt
+jfrog.team.key

Openshift4/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 7.0.7
+appVersion: 7.2.1
 description: Universal Repository Manager supporting all major packaging formats,
   build tools and CI servers.
 home: https://www.jfrog.com/artifactory/
@@ -21,4 +21,4 @@ name: openshift-artifactory-ha
 sources:
 - https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
 - https://github.com/jfrog/charts
-version: 2.0.4
+version: 2.0.25

Openshift4/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/helminstall.sh

@@ -1,23 +1,30 @@
 #!/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."; else oc create -f pv-examples/; fi  
+if [[ -z "$1" ]]
+then 
+  echo "Skipping creation of persistent volume examples. Ensure there is available PVs 200Gi per node for HA." 
+else 
+  oc create -f pv-examples/ 
+  oc new-project jfrog-artifactory
+  oc create serviceaccount svcaccount -n jfrog-artifactory
+  oc adm policy add-scc-to-user privileged system:serviceaccount:jfrog-artifactory:svcaccount
+  oc adm policy add-scc-to-user anyuid system:serviceaccount:jfrog-artifactory:svcaccount
+  oc adm policy add-scc-to-group anyuid system:authenticated
 
-oc new-project jfrog-artifactory
+  # enables hostPath plugin for openshift system wide
-oc create serviceaccount svcaccount -n jfrog-artifactory
+  oc create -f hostpathscc.yaml -n jfrog-artifactory
-oc adm policy add-scc-to-user privileged system:serviceaccount:jfrog-artifactory:svcaccount
+  oc patch securitycontextconstraints.security.openshift.io/hostpath --type=merge --patch='{"allowHostDirVolumePlugin": true}'
-oc adm policy add-scc-to-user anyuid system:serviceaccount:jfrog-artifactory:svcaccount
+  oc adm policy add-scc-to-user hostpath system:serviceaccount:jfrog-artifactory:svcaccount
-oc adm policy add-scc-to-group anyuid system:authenticated
 
-# enables hostPath plugin for openshift system wide
+  # create the license secret
-oc create -f scc.yaml -n jfrog-artifactory
+  oc create secret generic artifactory-license --from-file=artifactory.cluster.license
-oc patch securitycontextconstraints.security.openshift.io/hostpath --type=merge --patch='{"allowHostDirVolumePlugin": true}' 
-oc adm policy add-scc-to-user hostpath system:serviceaccount:jfrog-artifactory:svcaccount
 
-# create the license secret
+  # create the tls secret
-oc create secret generic artifactory-license --from-file=./artifactory.cluster.license
+  oc create secret tls tls-ingress --cert=jfrog.team.crt --key=jfrog.team.key
+fi  
 
 # install via helm
-helm install . --generate-name \
+helm install artifactory-ha . \
-               --set artifactory.node.replicaCount=1 \
+               --set nginx.tlsSecretName=tls-ingress \
-               --set nginx.service.type=NodePort \
+               --set artifactory-ha.artifactory.node.replicaCount=1 \
-               --set artifactory.license.secret=artifactory-license,artifactory.license.dataKey=artifactory.cluster.license
+               --set artifactory-ha.artifactory.license.secret=artifactory-license,artifactory-ha.artifactory.license.dataKey=artifactory.cluster.license

Openshift4/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/hostpathscc.yaml

@@ -0,0 +1,18 @@
+kind: SecurityContextConstraints
+apiVersion: v1
+metadata:
+  name: hostpath
+allowPrivilegedContainer: false
+runAsUser:
+  type: RunAsAny
+seLinuxContext:
+  type: RunAsAny
+fsGroup:
+  type: RunAsAny
+supplementalGroups:
+  type: RunAsAny
+users:
+- artifactory
+groups:
+- artifactory
+- jfrog-artifactory

Openshift4/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/requirements.lock

@@ -1,6 +1,6 @@
 dependencies:
-- name: postgresql
+- name: artifactory-ha
-  repository: https://kubernetes-charts.storage.googleapis.com/
+  repository: https://charts.jfrog.io/
-  version: 7.0.1
+  version: 2.0.25
-digest: sha256:dcdafe9ab91ccf0e5883e2b5dd9ba13e82190b5e16e6dee6d39fd16a04123ce8
+digest: sha256:1de97dca862a0b7e74fc937fbeff231119071a00cea8e42f92adb87c59fa554c
-generated: 2019-11-10T13:12:29.836238+02:00
+generated: "2020-03-09T12:41:44.126599-07:00"

Openshift4/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/requirements.yaml

@@ -1,5 +1,4 @@
 dependencies:
-  - name: postgresql
+  - name: artifactory-ha
-    version: 7.0.1
+    version: 2.0.25
-    repository: https://kubernetes-charts.storage.googleapis.com/
+    repository: https://charts.jfrog.io/
-    condition: postgresql.enabled