From 619c67445eedf40e6654eb9687a6e83b8c35cb92 Mon Sep 17 00:00:00 2001 From: Aayush-sood94 Date: Thu, 15 Apr 2021 01:52:19 +0530 Subject: [PATCH] Updated RT & X-ray versions --- Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md | 7 +++++++ Openshift4/helm/openshift-artifactory-ha/Chart.yaml | 4 ++-- .../helm/openshift-artifactory-ha/requirements.lock | 6 +++--- .../helm/openshift-artifactory-ha/requirements.yaml | 2 +- Openshift4/helm/openshift-artifactory-ha/values.yaml | 4 ++-- Openshift4/helm/openshift-xray/CHANGELOG.md | 6 ++++++ Openshift4/helm/openshift-xray/Chart.yaml | 4 ++-- Openshift4/helm/openshift-xray/helminstall.sh | 0 Openshift4/helm/openshift-xray/requirements.lock | 6 +++--- Openshift4/helm/openshift-xray/requirements.yaml | 2 +- Openshift4/helm/openshift-xray/values.yaml | 8 ++++---- 11 files changed, 31 insertions(+), 18 deletions(-) mode change 100644 => 100755 Openshift4/helm/openshift-xray/helminstall.sh diff --git a/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md b/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md index bea1158..a9a33c1 100755 --- a/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md +++ b/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md @@ -1,6 +1,13 @@ # JFrog Openshift Artifactory-ha Chart Changelog All changes to this chart will be documented in this file. + +## [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.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 diff --git a/Openshift4/helm/openshift-artifactory-ha/Chart.yaml b/Openshift4/helm/openshift-artifactory-ha/Chart.yaml index 08624a1..d512554 100755 --- a/Openshift4/helm/openshift-artifactory-ha/Chart.yaml +++ b/Openshift4/helm/openshift-artifactory-ha/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 7.15.3 +appVersion: 7.17.5 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 @@ -16,4 +16,4 @@ name: openshift-artifactory-ha sources: - https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view - https://github.com/jfrog/charts -version: 4.9.1 +version: 4.13.0 diff --git a/Openshift4/helm/openshift-artifactory-ha/requirements.lock b/Openshift4/helm/openshift-artifactory-ha/requirements.lock index 957f3ac..9072491 100644 --- a/Openshift4/helm/openshift-artifactory-ha/requirements.lock +++ b/Openshift4/helm/openshift-artifactory-ha/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: artifactory-ha repository: https://charts.jfrog.io/ - version: 4.9.3 -digest: sha256:68ee44570afdf4537a708ab4e2a0466cc21ebbb196035b029cfd1ae193243d72 -generated: "2021-03-05T14:24:22.234216-08:00" + version: 4.13.0 +digest: sha256:38f7fbe754e5f9a71b1e4ac49607063f83f5e7c7e964f19a1d8a8ffffd895597 +generated: "2021-04-15T01:24:29.2028211+05:30" diff --git a/Openshift4/helm/openshift-artifactory-ha/requirements.yaml b/Openshift4/helm/openshift-artifactory-ha/requirements.yaml index 99fa23e..9b5c57e 100644 --- a/Openshift4/helm/openshift-artifactory-ha/requirements.yaml +++ b/Openshift4/helm/openshift-artifactory-ha/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: artifactory-ha - version: 4.9.3 + version: 4.13.0 repository: https://charts.jfrog.io/ diff --git a/Openshift4/helm/openshift-artifactory-ha/values.yaml b/Openshift4/helm/openshift-artifactory-ha/values.yaml index 4be668a..fb58b21 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.15.4-1 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.17.5-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.15.4-1 + tag: 7.17.5-11 node: replicaCount: 2 waitForPrimaryStartup: diff --git a/Openshift4/helm/openshift-xray/CHANGELOG.md b/Openshift4/helm/openshift-xray/CHANGELOG.md index 388aeae..2256dff 100644 --- a/Openshift4/helm/openshift-xray/CHANGELOG.md +++ b/Openshift4/helm/openshift-xray/CHANGELOG.md @@ -1,6 +1,12 @@ # 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 + ## [7.0.2] Feb 19th, 2021 * BREAKING CHANGE rabbitmq ha deprecation for rabbitmq diff --git a/Openshift4/helm/openshift-xray/Chart.yaml b/Openshift4/helm/openshift-xray/Chart.yaml index 31f18c8..1d83493 100644 --- a/Openshift4/helm/openshift-xray/Chart.yaml +++ b/Openshift4/helm/openshift-xray/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 3.17.4 +appVersion: 3.21.2 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.0.2 +version: 7.6.0 diff --git a/Openshift4/helm/openshift-xray/helminstall.sh b/Openshift4/helm/openshift-xray/helminstall.sh old mode 100644 new mode 100755 diff --git a/Openshift4/helm/openshift-xray/requirements.lock b/Openshift4/helm/openshift-xray/requirements.lock index ba5350c..902d08e 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.0.2 -digest: sha256:5657853c9c2a68dfb6ab755d42916cf688d6ff1ebf174bafa8cb059873d40caf -generated: "2021-02-22T21:58:10.2870716+05:30" + version: 7.6.0 +digest: sha256:afc1559a744f3c2464f32367fbf86b7f6728c1249d7dade15cfc39a69e18da22 +generated: "2021-04-15T01:49:21.822944+05:30" diff --git a/Openshift4/helm/openshift-xray/requirements.yaml b/Openshift4/helm/openshift-xray/requirements.yaml index bf5a117..368d4b1 100644 --- a/Openshift4/helm/openshift-xray/requirements.yaml +++ b/Openshift4/helm/openshift-xray/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: xray - version: 7.0.2 + version: 7.6.0 repository: https://charts.jfrog.io/ diff --git a/Openshift4/helm/openshift-xray/values.yaml b/Openshift4/helm/openshift-xray/values.yaml index abdd380..86abf52 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.15.3-1 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.17.5-11 common: rabbitmq: connectionConfigFromEnvironment: true xrayUserId: "1000721035" xrayGroupId: "1000721035" - xrayVersion: "3.17.4-1" + xrayVersion: "3.21.2-16" 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.17.4-1 + tag: 3.21.2-16 rabbitmq-ha: enabled: false # RabbitMQ @@ -85,7 +85,7 @@ xray: image: registry: registry.connect.redhat.com repository: jfrog/xray-rabbitmq - tag: 3.17.4-1 + tag: 3.21.2-16 podSecurityContext: fsGroup: 1000721001 runAsUser: 1000721001