From 39f9450ba6e7de824cb938e2edb4777788db92e0 Mon Sep 17 00:00:00 2001 From: Aayush-sood94 Date: Wed, 28 Apr 2021 23:51:12 +0530 Subject: [PATCH] Updated the helm charts for xray with the current working version (3.18.1) --- Openshift4/helm/openshift-xray/CHANGELOG.md | 3 --- Openshift4/helm/openshift-xray/Chart.yaml | 4 ++-- Openshift4/helm/openshift-xray/requirements.lock | 6 +++--- Openshift4/helm/openshift-xray/requirements.yaml | 2 +- Openshift4/helm/openshift-xray/values.yaml | 8 ++++---- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Openshift4/helm/openshift-xray/CHANGELOG.md b/Openshift4/helm/openshift-xray/CHANGELOG.md index 2256dff..bf07493 100644 --- a/Openshift4/helm/openshift-xray/CHANGELOG.md +++ b/Openshift4/helm/openshift-xray/CHANGELOG.md @@ -1,9 +1,6 @@ # JFrog Openshift Artifactory-Xray Chart Changelog All changes to this chart will be documented in this file. -## [7.6.0] Apr 14, 2021 -* Updating to Xray chart version 7.6.0 and Xray app version 3.21.2 - ## [7.1.1] Mar 11, 2021 * Updating to Xray chart version 7.1.1 and Xray app version 3.18.1 diff --git a/Openshift4/helm/openshift-xray/Chart.yaml b/Openshift4/helm/openshift-xray/Chart.yaml index 1d83493..dea54db 100644 --- a/Openshift4/helm/openshift-xray/Chart.yaml +++ b/Openshift4/helm/openshift-xray/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 3.21.2 +appVersion: 3.18.1 description: Universal component scan for security and license inventory and impact analysis sources: - https://bintray.com/jfrog/product/xray/view @@ -13,4 +13,4 @@ maintainers: - email: johnp@jfrog.com name: John Peterson name: openshift-xray -version: 7.6.0 +version: 7.1.1 diff --git a/Openshift4/helm/openshift-xray/requirements.lock b/Openshift4/helm/openshift-xray/requirements.lock index 902d08e..1a1b6ed 100644 --- a/Openshift4/helm/openshift-xray/requirements.lock +++ b/Openshift4/helm/openshift-xray/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: xray repository: https://charts.jfrog.io/ - version: 7.6.0 -digest: sha256:afc1559a744f3c2464f32367fbf86b7f6728c1249d7dade15cfc39a69e18da22 -generated: "2021-04-15T01:49:21.822944+05:30" + version: 7.1.1 +digest: sha256:6bdbff052d42f9360f9d6a6c6a11f30834cf052c2eb1d7545fecec1e529f8378 +generated: "2021-04-28T23:47:11.7328972+05:30" diff --git a/Openshift4/helm/openshift-xray/requirements.yaml b/Openshift4/helm/openshift-xray/requirements.yaml index 368d4b1..a8a2e44 100644 --- a/Openshift4/helm/openshift-xray/requirements.yaml +++ b/Openshift4/helm/openshift-xray/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: xray - version: 7.6.0 + version: 7.1.1 repository: https://charts.jfrog.io/ diff --git a/Openshift4/helm/openshift-xray/values.yaml b/Openshift4/helm/openshift-xray/values.yaml index 86abf52..ad7fdea 100644 --- 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.17.5-11 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.15.4-1 common: rabbitmq: connectionConfigFromEnvironment: true xrayUserId: "1000721035" xrayGroupId: "1000721035" - xrayVersion: "3.21.2-16" + xrayVersion: "3.18.1-1" 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.21.2-16 + tag: 3.18.1-1 rabbitmq-ha: enabled: false # RabbitMQ @@ -85,7 +85,7 @@ xray: image: registry: registry.connect.redhat.com repository: jfrog/xray-rabbitmq - tag: 3.21.2-16 + tag: 3.18.1-1 podSecurityContext: fsGroup: 1000721001 runAsUser: 1000721001