From 826e24c62473d3900beed7cd94dad4d2a61c2c86 Mon Sep 17 00:00:00 2001 From: Logeshwarsn Date: Thu, 29 Sep 2022 12:53:18 +0530 Subject: [PATCH] Changes in RT and Xray version 7.41.13 and 3.57.6 --- .../openshift-artifactory-ha/CHANGELOG.md | 3 + .../helm/openshift-artifactory-ha/Chart.lock | 6 +- .../helm/openshift-artifactory-ha/Chart.yaml | 6 +- .../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/README.md | 2 +- Openshift4/helm/openshift-xray/values.yaml | 8 +- .../openshift-artifactory-ha/CHANGELOG.md | 99 +++++++------------ .../openshift-artifactory-ha/Chart.lock | 6 +- .../openshift-artifactory-ha/Chart.yaml | 26 +++-- .../openshift-artifactory-ha/values.yaml | 4 +- .../helm-charts/openshift-xray/CHANGELOG.md | 60 +++++------ .../helm-charts/openshift-xray/Chart.lock | 6 +- .../helm-charts/openshift-xray/Chart.yaml | 24 +++-- .../helm-charts/openshift-xray/README.md | 2 +- .../helm-charts/openshift-xray/values.yaml | 26 ++--- 18 files changed, 132 insertions(+), 165 deletions(-) diff --git a/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md b/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md index e714f7b..d4ab93f 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.41.13] - Oct03, 2022 +* Updating to latest jfrog/artifactory-ha helm chart version 107.41.13 artifactory version 7.41.13 + ## [107.27.9] - Dec15, 2021 * Updating to latest jfrog/artifactory-ha helm chart version 107.27.9 artifactory version 7.27.9 diff --git a/Openshift4/helm/openshift-artifactory-ha/Chart.lock b/Openshift4/helm/openshift-artifactory-ha/Chart.lock index 368c6b8..5e9ce16 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.27.9 -digest: sha256:64caef98d9cd6743d5827baaa2d8d9082eb116525376a30606a44686e10e8927 -generated: "2021-12-20T16:51:54.6150877+05:30" + version: 107.41.13 +digest: sha256:2ed3129e3d0673e11e4258a5d2a0b664732441479d373c3db817f253d16dcd70 +generated: "2022-09-30T10:31:40.275678+05:30" diff --git a/Openshift4/helm/openshift-artifactory-ha/Chart.yaml b/Openshift4/helm/openshift-artifactory-ha/Chart.yaml index 6fc377b..2d89dc0 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.27.9 +appVersion: 7.41.13 dependencies: - name: artifactory-ha - version: 107.27.9 + version: 107.41.13 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.27.9 +version: 107.41.13 diff --git a/Openshift4/helm/openshift-artifactory-ha/values.yaml b/Openshift4/helm/openshift-artifactory-ha/values.yaml index ab5a55e..6bc4549 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.27.9-1 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.41.13 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.41.13 node: replicaCount: 2 waitForPrimaryStartup: diff --git a/Openshift4/helm/openshift-xray/CHANGELOG.md b/Openshift4/helm/openshift-xray/CHANGELOG.md index 9cd921f..93ccc19 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.57.6] Oct03, 2022 +* Updating to Xray chart version 103.57.6 and Xray app version 3.57.6 + ## [103.35.0] Dec 12, 2021 * Updating to Xray chart version 103.35.0 and Xray app version 3.35.0 diff --git a/Openshift4/helm/openshift-xray/Chart.lock b/Openshift4/helm/openshift-xray/Chart.lock index d4dcb3e..cc8a818 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.35.0 -digest: sha256:d790ad3ebfc0f6f98766577eec4d2f3557d2ca3900a1ff796f52cfb96c213238 -generated: "2021-12-20T16:58:34.446753+05:30" + version: 103.57.6 +digest: sha256:f925aa2d8a335a656c86364d2b2deeb67c56959440294a50780be7b06c37a11c +generated: "2022-09-30T10:32:23.619114+05:30" diff --git a/Openshift4/helm/openshift-xray/Chart.yaml b/Openshift4/helm/openshift-xray/Chart.yaml index ec40f3d..ab37fe1 100644 --- a/Openshift4/helm/openshift-xray/Chart.yaml +++ b/Openshift4/helm/openshift-xray/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 3.35.0 +appVersion: 3.57.6 description: Universal component scan for security and license inventory and impact analysis dependencies: - name: xray - version: 103.35.0 + version: 103.57.6 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.35.0 +version: 103.57.6 diff --git a/Openshift4/helm/openshift-xray/README.md b/Openshift4/helm/openshift-xray/README.md index 8337dcd..f1820ff 100644 --- a/Openshift4/helm/openshift-xray/README.md +++ b/Openshift4/helm/openshift-xray/README.md @@ -43,7 +43,7 @@ helm upgrade --install openshift-xray . \ --set xray.database.url=postgres://$POSTGRES_HOST:5432/xraydb?sslmode=disable \ --set xray.database.user=artifactory \ --set xray.database.password=password \ - --set xray.xray.jfrogUrl=http://openshift-artifactory-ha-nginx" \ + --set xray.xray.jfrogUrl="http://openshift-artifactory-ha-nginx" \ --set xray.xray.joinKey=$JOIN_KEY \ --set xray.xray.masterKey=$MASTER_KEY ```` diff --git a/Openshift4/helm/openshift-xray/values.yaml b/Openshift4/helm/openshift-xray/values.yaml index 17efd92..32b7da4 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.27.9-1 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.41.13 common: rabbitmq: connectionConfigFromEnvironment: true xrayUserId: "1000721035" xrayGroupId: "1000721035" - xrayVersion: "3.35.0-1" + xrayVersion: "3.57.6" 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.57.6 # RabbitMQ ## Configuration values for the rabbitmq dependency @@ -85,7 +85,7 @@ xray: image: registry: registry.connect.redhat.com repository: jfrog/xray-rabbitmq - tag: 3.35.0-1 + tag: 3.57.6 podSecurityContext: fsGroup: 1000721001 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 c07e986..ac2cace 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,105 +1,82 @@ -# JFrog Openshift Artifactory-ha Chart Changelog - +# JFrog Openshift Artifactory-ha Chart Changelog All changes to this chart will be documented in this file. +## [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 -- 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 -## [107.27.9] - Dec15, 2021 +## [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.9 artifactory version 7.27.9 +## [107.25.7] - Sep15, 2021 +* Updating to latest jfrog/artifactory-ha helm chart version 107.25.7 artifactory version 7.25.7 -## [107.27.3] - Oct01, 2021 +## [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.27.3 artifactory version 7.27.3 +## [107.18.6] - May21, 2021 +* Updating to latest jfrog/artifactory-ha helm chart version 107.18.6 artifactory version 7.18.6 -## [107.25.7] - Sep15, 2021 +## [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 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 - -## [107.18.6] - May21, 2021 - -- 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 - -## [4.10.0] - Mar 18, 2021 - -- Updating to latest jfrog/artifactory-ha helm chart version 4.10.0 artifactory version 7.16.3 +## [4.10.0] - Mar 18, 2021 +* 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 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 d4c6694..5e9ce16 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.33.12 -digest: sha256:bb0facd8523c53324a9668fae3609df0e24e7d5b0fa52f886c975cf818aea08c -generated: "2022-02-23T23:46:02.205109+05:30" + version: 107.41.13 +digest: sha256:2ed3129e3d0673e11e4258a5d2a0b664732441479d373c3db817f253d16dcd70 +generated: "2022-09-30T10:31:40.275678+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 a1d534b..2d89dc0 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,25 +1,23 @@ apiVersion: v2 -appVersion: 7.33.12 +appVersion: 7.41.13 dependencies: - name: artifactory-ha - version: 107.33.12 + version: 107.41.13 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 - - jfrog - - devops +- artifactory +- jfrog +- devops maintainers: - - email: girir@jfrog.com - name: Giridharan Ramasamy - - email: vinaya@jfrog.com - name: Vinay Aggarwal - - email: johnp@jfrog.com - name: John Peterson +- email: vinaya@jfrog.com + name: Vinay Aggarwal +- email: johnp@jfrog.com + name: John Peterson name: openshift-artifactory-ha sources: - - https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view - - https://github.com/jfrog/charts -version: 107.33.12 +- https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view +- https://github.com/jfrog/charts +version: 107.41.13 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 34210ec..6bc4549 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.33.12-1 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.41.13 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.33.12-1 + tag: 7.41.13 node: replicaCount: 2 waitForPrimaryStartup: 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 a8a740f..c9c0804 100644 --- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md +++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md @@ -1,75 +1,59 @@ -# JFrog Openshift Artifactory-Xray Chart Changelog - +# JFrog Openshift Artifactory-Xray Chart Changelog All changes to this chart will be documented in this file. -## [103.43.1] Mar 1, 2022 +## [103.57.6] Oct03, 2022 +* Updating to Xray chart version 103.57.6 and Xray app version 3.57.6 -- Updating to Xray chart version 103.43.1 and Xray app version 3.43.1 +## [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 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 96afb79..cc8a818 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.43.1 -digest: sha256:ebdbd89c079bda4db7f412df6bb2e4e7bc716d3587f8c1c6f049d392e3cc20ae -generated: "2022-02-24T00:21:56.505405+05:30" + version: 103.57.6 +digest: sha256:f925aa2d8a335a656c86364d2b2deeb67c56959440294a50780be7b06c37a11c +generated: "2022-09-30T10:32:23.619114+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 29e82fc..ab37fe1 100644 --- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml +++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml @@ -1,22 +1,20 @@ apiVersion: v2 -appVersion: 3.43.1 +appVersion: 3.57.6 description: Universal component scan for security and license inventory and impact analysis dependencies: - name: xray - version: 103.43.1 + version: 103.57.6 repository: https://charts.jfrog.io/ sources: - - https://bintray.com/jfrog/product/xray/view - - https://github.com/jfrog/charts +- https://bintray.com/jfrog/product/xray/view +- https://github.com/jfrog/charts keywords: - - xray - - jfrog +- xray +- jfrog maintainers: - - email: girir@jfrog.com - name: Giridharan Ramasamy - - email: vinaya@jfrog.com - name: Vinay Aggarwal - - email: johnp@jfrog.com - name: John Peterson +- email: vinaya@jfrog.com + name: Vinay Aggarwal +- email: johnp@jfrog.com + name: John Peterson name: openshift-xray -version: 103.43.1 +version: 103.57.6 diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/README.md b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/README.md index 8337dcd..f1820ff 100644 --- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/README.md +++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/README.md @@ -43,7 +43,7 @@ helm upgrade --install openshift-xray . \ --set xray.database.url=postgres://$POSTGRES_HOST:5432/xraydb?sslmode=disable \ --set xray.database.user=artifactory \ --set xray.database.password=password \ - --set xray.xray.jfrogUrl=http://openshift-artifactory-ha-nginx" \ + --set xray.xray.jfrogUrl="http://openshift-artifactory-ha-nginx" \ --set xray.xray.joinKey=$JOIN_KEY \ --set xray.xray.masterKey=$MASTER_KEY ```` 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 0319112..32b7da4 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.33.12-1 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.41.13 common: rabbitmq: connectionConfigFromEnvironment: true xrayUserId: "1000721035" xrayGroupId: "1000721035" - xrayVersion: "3.43.1-2" + xrayVersion: "3.57.6" customInitContainers: | - name: "prepare-uid-persistent-volume" image: "{{ .Values.initContainerImage }}" @@ -71,8 +71,8 @@ xray: registry: registry.connect.redhat.com repository: jfrog/xray-router imagePullPolicy: IfNotPresent - tag: 3.43.1-2 - + tag: 3.57.6 + # RabbitMQ ## Configuration values for the rabbitmq dependency ## ref: https://github.com/bitnami/charts/blob/master/bitnami/rabbitmq/README.md @@ -81,16 +81,17 @@ xray: replicaCount: 1 rbac: create: true - - image: + + image: registry: registry.connect.redhat.com repository: jfrog/xray-rabbitmq - tag: 3.43.1-2 + tag: 3.57.6 podSecurityContext: fsGroup: 1000721001 runAsUser: 1000721001 - + + auth: username: xray password: xray @@ -102,7 +103,7 @@ xray: ## Enable encryption to rabbitmq ## ref: https://www.rabbitmq.com/ssl.html ## - + tls: enabled: false failIfNoPeerCert: true @@ -110,6 +111,9 @@ xray: #caCertificate: |- #serverCertificate: |- #serverKey: |- + + + livenessProbe: initialDelaySeconds: 120 @@ -120,7 +124,7 @@ xray: command: - /bin/sh - -c - - "rabbitmqctl status" + - 'rabbitmqctl status' readinessProbe: initialDelaySeconds: 20 periodSeconds: 5 @@ -130,4 +134,4 @@ xray: command: - /bin/sh - -c - - "rabbitmqctl status" + - 'rabbitmqctl status'