From 2d9f84ad18ca20723c32566a01039c902e4bf28e Mon Sep 17 00:00:00 2001 From: Aayush-sood94 Date: Wed, 3 Feb 2021 21:50:02 +0530 Subject: [PATCH] Updated Chart version fir xray to 3.16.0 --- .../helm-charts/openshift-xray/CHANGELOG.md | 4 +++ .../helm-charts/openshift-xray/Chart.yaml | 4 +-- .../helm-charts/openshift-xray/LICENSE | 0 .../helm-charts/openshift-xray/README.md | 32 +++++++++++++++++++ .../helm-charts/openshift-xray/rabbitmq.yaml | 0 .../openshift-xray/rabbitmqservice.yaml | 0 .../openshift-xray/requirements.lock | 6 ++-- .../openshift-xray/requirements.yaml | 2 +- 8 files changed, 42 insertions(+), 6 deletions(-) mode change 100644 => 100755 Openshift4/operator/xray-operator/helm-charts/openshift-xray/LICENSE mode change 100644 => 100755 Openshift4/operator/xray-operator/helm-charts/openshift-xray/rabbitmq.yaml mode change 100644 => 100755 Openshift4/operator/xray-operator/helm-charts/openshift-xray/rabbitmqservice.yaml mode change 100644 => 100755 Openshift4/operator/xray-operator/helm-charts/openshift-xray/requirements.lock mode change 100644 => 100755 Openshift4/operator/xray-operator/helm-charts/openshift-xray/requirements.yaml 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 72eee5c..953c453 100755 --- 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,10 @@ # JFrog Openshift Artifactory-Xray Chart Changelog All changes to this chart will be documented in this file. + +## [6.10.0] Feb 3, 2021 +* 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 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 8dd4692..e103c9d 100755 --- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml +++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 3.15.1 +appVersion: 3.16.0 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: 6.8.3 +version: 6.10.0 diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/LICENSE b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/LICENSE old mode 100644 new mode 100755 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 89e422b..8337dcd 100755 --- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/README.md +++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/README.md @@ -17,6 +17,38 @@ xray.xray.jfrogUrl This is due to helm referencing the value through the subchart named xray now. +## Security Context Constraints + +To deploy this helm chart you will need to be a cluster admin w/ access to the anyuid scc. + +````bash +oc adm policy add-scc-to-user anyuid -z my_service_account -n my_namespace +```` + +# Master and Join Key + +The master and join key used to deploy Artifactory must be supplied to Xray at the time of installation. + +## Deploying the Helm Chart + +1. Deploy a Postgresql to use an external database. You can find additional information on how to configure your Postgresql database [here](https://www.jfrog.com/confluence/display/JFROG/Configuring+the+Database). +2. Run `helm dep build` to pull the subchart referenced by the `requirements.yaml` +3. Update POSTGRES_HOST, MASTER_KEY, JOIN_KEY variables below and install `openshift-xray` with the example commands: + +````bash +POSTGRES_HOST=postgres-postgresql +MASTER_KEY=my_artifactory_master_key +JOIN_KEY=my_artifactory_join_key +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.joinKey=$JOIN_KEY \ + --set xray.xray.masterKey=$MASTER_KEY +```` + + ## Prerequisites Details * Kubernetes 1.12+ diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/rabbitmq.yaml b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/rabbitmq.yaml old mode 100644 new mode 100755 diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/rabbitmqservice.yaml b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/rabbitmqservice.yaml old mode 100644 new mode 100755 diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/requirements.lock b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/requirements.lock old mode 100644 new mode 100755 index f68dedf..94bc431 --- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/requirements.lock +++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: xray repository: https://charts.jfrog.io/ - version: 6.8.3 -digest: sha256:8ae5d5a4bf04831b85f739cdb8b7bd82385b9fe65582f202d1bb57ad6f2046e1 -generated: "2020-12-29T08:09:20.559977-08:00" + version: 6.10.0 +digest: sha256:f35c5c16ba304a670af922a378888e2cb25f10a1a9dcbb1862faa53d584349af +generated: "2021-02-03T17:55:09.2063304+05:30" diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/requirements.yaml b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/requirements.yaml old mode 100644 new mode 100755 index 4d494ef..600049e --- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/requirements.yaml +++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: xray - version: 6.8.3 + version: 6.10.0 repository: https://charts.jfrog.io/