openshift artifactory ha updates to v7.4.1 and openshift xray v3.2.3 helm charts

Openshift4/openshift-artifactory-ha/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 7.3.2
+appVersion: 7.4.1
 description: Openshift JFrog Artifactory HA subcharting Artifactory HA to work in Openshift environment
 home: https://www.jfrog.com/artifactory/
 icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-ha/logo/artifactory-logo.png
@@ -16,4 +16,4 @@ name: openshift-artifactory-ha
 sources:
 - https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
 - https://github.com/jfrog/charts
-version: 2.3.0
+version: 2.4.2

Openshift4/openshift-artifactory-ha/helminstall.sh

@@ -18,22 +18,38 @@ then
   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
-
-  # create the license secret
-  oc create secret generic artifactory-license --from-file=artifactory.cluster.license
-
-  # create the tls secret
-  oc create secret tls tls-ingress --cert=tls.crt --key=tls.key
+  if [[ -z "$1" ]]
+  then
+    echo "Installing Jfrog Artifactory Openshift Helm"
+  else
+    echo "Patching Environment for RunAsAnyUid"
+    # 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
+    if [[ -f "artifactory.cluster.license" ]]
+    then
+      echo "Creating k8s secret for Artifactory cluster licenses from file: artifactory.cluster.license"
+      # create the license secret
+      oc create secret generic artifactory-license --from-file=artifactory.cluster.license
+    fi
+    
+    if [[ -f "tls.crt" ]]
+    then
+      echo "Creating k8s secret for TLS tls-ingress from files tls.crt & tls.key"
+      # create the tls secret
+      oc create secret tls tls-ingress --cert=tls.crt --key=tls.key
+    fi
+  fi
 fi
 
 # install via helm with default postgresql configuration
 helm install artifactory-ha . \
+               --set artifactory-ha.nginx.service.ssloffload=true \
                --set artifactory-ha.nginx.tlsSecretName=tls-ingress \
+               --set artifactory-ha.artifactory.node.replicaCount=1 \
                --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
+               --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.3.0
-digest: sha256:1a0b97f17a29da8dfe7f7dfbf5860258f216d1d82b06ffb55733b85f09e7cbaf
-generated: "2020-04-13T11:22:22.813393-07:00"
+  version: 2.4.2
+digest: sha256:e9f80a6605bf281075c8b34fc9590728af545ed1f152a72ff985fea3708cd5f3
+generated: "2020-04-21T13:04:32.953359-07:00"

Openshift4/openshift-artifactory-ha/requirements.yaml

@@ -1,4 +1,4 @@
 dependencies:
   - name: artifactory-ha
-    version: 2.3.0
+    version: 2.4.2
     repository: https://charts.jfrog.io/

Openshift4/openshift-artifactory-ha/values.yaml

@@ -33,13 +33,16 @@ artifactory-ha:
             name: volume
     ## Change to use RH UBI images
     image:
-      repository: registry.connect.redhat.com/jfrog/artifactory-pro
-      version: 7.3.2
+      repository: quay.io/jfrog/artifactory-rh-pro
+      version: 7.4.1
+      #repository: registry.connect.redhat.com/jfrog/artifactory-pro
+      #version: 7.3.2
     node:
       replicaCount: 2
       waitForPrimaryStartup:
         enabled: false
     masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+    joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
   postgresql:
     enabled: false
   nginx:
@@ -48,6 +51,8 @@ artifactory-ha:
       version: latest
     ## K8S secret name for the TLS secret to be used for SSL
     tlsSecretName: "OVERRIDE"
+    service:
+      ssloffload: false
     http:
       externalPort: 80
       internalPort: 8080