Updated changes for RT 7.19.4 & x-ray 3.25.1, also added bundle folder and updated require file for it

Openshift4/operator/xray-operator/CHANGELOG.md

@@ -1,6 +1,9 @@
 # JFrog  Openshift Xray Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [2.0.4] Jul 01, 2021
+* Deploying JFrog Xray 3.25.1 as an Operator into Openshift
+
 ## [2.0.3] May 24, 2021
 * Deploying JFrog Xray 3.23.0 as an Operator into Openshift & has a major bug fix for rabbitmq pod not coming up when deleted
 

Openshift4/operator/xray-operator/bundle/2.0.4/manifests/openshiftxrays.charts.helm.k8s.io.crd.yaml

@@ -0,0 +1,29 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  creationTimestamp: null
+  name: openshiftxrays.charts.helm.k8s.io
+spec:
+  group: charts.helm.k8s.io
+  names:
+    kind: OpenshiftXray
+    listKind: OpenshiftXrayList
+    plural: openshiftxrays
+    singular: openshiftxray
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ''
+    plural: ''
+  conditions: null
+  storedVersions: null

Openshift4/operator/xray-operator/bundle/2.0.4/metadata/annotations.yaml

@@ -0,0 +1,12 @@
+annotations:
+  operators.operatorframework.io.bundle.channel.default.v1: alpha
+  operators.operatorframework.io.bundle.channels.v1: alpha
+  operators.operatorframework.io.bundle.manifests.v1: manifests/
+  operators.operatorframework.io.bundle.mediatype.v1: registry+v1
+  operators.operatorframework.io.bundle.metadata.v1: metadata/
+  operators.operatorframework.io.bundle.package.v1: openshiftxray-operator
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.3.0
+  operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
+  operators.operatorframework.io.metrics.project_layout: helm.sdk.operatorframework.io/v1
+  operators.operatorframework.io.test.config.v1: tests/scorecard/
+  operators.operatorframework.io.test.mediatype.v1: scorecard+v1

Openshift4/operator/xray-operator/bundle/2.0.4/metadata/openshiftxray-operator.package.yaml

@@ -0,0 +1,5 @@
+channels:
+- currentCSV: xray-operator.v2.0.4
+  name: alpha
+defaultChannel: ''
+packageName: openshiftxray-operator

Openshift4/operator/xray-operator/bundle/bundle-2.0.4.Dockerfile

@@ -0,0 +1,19 @@
+FROM scratch
+
+LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
+LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
+LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
+LABEL operators.operatorframework.io.bundle.package.v1=openshiftxray-operator
+LABEL operators.operatorframework.io.bundle.channels.v1=alpha
+LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.3.0
+LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
+LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorframework.io/v1
+LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
+LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
+
+COPY 2.0.4/manifests /manifests/
+COPY 2.0.4/metadata /metadata/
+LABEL com.redhat.openshift.versions="v4.5,v4.6"
+LABEL com.redhat.delivery.operator.bundle=true
+LABEL com.redhat.delivery.backport=true

Openshift4/operator/xray-operator/helm-charts/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.25.1] Jul 01, 2021
+* 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
 

Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.lock

@@ -1,6 +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"
+  version: 103.25.1
+digest: sha256:613f1445e6f5315c85fae4ab11f0acf0baeed12fd00698a3e749fe650844410c
+generated: "2021-07-01T20:44:29.4805476+05:30"

Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 3.23.0
+appVersion: 3.25.1
 description: Universal component scan for security and license inventory and impact analysis
 dependencies:
   - name: xray
-    version: 8.0.0
+    version: 103.25.1
     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: 8.0.0
+version: 103.25.1

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.18.6-1
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.19.4-1
   common:
     rabbitmq:
       connectionConfigFromEnvironment: true
     xrayUserId: "1000721035"
     xrayGroupId: "1000721035"
-    xrayVersion: "3.23.0-11"
+    xrayVersion: "3.25.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.23.0-11
+      tag: 3.25.1-1
   
   # RabbitMQ
   ## Configuration values for the rabbitmq dependency
@@ -85,7 +85,7 @@ xray:
     image: 
       registry: registry.connect.redhat.com
       repository: jfrog/xray-rabbitmq
-      tag: 3.23.0-11
+      tag: 3.25.1-1
 
     podSecurityContext:
       fsGroup: 1000721001