From ada5ab01d4e56e8ca4190631787c85dcbf76c2e9 Mon Sep 17 00:00:00 2001 From: logeshwarsn Date: Wed, 22 Nov 2023 16:15:13 +0530 Subject: [PATCH] openshift rt-7.71.5 and xray-3.85.5 --- Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md | 3 +++ Openshift4/helm/openshift-artifactory-ha/Chart.lock | 6 +++--- Openshift4/helm/openshift-artifactory-ha/Chart.yaml | 6 +++--- Openshift4/helm/openshift-artifactory-ha/values.yaml | 4 ++-- Openshift4/helm/openshift-xray/CHANGELOG.md | 3 +++ Openshift4/helm/openshift-xray/Chart.lock | 6 +++--- Openshift4/helm/openshift-xray/Chart.yaml | 6 +++--- Openshift4/helm/openshift-xray/values.yaml | 8 ++++---- Openshift4/operator/artifactory-ha-operator/CHANGELOG.md | 4 ++++ .../helm-charts/openshift-artifactory-ha/CHANGELOG.md | 3 +++ .../helm-charts/openshift-artifactory-ha/Chart.lock | 6 +++--- .../helm-charts/openshift-artifactory-ha/Chart.yaml | 6 +++--- .../helm-charts/openshift-artifactory-ha/values.yaml | 4 ++-- Openshift4/operator/xray-operator/CHANGELOG.md | 4 ++++ .../xray-operator/helm-charts/openshift-xray/CHANGELOG.md | 3 +++ .../xray-operator/helm-charts/openshift-xray/Chart.lock | 6 +++--- .../xray-operator/helm-charts/openshift-xray/Chart.yaml | 6 +++--- .../xray-operator/helm-charts/openshift-xray/values.yaml | 8 ++++---- 18 files changed, 56 insertions(+), 36 deletions(-) diff --git a/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md b/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md index 507bfc73..bac10f5f 100755 --- 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.71.5] - Nov 22, 2023 +* Updating to latest jfrog/artifactory-ha helm chart version 107.71.5 artifactory version 7.71.5 + ## [107.59.11] - Jul 01, 2023 * Updating to latest jfrog/artifactory-ha helm chart version 107.59.11 artifactory version 7.59.11 diff --git a/Openshift4/helm/openshift-artifactory-ha/Chart.lock b/Openshift4/helm/openshift-artifactory-ha/Chart.lock index 4b7cca91..cb590108 100644 --- 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.59.11 -digest: sha256:db297e6303ab99e3020c22f4de8b2993923f8f65efeb67e610a1883b2c394f2d -generated: "2023-07-01T07:19:21.566291+05:30" + version: 107.71.5 +digest: sha256:aefe89dd52b41feab8744741683df1d01e2ab6bc289ca039a1640b901d16e1f4 +generated: "2023-11-22T14:42:06.928341+05:30" diff --git a/Openshift4/helm/openshift-artifactory-ha/Chart.yaml b/Openshift4/helm/openshift-artifactory-ha/Chart.yaml index 77fb3e1f..1f7b61cb 100755 --- a/Openshift4/helm/openshift-artifactory-ha/Chart.yaml +++ b/Openshift4/helm/openshift-artifactory-ha/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 7.59.11 +appVersion: 7.71.5 dependencies: - name: artifactory-ha - version: 107.59.11 + version: 107.71.5 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.59.11 +version: 107.71.5 diff --git a/Openshift4/helm/openshift-artifactory-ha/values.yaml b/Openshift4/helm/openshift-artifactory-ha/values.yaml index ec8343a9..7194ab33 100755 --- 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.59.11 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.71.5 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.59.11 + tag: 7.71.5 node: replicaCount: 2 waitForPrimaryStartup: diff --git a/Openshift4/helm/openshift-xray/CHANGELOG.md b/Openshift4/helm/openshift-xray/CHANGELOG.md index 58082dc3..7c12c322 100644 --- a/Openshift4/helm/openshift-xray/CHANGELOG.md +++ b/Openshift4/helm/openshift-xray/CHANGELOG.md @@ -1,6 +1,9 @@ # JFrog Openshift Artifactory-Xray Chart Changelog All changes to this chart will be documented in this file. +## [103.85.5] Nov 22, 2023 +* Updating to Xray chart version 103.85.5 and Xray app version 3.85.5 + ## [103.76.7] Jul 01, 2023 * Updating to Xray chart version 103.76.7 and Xray app version 3.76.7 diff --git a/Openshift4/helm/openshift-xray/Chart.lock b/Openshift4/helm/openshift-xray/Chart.lock index f270bdb0..819af7e6 100644 --- 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.76.7 -digest: sha256:89b1379dc0987f379a119587927e4d83b96435b17b6521834e2ba1597619b0fc -generated: "2023-07-01T07:16:53.336316+05:30" + version: 103.85.5 +digest: sha256:67c63c7a5fd0b3b16c9b93d568184a4693b76034148924c9509a559707edab9d +generated: "2023-11-22T14:47:02.076277+05:30" diff --git a/Openshift4/helm/openshift-xray/Chart.yaml b/Openshift4/helm/openshift-xray/Chart.yaml index 85a55101..a82e16e6 100644 --- a/Openshift4/helm/openshift-xray/Chart.yaml +++ b/Openshift4/helm/openshift-xray/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 3.76.7 +appVersion: 3.85.5 description: Universal component scan for security and license inventory and impact analysis dependencies: - name: xray - version: 103.76.7 + version: 103.85.5 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.76.7 +version: 103.85.5 diff --git a/Openshift4/helm/openshift-xray/values.yaml b/Openshift4/helm/openshift-xray/values.yaml index 382a8906..3f42e0c0 100755 --- 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.59.11 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.71.5 common: rabbitmq: connectionConfigFromEnvironment: true xrayUserId: "1000721035" xrayGroupId: "1000721035" - xrayVersion: "3.76.7" + xrayVersion: "3.85.5" 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.76.7 + tag: 3.85.5 # RabbitMQ ## Configuration values for the rabbitmq dependency @@ -85,7 +85,7 @@ xray: image: registry: registry.connect.redhat.com repository: jfrog/xray-rabbitmq - tag: 3.71.6 + tag: 3.85.5 podSecurityContext: fsGroup: 1000721001 diff --git a/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md b/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md index 05d975f7..a0185844 100755 --- a/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md +++ b/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md @@ -2,6 +2,10 @@ All changes to this chart will be documented in this file. +## [1.2.5] - Nov 22, 2023 + +- Updating Operator to latest jfrog/artifactory-ha helm chart version 107.71.5 artifactory version 7.71.5 + ## [1.2.4] - Mar 06, 2023 - Updating Operator to latest jfrog/artifactory-ha helm chart version 107.59.11 artifactory version 7.59.11 diff --git 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 index 507bfc73..bac10f5f 100755 --- 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,6 +1,9 @@ # JFrog Openshift Artifactory-ha Chart Changelog All changes to this chart will be documented in this file. +## [107.71.5] - Nov 22, 2023 +* Updating to latest jfrog/artifactory-ha helm chart version 107.71.5 artifactory version 7.71.5 + ## [107.59.11] - Jul 01, 2023 * Updating to latest jfrog/artifactory-ha helm chart version 107.59.11 artifactory version 7.59.11 diff --git 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 index 4b7cca91..cb590108 100644 --- 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.59.11 -digest: sha256:db297e6303ab99e3020c22f4de8b2993923f8f65efeb67e610a1883b2c394f2d -generated: "2023-07-01T07:19:21.566291+05:30" + version: 107.71.5 +digest: sha256:aefe89dd52b41feab8744741683df1d01e2ab6bc289ca039a1640b901d16e1f4 +generated: "2023-11-22T14:42:06.928341+05:30" diff --git 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 index 77fb3e1f..1f7b61cb 100755 --- 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.59.11 +appVersion: 7.71.5 dependencies: - name: artifactory-ha - version: 107.59.11 + version: 107.71.5 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.59.11 +version: 107.71.5 diff --git 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 index ec8343a9..7194ab33 100755 --- 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.59.11 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.71.5 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.59.11 + tag: 7.71.5 node: replicaCount: 2 waitForPrimaryStartup: diff --git a/Openshift4/operator/xray-operator/CHANGELOG.md b/Openshift4/operator/xray-operator/CHANGELOG.md index 5a2d2c0b..85e7ea82 100644 --- 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.4] Nov 22, 2023 + +- Deploying JFrog Xray 3.85.5 as an Operator into Openshift + ## [2.1.3] Jul 06, 2023 - Deploying JFrog Xray 3.76.7 as an Operator into Openshift diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md index 58082dc3..7c12c322 100644 --- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md +++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md @@ -1,6 +1,9 @@ # JFrog Openshift Artifactory-Xray Chart Changelog All changes to this chart will be documented in this file. +## [103.85.5] Nov 22, 2023 +* Updating to Xray chart version 103.85.5 and Xray app version 3.85.5 + ## [103.76.7] Jul 01, 2023 * Updating to Xray chart version 103.76.7 and Xray app version 3.76.7 diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.lock b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.lock index f270bdb0..819af7e6 100644 --- 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.76.7 -digest: sha256:89b1379dc0987f379a119587927e4d83b96435b17b6521834e2ba1597619b0fc -generated: "2023-07-01T07:16:53.336316+05:30" + version: 103.85.5 +digest: sha256:67c63c7a5fd0b3b16c9b93d568184a4693b76034148924c9509a559707edab9d +generated: "2023-11-22T14:47:02.076277+05:30" diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml index 85a55101..a82e16e6 100644 --- 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.76.7 +appVersion: 3.85.5 description: Universal component scan for security and license inventory and impact analysis dependencies: - name: xray - version: 103.76.7 + version: 103.85.5 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.76.7 +version: 103.85.5 diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml index 382a8906..3f42e0c0 100755 --- 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.59.11 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.71.5 common: rabbitmq: connectionConfigFromEnvironment: true xrayUserId: "1000721035" xrayGroupId: "1000721035" - xrayVersion: "3.76.7" + xrayVersion: "3.85.5" 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.76.7 + tag: 3.85.5 # RabbitMQ ## Configuration values for the rabbitmq dependency @@ -85,7 +85,7 @@ xray: image: registry: registry.connect.redhat.com repository: jfrog/xray-rabbitmq - tag: 3.71.6 + tag: 3.85.5 podSecurityContext: fsGroup: 1000721001