updates to fix the issues with artifactory-ha v2.2.9

Openshift4/openshift-artifactory-ha/Chart.yaml

@@ -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.1.3
+version: 2.2.9

Openshift4/openshift-artifactory-ha/requirements.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: artifactory-ha
   repository: https://charts.jfrog.io/
-  version: 2.1.3
+  version: 2.2.9
-digest: sha256:58169c65a87781f34ab6a49706e0f345234878558ce681ee7ed38ace25b88dfe
+digest: sha256:65c1deae2ede50a40b62012243657a2ebfcc05bbd5b7f95bd8786bbb9425f13b
-generated: "2020-03-26T13:58:11.770394-07:00"
+generated: "2020-04-10T10:49:58.221628-07:00"

Openshift4/openshift-artifactory-ha/requirements.yaml

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

Openshift4/openshift-artifactory-ha/values.yaml

@@ -5,19 +5,26 @@ artifactory-ha:
   ###################################
   # EDIT TO YOUR DB CONFIGURATION
   ###################################
+  #database:
+  #  type: "OVERRIDE"
+  #  driver: "OVERRIDE"
+  #  url: "OVERRIDE"
+  #  user: "postgres"
+  #  password: "OVERRIDE"
+
   database:
-    type: "OVERRIDE"
+    type: "postgresql"
-    driver: "OVERRIDE"
+    driver: "org.postgresql.Driver"
-    url: "OVERRIDE"
+    url: "jdbc:postgresql://postgres-postgresql:5432/artifactory"
-    user: "OVERRIDE"
+    user: "artifactory"
-    password: "OVERRIDE"
+    password: "password"
 
   ###################################
   # 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 }}{{ default \"derby\" .Values.database.type }}{{ end }}/0.0.0" }, { "featureId": "Platform/{{ default \"openshift\" .Values.installer.platform }}" }, { "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" } ] }'
   artifactory:
     ## Add custom init containers execution before predefined init containers
     customInitContainersBegin: |
@@ -36,15 +43,16 @@ artifactory-ha:
             name: volume
     ## Change to use RH UBI images
     image:
-      repository: "image-registry.openshift-image-registry.svc:5000/jfrog-artifactory/artifactory-pro"
+      repository: quay.io/jfrog/artifactory-rh-pro
     node:
       waitForPrimaryStartup:
         enabled: false
+    masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
   postgresql:
     enabled: false
   nginx:
     image:
-      repository: "image-registry.openshift-image-registry.svc:5000/jfrog-artifactory/nginx-artifactory-pro"
+      repository: quay.io/jfrog/nginx-artifactory-rh-pro
     http:
       externalPort: 80
       internalPort: 8080