Merge pull request #205 from jfrog/PTRENG-3663-version-update-upgrade-issue

[Openshift] Artifactory 7.33.12 & Xray 3.43.1

Openshift4/operator/artifactory-ha-operator/CHANGELOG.md

@@ -1,60 +1,84 @@
 # JFrog Openshift Artifactory-ha Chart Changelog
+
 All changes to this chart will be documented in this file.
 
+## [1.2.0] - Feb 25, 2022
+
+- Updating Operator to latest jfrog/artifactory-ha helm chart version 107.33.12 artifactory version 7.33.12 and bug fix for upgrade issue
+
 ## [1.1.20] - Oct 19, 2021
-* Updating Operator to latest jfrog/artifactory-ha helm chart version 107.27.3 artifactory version 7.27.3 and bug fix for apiversion for openshift 4.9
+
+- Updating Operator to latest jfrog/artifactory-ha helm chart version 107.27.3 artifactory version 7.27.3 and bug fix for apiversion for openshift 4.9
 
 ## [1.1.19] - Oct 01, 2021
-* Updating Operator to latest jfrog/artifactory-ha helm chart version 107.27.3 artifactory version 7.27.3
+
+- Updating Operator to latest jfrog/artifactory-ha helm chart version 107.27.3 artifactory version 7.27.3
 
 ## [1.1.14] - Sep 15, 2021
-* Updating Operator to latest jfrog/artifactory-ha helm chart version 107.25.7 artifactory version 7.25.7
+
+- Updating Operator to latest jfrog/artifactory-ha helm chart version 107.25.7 artifactory version 7.25.7
 
 ## [1.1.13] - Jul 01, 2021
-* Updating Operator to latest jfrog/artifactory-ha helm chart version 107.19.4 artifactory version 7.19.4
+
+- Updating Operator to latest jfrog/artifactory-ha helm chart version 107.19.4 artifactory version 7.19.4
 
 ## [1.1.12] - May 21, 2021
-* Updating Operator to latest jfrog/artifactory-ha helm chart version 107.18.6 artifactory version 7.18.6
+
+- Updating Operator to latest jfrog/artifactory-ha helm chart version 107.18.6 artifactory version 7.18.6
 
 ## [1.1.11] - Apr 9, 2021
-* Updating Operator to latest jfrog/artifactory-ha helm chart version 4.13.0 artifactory version 7.17.5
+
+- Updating Operator to latest jfrog/artifactory-ha helm chart version 4.13.0 artifactory version 7.17.5
 
 ## [1.1.4] - Dec 2, 2020
-* Updating Operator to latest jfrog/artifactory-ha helm chart version 4.5.4 artifactory version 7.11.5
+
+- Updating Operator to latest jfrog/artifactory-ha helm chart version 4.5.4 artifactory version 7.11.5
 
 ## [1.1.3] - Nov 20, 2020
-* Updating Operator to latest jfrog/artifactory-ha helm chart version 4.4.5 artifactory version 7.10.6
+
+- Updating Operator to latest jfrog/artifactory-ha helm chart version 4.4.5 artifactory version 7.10.6
 
 ## [1.1.2] - Oct 22, 2020
-* Updating Operator to latest jfrog/artifactory-ha helm chart version 4.4.1 artifactory version 7.10.2
+
+- Updating Operator to latest jfrog/artifactory-ha helm chart version 4.4.1 artifactory version 7.10.2
 
 ## [1.1.1] - Oct 6, 2020
-* Upgrade path fixed for both operator version 1.0.3 and 1.1.0
+
-* Updating Operator to latest jfrog/artifactory-ha helm chart version 4.2.0 artifactory version 7.9.0
+- Upgrade path fixed for both operator version 1.0.3 and 1.1.0
+- Updating Operator to latest jfrog/artifactory-ha helm chart version 4.2.0 artifactory version 7.9.0
 
 ## [1.1.0] - Sept 30, 2020
-* Updating Operator to latest jfrog/artifactory-ha helm chart version 4.1.0 artifactory version 7.9.0
+
+- Updating Operator to latest jfrog/artifactory-ha helm chart version 4.1.0 artifactory version 7.9.0
 
 ## [1.0.3] - Aug 17, 2020
