Updated xray code to currently deployed operator (3.18.1)

Openshift4/operator/xray-operator/CHANGELOG.md

@@ -1,10 +1,6 @@
 # JFrog  Openshift Xray Chart Changelog
 All changes to this chart will be documented in this file.
 
-
-## [2.0.3] Mar 31, 2021
-* Bug fix for updating Rabbitmq home env variable 
-
 ## [2.0.2] Mar 12, 2021
 * Deploying JFrog Xray 3.18.1 as an Operator into Openshift
 

Openshift4/operator/xray-operator/Dockerfile

@@ -6,6 +6,25 @@ LABEL name="JFrog Xray Enterprise Operator" \
       summary="JFrog Xray Enterprise Operator" \
       com.jfrog.license_terms="https://jfrog.com/xray/eula/"
 
+# Adding security checks for container vulnerability scan
+
+USER root
+
+RUN microdnf install yum \
+     && yum -y update-minimal --security --sec-severity=Important --sec-severity=Critical \
+     && yum clean all \
+     && microdnf remove yum \
+     && microdnf clean all \
+     && microdnf install gnutls \
+     && microdnf install nettle  \
+     && microdnf update openssl-libs
+
+RUN microdnf install sudo
+RUN sudo -u helm bash
+
+USER helm
+
+
 COPY licenses/ /licenses
 ENV HOME=/opt/helm
 COPY watches.yaml ${HOME}/watches.yaml

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

@@ -1,29 +0,0 @@
-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.3/metadata/annotations.yaml

@@ -1,12 +0,0 @@
-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.3/metadata/openshiftxray-operator.package.yaml

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

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

@@ -1,19 +0,0 @@
-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.3/manifests /manifests/
-COPY 2.0.3/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/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

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

@@ -1,6 +1,6 @@
 dependencies:
 - name: xray
   repository: https://charts.jfrog.io/
-  version: 7.6.0
+  version: 7.1.1
-digest: sha256:afc1559a744f3c2464f32367fbf86b7f6728c1249d7dade15cfc39a69e18da22
+digest: sha256:6bdbff052d42f9360f9d6a6c6a11f30834cf052c2eb1d7545fecec1e529f8378
-generated: "2021-04-15T01:49:21.822944+05:30"
+generated: "2021-04-28T22:48:55.7568567+05:30"

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

@@ -1,4 +1,4 @@
 dependencies:
   - name: xray
-    version: 7.6.0
+    version: 7.1.1
     repository: https://charts.jfrog.io/

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.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