Updated the RT 7.46.11 and Xray 3.60.2 versions for Openshift (#250)

* Changes in RT version 7.46.11 and Xray version 3.60.2 * Changes in RT and Xray versions 7.46.11 and 3.60.2
2026-01-20 20:06:54 -06:00 · 2022-11-28 15:35:49 +05:30
parent 2eb64dd851
commit 5eea6a893b
20 changed files with 65 additions and 44 deletions
--- a/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md
+++ b/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog  Openshift Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.

+## [107.46.11] -  Nov25, 2022
+* Updating to latest jfrog/artifactory-ha helm chart version 107.46.11 artifactory version 7.46.11
+
 ## [107.41.13] -  Oct03, 2022
 * Updating to latest jfrog/artifactory-ha helm chart version 107.41.13  artifactory version 7.41.13

--- a/Openshift4/helm/openshift-artifactory-ha/Chart.lock
+++ b/Openshift4/helm/openshift-artifactory-ha/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: artifactory-ha
  repository: https://charts.jfrog.io/
-  version: 107.41.13
-digest: sha256:2ed3129e3d0673e11e4258a5d2a0b664732441479d373c3db817f253d16dcd70
-generated: "2022-09-30T10:31:40.275678+05:30"
+  version: 107.46.11
+digest: sha256:59401ed163233f2025da593f27295461c7d0992be58f4df16e9b2c96f8445baf
+generated: "2022-11-25T11:05:40.48969+05:30"
--- a/Openshift4/helm/openshift-artifactory-ha/Chart.yaml
+++ b/Openshift4/helm/openshift-artifactory-ha/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 7.41.13
+appVersion: 7.46.11
 dependencies:
  - name: artifactory-ha
-    version: 107.41.13
+    version: 107.46.11
    repository: https://charts.jfrog.io/
 description: Openshift JFrog Artifactory HA subcharting Artifactory HA to work in Openshift environment
 home: https://www.jfrog.com/artifactory/
@@ -20,4 +20,4 @@ name: openshift-artifactory-ha
 sources:
 - https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
 - https://github.com/jfrog/charts
-version: 107.41.13
+version: 107.46.11
--- a/Openshift4/helm/openshift-artifactory-ha/values.yaml
+++ b/Openshift4/helm/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.41.13
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.46.11
  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.41.13
+      tag: 7.46.11
    node:
      replicaCount: 2
      waitForPrimaryStartup:
--- a/Openshift4/helm/openshift-xray/CHANGELOG.md
+++ b/Openshift4/helm/openshift-xray/CHANGELOG.md
@@ -1,9 +1,15 @@
 # JFrog  Openshift Artifactory-Xray Chart Changelog
 All changes to this chart will be documented in this file.

+## [103.60.2] Nov25, 2022
+* Updating to Xray chart version 103.60.2 and Xray app version 3.60.2
+
 ## [103.57.6] Oct03, 2022
 * Updating to Xray chart version 103.57.6 and Xray app version 3.57.6

+## [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

--- a/Openshift4/helm/openshift-xray/Chart.lock
+++ b/Openshift4/helm/openshift-xray/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: xray
  repository: https://charts.jfrog.io/
-  version: 103.57.6
-digest: sha256:f925aa2d8a335a656c86364d2b2deeb67c56959440294a50780be7b06c37a11c
-generated: "2022-09-30T10:32:23.619114+05:30"
+  version: 103.60.2
+digest: sha256:b4578b293c2be81adeceb66e9f43b7973be32e737c0229ced14b5d73a7ac24b8
+generated: "2022-11-25T11:09:13.66816+05:30"
--- a/Openshift4/helm/openshift-xray/Chart.yaml
+++ b/Openshift4/helm/openshift-xray/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 3.57.6
+appVersion: 3.60.2
 description: Universal component scan for security and license inventory and impact analysis
 dependencies:
  - name: xray
-    version: 103.57.6
+    version: 103.60.2
    repository: https://charts.jfrog.io/
 sources:
 - https://bintray.com/jfrog/product/xray/view
@@ -17,4 +17,4 @@ maintainers:
 - email: johnp@jfrog.com
  name: John Peterson
 name: openshift-xray
-version: 103.57.6
+version: 103.60.2
--- a/Openshift4/helm/openshift-xray/values.yaml
+++ b/Openshift4/helm/openshift-xray/values.yaml
@@ -11,13 +11,13 @@ xray:
    url: "OVERRIDE"
    user: "OVERRIDE"
    password: "OVERRIDE"
-  initContainerImage: registry.connect.redhat.com/jfrog/init:7.41.13
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.46.11
  common:
    rabbitmq:
      connectionConfigFromEnvironment: true
    xrayUserId: "1000721035"
    xrayGroupId: "1000721035"
-    xrayVersion: "3.57.6"
+    xrayVersion: "3.60.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.57.6
+      tag: 3.60.2
  
  # RabbitMQ
  ## Configuration values for the rabbitmq dependency
@@ -85,7 +85,7 @@ xray:
    image: 
      registry: registry.connect.redhat.com
      repository: jfrog/xray-rabbitmq
-      tag: 3.57.6
+      tag: 3.60.2

    podSecurityContext:
      fsGroup: 1000721001
--- a/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md
+++ b/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md
@@ -2,6 +2,14 @@

 All changes to this chart will be documented in this file.

+## [1.2.2] - Nov 25, 2022
+
+- Updating Operator to latest jfrog/artifactory-ha helm chart version 107.46.11 artifactory version 7.46.11
+
+## [1.2.1] - Nov 10, 2022
+
+- Updating Operator to latest jfrog/artifactory-ha helm chart version 107.41.13 artifactory version 7.41.13 and fix the image pull from registry
+
 ## [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
--- a/Openshift4/operator/artifactory-ha-operator/Dockerfile
+++ b/Openshift4/operator/artifactory-ha-operator/Dockerfile
@@ -1,6 +1,6 @@
 # Build the manager binary

-FROM quay.io/operator-framework/helm-operator:v1.23.0
+FROM quay.io/operator-framework/helm-operator:v1.25
 LABEL name="JFrog Artifactory Enterprise Operator" \
      description="Openshift operator to deploy JFrog Artifactory Enterprise based on the Red Hat Universal Base Image." \
      vendor="JFrog" \
--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md
@@ -1,12 +1,12 @@
 # JFrog  Openshift Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.

+## [107.46.11] -  Nov25, 2022
+* Updating to latest jfrog/artifactory-ha helm chart version 107.46.11 artifactory version 7.46.11
+
 ## [107.41.13] -  Oct03, 2022
 * Updating to latest jfrog/artifactory-ha helm chart version 107.41.13  artifactory version 7.41.13

-## [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

--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.lock
+++ b/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.41.13
-digest: sha256:2ed3129e3d0673e11e4258a5d2a0b664732441479d373c3db817f253d16dcd70
-generated: "2022-09-30T10:31:40.275678+05:30"
+  version: 107.46.11
+digest: sha256:59401ed163233f2025da593f27295461c7d0992be58f4df16e9b2c96f8445baf
+generated: "2022-11-25T11:05:40.48969+05:30"
--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 7.41.13
+appVersion: 7.46.11
 dependencies:
  - name: artifactory-ha
-    version: 107.41.13
+    version: 107.46.11
    repository: https://charts.jfrog.io/
 description: Openshift JFrog Artifactory HA subcharting Artifactory HA to work in Openshift environment
 home: https://www.jfrog.com/artifactory/
@@ -20,4 +20,4 @@ name: openshift-artifactory-ha
 sources:
 - https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
 - https://github.com/jfrog/charts
-version: 107.41.13
+version: 107.46.11
--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/values.yaml
+++ b/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.41.13
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.46.11
  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.41.13
+      tag: 7.46.11
    node:
      replicaCount: 2
      waitForPrimaryStartup:
--- a/Openshift4/operator/xray-operator/CHANGELOG.md
+++ b/Openshift4/operator/xray-operator/CHANGELOG.md
@@ -2,6 +2,10 @@

 All changes to this chart will be documented in this file.

+## [2.1.1] Nov 25, 2022
+
+- Deploying JFrog Xray 3.60.2 as an Operator into Openshift
+
 ## [2.1.0] Mar 01, 2022

 - Deploying JFrog Xray 3.43.1 as an Operator into Openshift and bug fix for upgrade issue
--- a/Openshift4/operator/xray-operator/Dockerfile
+++ b/Openshift4/operator/xray-operator/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM quay.io/operator-framework/helm-operator:v1.23.0
+FROM quay.io/operator-framework/helm-operator:v1.25
 LABEL name="JFrog Xray Enterprise Operator" \
      description="Openshift operator to deploy JFrog Xray Enterprise based on the Red Hat Universal Base Image" \
      vendor="JFrog" \
--- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md
+++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md
@@ -1,12 +1,12 @@
 # JFrog  Openshift Artifactory-Xray Chart Changelog
 All changes to this chart will be documented in this file.

+## [103.60.2] Nov25, 2022
+* Updating to Xray chart version 103.60.2 and Xray app version 3.60.2
+
 ## [103.57.6] Oct03, 2022
 * Updating to Xray chart version 103.57.6 and Xray app version 3.57.6

-## [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

--- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.lock
+++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: xray
  repository: https://charts.jfrog.io/
-  version: 103.57.6
-digest: sha256:f925aa2d8a335a656c86364d2b2deeb67c56959440294a50780be7b06c37a11c
-generated: "2022-09-30T10:32:23.619114+05:30"
+  version: 103.60.2
+digest: sha256:b4578b293c2be81adeceb66e9f43b7973be32e737c0229ced14b5d73a7ac24b8
+generated: "2022-11-25T11:09:13.66816+05:30"
--- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml
+++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 3.57.6
+appVersion: 3.60.2
 description: Universal component scan for security and license inventory and impact analysis
 dependencies:
  - name: xray
-    version: 103.57.6
+    version: 103.60.2
    repository: https://charts.jfrog.io/
 sources:
 - https://bintray.com/jfrog/product/xray/view
@@ -17,4 +17,4 @@ maintainers:
 - email: johnp@jfrog.com
  name: John Peterson
 name: openshift-xray
-version: 103.57.6
+version: 103.60.2
--- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml
+++ b/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.41.13
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.46.11
  common:
    rabbitmq:
      connectionConfigFromEnvironment: true
    xrayUserId: "1000721035"
    xrayGroupId: "1000721035"
-    xrayVersion: "3.57.6"
+    xrayVersion: "3.60.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.57.6
+      tag: 3.60.2
  
  # RabbitMQ
  ## Configuration values for the rabbitmq dependency
@@ -85,7 +85,7 @@ xray:
    image: 
      registry: registry.connect.redhat.com
      repository: jfrog/xray-rabbitmq
-      tag: 3.57.6
+      tag: 3.60.2

    podSecurityContext:
      fsGroup: 1000721001