-* Updating Operator to latest jfrog/artifactory-ha helm chart version 3.1.0 artifactory version 7.7.3
+
+- Updating Operator to latest jfrog/artifactory-ha helm chart version 3.1.0 artifactory version 7.7.3
 
 ## [1.0.2] - July 16, 2020
-* Updating Operator to latest jfrog/artifactory-ha helm chart version 3.0.5 artifactory version 7.6.3
+
+- Updating Operator to latest jfrog/artifactory-ha helm chart version 3.0.5 artifactory version 7.6.3
 
 ## [1.0.1] - June 29, 2020
-* Updating to latest jfrog/artifactory-ha helm chart version 2.6.0 artifactory version 7.6.1
+
+- Updating to latest jfrog/artifactory-ha helm chart version 2.6.0 artifactory version 7.6.1
 
 ## [1.0.0] - May 12, 2020
-* Updating to latest jfrog/artifactory-ha helm chart version 2.4.6 artifactory version 7.4.3
+
+- Updating to latest jfrog/artifactory-ha helm chart version 2.4.6 artifactory version 7.4.3
 
 ## [0.4.0] - April 13, 2020
-* Updating to latest jfrog/artifactory-ha helm chart version 2.3.0
+
+- Updating to latest jfrog/artifactory-ha helm chart version 2.3.0
 
 ## [0.3.0] - April 11, 2020
-* Fixed issues with master key
+
+- Fixed issues with master key
 
 ## [0.2.0] - March 17, 2020
-* Updated Artifactory version to 7.3.2
+
+- Updated Artifactory version to 7.3.2
 
 ## [0.1.0] - March 09, 2020
-* Updated Artifactory version to 7.2.1
+
+- Updated Artifactory version to 7.2.1

Openshift4/operator/artifactory-ha-operator/Dockerfile

@@ -14,7 +14,6 @@ USER root
 RUN microdnf install yum \
       && yum -y update-minimal --security --sec-severity=Important --sec-severity=Critical \
       && yum clean all \
-     && microdnf remove yum \
       && microdnf clean all \
       && microdnf install gnutls \
       && microdnf install nettle  \

Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md

@@ -1,76 +1,105 @@
 # JFrog Openshift Artifactory-ha Chart Changelog
+
 All changes to this chart will be documented in this file.
 
+## [107.33.12] - Mar01, 2022
+
+- Updating to latest jfrog/artifactory-ha helm chart version 107.33.12 artifactory version 7.33.12
+
 ## [107.27.9] - Dec15, 2021
-* Updating to latest jfrog/artifactory-ha helm chart version 107.27.9  artifactory version 7.27.9
+
+- Updating to latest jfrog/artifactory-ha helm chart version 107.27.9 artifactory version 7.27.9
 
 ## [107.27.3] - Oct01, 2021
-* Updating to latest jfrog/artifactory-ha helm chart version 107.27.3  artifactory version 7.27.3
+
+- Updating to latest jfrog/artifactory-ha helm chart version 107.27.3 artifactory version 7.27.3
 
 ## [107.25.7] - Sep15, 2021
-* Updating to latest jfrog/artifactory-ha helm chart version 107.25.7  artifactory version 7.25.7
+
+- Updating to latest jfrog/artifactory-ha helm chart version 107.25.7 artifactory version 7.25.7
 
 ## [107.19.4] - Jul01, 2021
-* Updating to latest jfrog/artifactory-ha helm chart version 107.19.4  artifactory version 7.19.4
+
+- Updating to latest jfrog/artifactory-ha helm chart version 107.19.4 artifactory version 7.19.4
 
 ## [107.18.6] - May21, 2021
-* Updating to latest jfrog/artifactory-ha helm chart version 107.18.6  artifactory version 7.18.6
+
+- Updating to latest jfrog/artifactory-ha helm chart version 107.18.6 artifactory version 7.18.6
 
 ## [4.13.0] - Apr 8, 2021
-* Updating to latest jfrog/artifactory-ha helm chart version 4.13.0 artifactory version 7.17.5
+
+- Updating to latest jfrog/artifactory-ha helm chart version 4.13.0 artifactory version 7.17.5
 
 ## [4.10.0] - Mar 18, 2021
-* Updating to latest jfrog/artifactory-ha helm chart version 4.10.0 artifactory version 7.16.3
+
+- Updating to latest jfrog/artifactory-ha helm chart version 4.10.0 artifactory version 7.16.3
 
 ## [4.9.3] - Mar 5, 2021
