From 14890b1304ceff8210b225a417fed5aa382a2b43 Mon Sep 17 00:00:00 2001 From: Aayush-sood94 Date: Thu, 27 May 2021 20:08:38 +0530 Subject: [PATCH] Updated Xray w/ 3.23.0 --- Openshift4/helm/openshift-xray/CHANGELOG.md | 3 ++ Openshift4/helm/openshift-xray/Chart.lock | 6 +++ Openshift4/helm/openshift-xray/Chart.yaml | 10 +++-- .../helm/openshift-xray/requirements.lock | 6 --- .../helm/openshift-xray/requirements.yaml | 4 -- Openshift4/helm/openshift-xray/values.yaml | 43 +++++++------------ 6 files changed, 32 insertions(+), 40 deletions(-) create mode 100644 Openshift4/helm/openshift-xray/Chart.lock delete mode 100644 Openshift4/helm/openshift-xray/requirements.lock delete mode 100644 Openshift4/helm/openshift-xray/requirements.yaml mode change 100644 => 100755 Openshift4/helm/openshift-xray/values.yaml diff --git a/Openshift4/helm/openshift-xray/CHANGELOG.md b/Openshift4/helm/openshift-xray/CHANGELOG.md index bf07493..b0d114a 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. +## [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 + ## [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.lock b/Openshift4/helm/openshift-xray/Chart.lock new file mode 100644 index 0000000..1f42377 --- /dev/null +++ b/Openshift4/helm/openshift-xray/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: xray + repository: https://charts.jfrog.io/ + version: 8.0.0 +digest: sha256:dfe6780d6eb15cf33ed7b4adeb3e85bb8d4c92f8f213873aba3563c608f3e6f3 +generated: "2021-05-11T23:15:08.2573327+05:30" diff --git a/Openshift4/helm/openshift-xray/Chart.yaml b/Openshift4/helm/openshift-xray/Chart.yaml index dea54db..d79222a 100644 --- a/Openshift4/helm/openshift-xray/Chart.yaml +++ b/Openshift4/helm/openshift-xray/Chart.yaml @@ -1,6 +1,10 @@ -apiVersion: v1 -appVersion: 3.18.1 +apiVersion: v2 +appVersion: 3.23.0 description: Universal component scan for security and license inventory and impact analysis +dependencies: + - name: xray + version: 8.0.0 + repository: https://charts.jfrog.io/ sources: - https://bintray.com/jfrog/product/xray/view - https://github.com/jfrog/charts @@ -13,4 +17,4 @@ maintainers: - email: johnp@jfrog.com name: John Peterson name: openshift-xray -version: 7.1.1 +version: 8.0.0 diff --git a/Openshift4/helm/openshift-xray/requirements.lock b/Openshift4/helm/openshift-xray/requirements.lock deleted file mode 100644 index 1a1b6ed..0000000 --- a/Openshift4/helm/openshift-xray/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: xray - repository: https://charts.jfrog.io/ - 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 deleted file mode 100644 index a8a2e44..0000000 --- a/Openshift4/helm/openshift-xray/requirements.yaml +++ /dev/null @@ -1,4 +0,0 @@ -dependencies: - - name: xray - 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 old mode 100644 new mode 100755 index ad7fdea..52dea8b --- 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.4-1 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.18.6-1 common: rabbitmq: connectionConfigFromEnvironment: true xrayUserId: "1000721035" xrayGroupId: "1000721035" - xrayVersion: "3.18.1-1" + xrayVersion: "3.23.0-11" customInitContainers: | - name: "prepare-uid-persistent-volume" image: "{{ .Values.initContainerImage }}" @@ -71,9 +71,8 @@ xray: registry: registry.connect.redhat.com repository: jfrog/xray-router imagePullPolicy: IfNotPresent - tag: 3.18.1-1 - rabbitmq-ha: - enabled: false + tag: 3.23.0-11 + # RabbitMQ ## Configuration values for the rabbitmq dependency ## ref: https://github.com/bitnami/charts/blob/master/bitnami/rabbitmq/README.md @@ -82,13 +81,17 @@ xray: replicaCount: 1 rbac: create: true - image: + + image: registry: registry.connect.redhat.com repository: jfrog/xray-rabbitmq - tag: 3.18.1-1 + tag: 3.23.0-11 + podSecurityContext: fsGroup: 1000721001 - runAsUser: 1000721001 + runAsUser: 1000721001 + + auth: username: xray password: xray @@ -100,6 +103,7 @@ xray: ## Enable encryption to rabbitmq ## ref: https://www.rabbitmq.com/ssl.html ## + tls: enabled: false failIfNoPeerCert: true @@ -107,25 +111,10 @@ xray: #caCertificate: |- #serverCertificate: |- #serverKey: |- - rabbitmq-ha: - enabled: false - replicaCount: 1 - image: - repository: registry.connect.redhat.com/jfrog/xray-rabbitmq - tag: 3.17.2-1 - rabbitmqEpmdPort: 4369 - rabbitmqNodePort: 5672 - rabbitmqManagerPort: 15672 - rabbitmqUsername: guest - rabbitmqPassword: guest - managementUsername: management - managementPassword: management - initContainer: - enabled: false - securityContext: - fsGroup: 1000721035 - runAsUser: 1000721035 - runAsGroup: 1000721035 + + + + livenessProbe: initialDelaySeconds: 120 periodSeconds: 10