-* Fixing issues with prior versions of operators v1.1.7 and v1.1.8 which are broken
+
-* Updating to latest jfrog/artifactory helm chart version 4.9.3 artifactory version 7.15.4
+- Fixing issues with prior versions of operators v1.1.7 and v1.1.8 which are broken
+- Updating to latest jfrog/artifactory helm chart version 4.9.3 artifactory version 7.15.4
 
 ## [4.9.1] - Feb 22, 2021
-* Updating to latest jfrog/artifactory-ha helm chart version 4.9.1 artifactory version 7.15.3
+
+- Updating to latest jfrog/artifactory-ha helm chart version 4.9.1 artifactory version 7.15.3
 
 ## [4.7.6] - Jan 11, 2021
-* Updating to latest jfrog/artifactory-ha helm chart version 4.7.6 artifactory version 7.12.6
+
+- Updating to latest jfrog/artifactory-ha helm chart version 4.7.6 artifactory version 7.12.6
 
 ## [4.5.5] - Dec 18, 2020
-* Updating to latest jfrog/artifactory-ha helm chart version 4.5.5 artifactory version 7.11.5
+
+- Updating to latest jfrog/artifactory-ha helm chart version 4.5.5 artifactory version 7.11.5
 
 ## [4.5.4] - Dec 2, 2020
-* Updating to latest jfrog/artifactory-ha helm chart version 4.5.4 artifactory version 7.11.5
+
+- Updating to latest jfrog/artifactory-ha helm chart version 4.5.4 artifactory version 7.11.5
 
 ## [4.4.5] - Nov 20, 2020
-* Updating to latest jfrog/artifactory-ha helm chart version 4.4.5 artifactory version 7.10.6
+
+- Updating to latest jfrog/artifactory-ha helm chart version 4.4.5 artifactory version 7.10.6
 
 ## [4.4.1] - Oct 22, 2020
-* Updating to latest jfrog/artifactory-ha helm chart version 4.4.1 artifactory version 7.10.2
+
+- Updating to latest jfrog/artifactory-ha helm chart version 4.4.1 artifactory version 7.10.2
 
 ## [4.2.0] - Oct 6, 2020
-* Fixed upgrade path from 3.1.0 to 4.2.0
+
-* Updating to latest jfrog/artifactory-ha helm chart version 4.2.0 artifactory version 7.9.0
+- Fixed upgrade path from 3.1.0 to 4.2.0
+- Updating to latest jfrog/artifactory-ha helm chart version 4.2.0 artifactory version 7.9.0
 
 ## [4.1.0] - Sept 30, 2020
-* Updating to latest jfrog/artifactory-ha helm chart version 4.1.0 artifactory version 7.9.0
+
+- Updating to latest jfrog/artifactory-ha helm chart version 4.1.0 artifactory version 7.9.0
 
 ## [3.1.0] - Aug 17, 2020
-* Updating to latest jfrog/artifactory-ha helm chart version 3.1.0 artifactory version 7.7.3
+
+- Updating to latest jfrog/artifactory-ha helm chart version 3.1.0 artifactory version 7.7.3
 
 ## [3.0.5] - Jul 16, 2020
-* Updating to latest jfrog/artifactory helm chart version 3.0.5 artifactory version 7.6.3
+
+- Updating to latest jfrog/artifactory helm chart version 3.0.5 artifactory version 7.6.3
 
 ## [2.6.0] - June 29, 2020
-* Updating to latest jfrog/artifactory helm chart version 2.6.0 artifactory version 7.6.1
+
+- Updating to latest jfrog/artifactory helm chart version 2.6.0 artifactory version 7.6.1
 
 ## [2.4.6] - May 12, 2020
-* Updating to latest jfrog/artifactory-ha helm chart version 2.4.6 artifactory version 7.4.3
+
+- Updating to latest jfrog/artifactory-ha helm chart version 2.4.6 artifactory version 7.4.3
 
 ## [2.3.0] - April 13, 2020
-* Updating to latest jfrog/artifactory-ha helm chart version 2.3.0
+
+- Updating to latest jfrog/artifactory-ha helm chart version 2.3.0
 
 ## [2.2.9] - April 11, 2020
-* Fixed issues with master key
+
+- Fixed issues with master key
 
 ## [2.1.9] - March 17, 2020
-* Updated Artifactory version to 7.3.2
+
+- Updated Artifactory version to 7.3.2
 
 ## [2.0.35] - March 09, 2020
-* Updated Artifactory version to 7.2.1
+
+- Updated Artifactory version to 7.2.1

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

@@ -1,6 +1,6 @@
 dependencies:
 - name: artifactory-ha
   repository: https://charts.jfrog.io/
-  version: 107.27.9
+  version: 107.33.12
-digest: sha256:64caef98d9cd6743d5827baaa2d8d9082eb116525376a30606a44686e10e8927
+digest: sha256:bb0facd8523c53324a9668fae3609df0e24e7d5b0fa52f886c975cf818aea08c
-generated: "2021-12-20T16:51:54.6150877+05:30"
+generated: "2022-02-23T23:46:02.205109+05:30"

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

@@ -1,23 +1,25 @@
 apiVersion: v2
-appVersion: 7.27.9
+appVersion: 7.33.12
 dependencies:
   - name: artifactory-ha
-    version: 107.27.9
+    version: 107.33.12
     repository: https://charts.jfrog.io/
 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
 keywords:
-- artifactory
+  - artifactory
-- jfrog
+  - jfrog
-- devops
+  - devops
 maintainers:
-- email: vinaya@jfrog.com
+  - email: girir@jfrog.com
+    name: Giridharan Ramasamy
+  - email: vinaya@jfrog.com
     name: Vinay Aggarwal
-- email: johnp@jfrog.com
+  - email: johnp@jfrog.com
     name: John Peterson
 name: openshift-artifactory-ha
 sources:
-- https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
+  - https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
-- https://github.com/jfrog/charts
+  - https://github.com/jfrog/charts
-version: 107.27.9
+version: 107.33.12

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

@@ -10,7 +10,7 @@ artifactory-ha:
     url: "OVERRIDE"
     user: "OVERRIDE"
     password: "OVERRIDE"
-  initContainerImage: registry.connect.redhat.com/jfrog/init:7.27.9-1
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.33.12-1
   waitForDatabase: true
   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:
@@ -19,7 +19,7 @@ artifactory-ha:
     image:
       registry: registry.connect.redhat.com
       repository: jfrog/artifactory-pro
-      tag: 7.27.9-1
+      tag: 7.33.12-1
     node:
       replicaCount: 2
       waitForPrimaryStartup:

Openshift4/operator/artifactory-ha-operator/watches.yaml

@@ -3,6 +3,3 @@
   group: charts.helm.k8s.io
   kind: OpenshiftArtifactoryHa
   chart: helm-charts/openshift-artifactory-ha
-  overrideValues:
-    artifactory-ha.artifactory.image.override: $RELATED_IMAGE_ARTIFACTORY_IMAGE_REPOSITORY
-    artifactory-ha.nginx.image.override: $RELATED_IMAGE_NGINX_IMAGE_REPOSITORY

Openshift4/operator/xray-operator/CHANGELOG.md

@@ -1,66 +1,95 @@
 # JFrog Openshift Xray Chart Changelog
+
 All changes to this chart will be documented in this file.
 
+## [2.1.0] Mar 01, 2022
+
+- Deploying JFrog Xray 3.43.1 as an Operator into Openshift and bug fix for upgrade issue
+
+## [2.0.10] Feb 08, 2022
+
+- Deploying JFrog Xray 3.35.0 as an Operator into Openshift
+
 ## [2.0.9] Oct 21, 2021
-* Deploying JFrog Xray 3.33.3 as an Operator into Openshift and bug fix for apiversion in bundle for openshift 4.9 
+
+- Deploying JFrog Xray 3.33.3 as an Operator into Openshift and bug fix for apiversion in bundle for openshift 4.9
 
 ## [2.0.5] Oct 06, 2021
-* Deploying JFrog Xray 3.33.3 as an Operator into Openshift
+
+- Deploying JFrog Xray 3.33.3 as an Operator into Openshift
 
 ## [2.0.5] Sep 15, 2021
-* Deploying JFrog Xray 3.32.2 as an Operator into Openshift
+
+- Deploying JFrog Xray 3.32.2 as an Operator into Openshift
 
 ## [2.0.4] Jul 01, 2021
-* Deploying JFrog Xray 3.25.1 as an Operator into Openshift
+
+- Deploying JFrog Xray 3.25.1 as an Operator into Openshift
 
 ## [2.0.3] May 24, 2021
-* Deploying JFrog Xray 3.23.0 as an Operator into Openshift & has a major bug fix for rabbitmq pod not coming up when deleted
+
+- Deploying JFrog Xray 3.23.0 as an Operator into Openshift & has a major bug fix for rabbitmq pod not coming up when deleted
 
 ## [2.0.2] Mar 12, 2021
-* Deploying JFrog Xray 3.18.1 as an Operator into Openshift
+
+- Deploying JFrog Xray 3.18.1 as an Operator into Openshift
 
 ## [2.0.1] Mar 11th, 2021
-* Bug fix for Rabbitmq user id and group id in the operator not matching helm values
+
+- Bug fix for Rabbitmq user id and group id in the operator not matching helm values
 
 ## [2.0.0] Feb 19th, 2021
-* BREAKING CHANGE - Rabbitmq ha deprecated for Rabbitmq
+
+- BREAKING CHANGE - Rabbitmq ha deprecated for Rabbitmq
 
 ## [1.1.8] Feb 9nd, 2021
-* Deploying JFrog Xray 3.17.2 as an Operator into Openshift
+
+- Deploying JFrog Xray 3.17.2 as an Operator into Openshift
 
 ## [1.1.7] Feb 3nd, 2021
-* Deploying JFrog Xray 3.16.0 as an Operator into Openshift
+
+- Deploying JFrog Xray 3.16.0 as an Operator into Openshift
 
 ## [1.1.6] Jan 11th, 2021
-* Deploying JFrog Xray 3.15.1 as an Operator into Openshift
+
+- Deploying JFrog Xray 3.15.1 as an Operator into Openshift
 
 ## [1.1.5] Dec 2nd, 2020
-* Deploying JFrog Xray 3.12.0 as an Operator into Openshift
+
+- Deploying JFrog Xray 3.12.0 as an Operator into Openshift
 
 ## [1.1.4] Oct 24rd, 2020
-* Deploying JFrog Xray 3.10.3 bug fixes
+
+- Deploying JFrog Xray 3.10.3 bug fixes
 
 ## [1.1.3] Oct 23rd, 2020
-* Deploying JFrog Xray 3.10.3 bug fixes
+
+- Deploying JFrog Xray 3.10.3 bug fixes
 
 ## [1.1.2] Oct 23rd, 2020
-* Deploying JFrog Xray 3.10.3 as an Operator into Openshift
+
+- Deploying JFrog Xray 3.10.3 as an Operator into Openshift
 
 ## [1.1.1] Oct 6, 2020
-* Bug Fixes
+
+- Bug Fixes
 
 ## [1.1.0] Oct 1, 2020
-* Deploying JFrog Xray 3.8.8 as an Operator into Openshift
+
+- Deploying JFrog Xray 3.8.8 as an Operator into Openshift
 
 ## [1.0.3] Aug 17, 2020
-* Deploying JFrog Xray 3.8.0 as an Operator into Openshift
+
+- Deploying JFrog Xray 3.8.0 as an Operator into Openshift
 
 ## [1.0.2] - July 28, 2020
-* Deploying JFrog Xray 3.6.2 as an Operator into Openshift
+
+- Deploying JFrog Xray 3.6.2 as an Operator into Openshift
 
 ## [1.0.1] - June 29, 2020
-* Deploying JFrog Xray 3.5.2 as an Operator into Openshift
+
+- Deploying JFrog Xray 3.5.2 as an Operator into Openshift
 
 ## [1.0.0] - May 22, 2020
-* Deploying JFrog Xray 3.3.0 as an Operator initial version of Jfrog Xray supported
 
+- Deploying JFrog Xray 3.3.0 as an Operator initial version of Jfrog Xray supported

Openshift4/operator/xray-operator/Dockerfile

@@ -13,11 +13,11 @@ USER root
 RUN microdnf install yum \
       && yum -y update-minimal --security --sec-severity=Important --sec-severity=Critical \
       && yum clean all \
-     && microdnf remove yum \
       && microdnf clean all \
       && microdnf install gnutls \
       && microdnf install nettle  \
-     && microdnf update openssl-libs
+      && microdnf update openssl-libs \
+      && microdnf update cyrus-sasl-lib
 
 RUN microdnf install sudo
 RUN sudo -u helm bash

Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md

@@ -1,53 +1,75 @@
 # JFrog Openshift Artifactory-Xray Chart Changelog
+
 All changes to this chart will be documented in this file.
 
+## [103.43.1] Mar 1, 2022
+
+- Updating to Xray chart version 103.43.1 and Xray app version 3.43.1
+
 ## [103.35.0] Dec 12, 2021
-* Updating to Xray chart version 103.35.0 and Xray app version 3.35.0
+
+- Updating to Xray chart version 103.35.0 and Xray app version 3.35.0
 
 ## [103.33.3] Oct 06, 2021
-* Updating to Xray chart version 103.33.3 and Xray app version 3.33.3
+
+- Updating to Xray chart version 103.33.3 and Xray app version 3.33.3
 
 ## [103.32.2] Sep 15, 2021
-* Updating to Xray chart version 103.32.2 and Xray app version 3.32.2
+
+- Updating to Xray chart version 103.32.2 and Xray app version 3.32.2
 
 ## [103.25.1] Jul 01, 2021
-* Updating to Xray chart version 103.25.1 and Xray app version 3.25.1
+
+- Updating to Xray chart version 103.25.1 and Xray app version 3.25.1
 
 ## [8.0.0] May 24, 2021
-* Updating to Xray chart version 8.0.0 and Xray app version 3.23.0 & this release has major fix for rabbitmq
+
+- Updating to Xray chart version 8.0.0 and Xray app version 3.23.0 & this release has major fix for rabbitmq
 
 ## [7.1.1] Mar 11, 2021
-* Updating to Xray chart version 7.1.1 and Xray app version 3.18.1
+
+- Updating to Xray chart version 7.1.1 and Xray app version 3.18.1
 
 ## [7.0.2] Feb 19th, 2021
-* BREAKING CHANGE rabbitmq ha deprecation for rabbitmq
+
+- BREAKING CHANGE rabbitmq ha deprecation for rabbitmq
 
 ## [6.10.0] Feb 3, 2021
-* Updating to Xray chart version 6.10.0 and Xray app version 3.16.0
+
+- Updating to Xray chart version 6.10.0 and Xray app version 3.16.0
 
 ## [6.8.3] Dec 29, 2020
-* Updating to Xray chart version 6.8.3 and Xray app version 3.15.1
+
+- Updating to Xray chart version 6.8.3 and Xray app version 3.15.1
 
 ## [6.5.1] Dec 2, 2020
-* Updating to Xray chart version 6.5.1 and Xray app version 3.12.0
+
+- Updating to Xray chart version 6.5.1 and Xray app version 3.12.0
 
 ## [6.4.2] Nov 20, 2020
-* Updating to Xray chart version 6.4.2 and Xray app version 3.11.2
+
+- Updating to Xray chart version 6.4.2 and Xray app version 3.11.2
 
 ## [6.2.1] Oct 23rd, 2020
-* Updating to Xray chart version 6.2.1 and Xray app version 3.10.3
+
+- Updating to Xray chart version 6.2.1 and Xray app version 3.10.3
 
 ## [6.1.2] Oct 22nd, 2020
-* Updating to Xray chart version 6.1.2 and Xray app version 3.9.1
+
+- Updating to Xray chart version 6.1.2 and Xray app version 3.9.1
 
 ## [6.0.6] Oct 1st, 2020
-* Updating to Xray chart version 6.0.6 and Xray app version 3.8.8
+
+- Updating to Xray chart version 6.0.6 and Xray app version 3.8.8
 
 ## [4.2.0] Aug 17, 2020
-* Updating to Xray chart version 4.2.0 and Xray app version 3.8.0
+
+- Updating to Xray chart version 4.2.0 and Xray app version 3.8.0
 
 ## [4.1.2] July 28, 2020
-* Updating to Xray chart version 4.1.2 and Xray app version 3.6.2
+
+- Updating to Xray chart version 4.1.2 and Xray app version 3.6.2
 
 ## [3.5.1] June 29, 2020
-* Updating to Xray chart version 3.5.1 and Xray app version 3.5.2
+
+- Updating to Xray chart version 3.5.1 and Xray app version 3.5.2

Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: xray
   repository: https://charts.jfrog.io/
-  version: 103.35.0
+  version: 103.43.1
-digest: sha256:d790ad3ebfc0f6f98766577eec4d2f3557d2ca3900a1ff796f52cfb96c213238
+digest: sha256:ebdbd89c079bda4db7f412df6bb2e4e7bc716d3587f8c1c6f049d392e3cc20ae
-generated: "2021-12-20T16:58:34.446753+05:30"
+generated: "2022-02-24T00:21:56.505405+05:30"

Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml

@@ -1,20 +1,22 @@
 apiVersion: v2
-appVersion: 3.35.0
+appVersion: 3.43.1
 description: Universal component scan for security and license inventory and impact analysis
 dependencies:
   - name: xray
-    version: 103.35.0
+    version: 103.43.1
     repository: https://charts.jfrog.io/
 sources:
-- https://bintray.com/jfrog/product/xray/view
+  - https://bintray.com/jfrog/product/xray/view
-- https://github.com/jfrog/charts
+  - https://github.com/jfrog/charts
 keywords:
-- xray
+  - xray
-- jfrog
+  - jfrog
 maintainers:
-- email: vinaya@jfrog.com
+  - email: girir@jfrog.com
+    name: Giridharan Ramasamy
+  - email: vinaya@jfrog.com
     name: Vinay Aggarwal
-- email: johnp@jfrog.com
+  - email: johnp@jfrog.com
     name: John Peterson
 name: openshift-xray
-version: 103.35.0
+version: 103.43.1

Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml

@@ -11,13 +11,13 @@ xray:
     url: "OVERRIDE"
     user: "OVERRIDE"
     password: "OVERRIDE"
-  initContainerImage: registry.connect.redhat.com/jfrog/init:7.27.9-1
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.33.12-1
   common:
     rabbitmq:
       connectionConfigFromEnvironment: true
     xrayUserId: "1000721035"
     xrayGroupId: "1000721035"
-    xrayVersion: "3.35.0-1"
+    xrayVersion: "3.43.1-2"
     customInitContainers: |
       - name: "prepare-uid-persistent-volume"
         image: "{{ .Values.initContainerImage }}"
@@ -71,7 +71,7 @@ xray:
       registry: registry.connect.redhat.com
       repository: jfrog/xray-router
       imagePullPolicy: IfNotPresent
-      tag: 3.35.0-1
+      tag: 3.43.1-2
 
   # RabbitMQ
   ## Configuration values for the rabbitmq dependency
@@ -85,13 +85,12 @@ xray:
     image:
       registry: registry.connect.redhat.com
       repository: jfrog/xray-rabbitmq
-      tag: 3.35.0-1
+      tag: 3.43.1-2
 
     podSecurityContext:
       fsGroup: 1000721001
       runAsUser: 1000721001
 
-    
     auth:
       username: xray
       password: xray
@@ -112,9 +111,6 @@ xray:
         #serverCertificate: |-
         #serverKey: |-
 
-
-    
-
     livenessProbe:
       initialDelaySeconds: 120
       periodSeconds: 10
@@ -124,7 +120,7 @@ xray:
         command:
           - /bin/sh
           - -c
-          - 'rabbitmqctl status'
+          - "rabbitmqctl status"
     readinessProbe:
       initialDelaySeconds: 20
       periodSeconds: 5
@@ -134,4 +130,4 @@ xray:
         command:
           - /bin/sh
           - -c
-          - 'rabbitmqctl status'
+          - "rabbitmqctl status"

Openshift4/operator/xray-operator/watches.yaml

@@ -3,10 +3,3 @@
   group: charts.helm.k8s.io
   kind: OpenshiftXray
   chart: helm-charts/openshift-xray
-  overrideValues:
-    xray.server.image.override: $RELATED_IMAGE_XRAY_SERVER_IMAGE_REPOSITORY
-    xray.analysis.image.override: $RELATED_IMAGE_XRAY_ANALYSIS_IMAGE_REPOSITORY
-    xray.persist.image.override: $RELATED_IMAGE_XRAY_PERSIST_IMAGE_REPOSITORY
-    xray.indexer.image.override: $RELATED_IMAGE_XRAY_INDEXER_IMAGE_REPOSITORY
-    xray.router.image.override: $RELATED_IMAGE_XRAY_ROUTER_IMAGE_REPOSITORY
-    xray.rabbitmq-ha.image.override: $RELATED_IMAGE_XRAY_RABBITMQ_IMAGE_REPOSITORY