Merge pull request #103 from jfrog/openshift4

Openshift4
2026-01-20 22:06:55 -06:00 · 2021-05-04 16:26:03 -07:00
parent 0c323eaccf 39f9450ba6
commit 12d4e96727
92 changed files with 6366 additions and 41 deletions
--- a/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md
+++ b/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md
@@ -1,6 +1,20 @@
 # 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
+
+## [4.9.1] - Feb 22, 2021
+* Updating to latest jfrog/artifactory-ha helm chart version 4.9.1 artifactory version 7.15.3
+
 ## [4.7.6] - Jan 11, 2021
 * Updating to latest jfrog/artifactory-ha helm chart version 4.7.6 artifactory version 7.12.6

--- a/Openshift4/helm/openshift-artifactory-ha/Chart.yaml
+++ b/Openshift4/helm/openshift-artifactory-ha/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 7.12.6
+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.7.6
+version: 4.13.0
--- 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.7.6
-digest: sha256:f3e6b2b4494175cbadde85700458d8e3383ebb6e9c9a3c9cda19136bc55f4187
-generated: "2021-01-11T11:49:29.797662-08:00"
+  version: 4.13.0
+digest: sha256:38f7fbe754e5f9a71b1e4ac49607063f83f5e7c7e964f19a1d8a8ffffd895597
+generated: "2021-04-15T01:24:29.2028211+05:30"
--- 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.7.6
+    version: 4.13.0
    repository: https://charts.jfrog.io/
--- 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.12.6-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.12.6-1
+      tag: 7.17.5-11
    node:
      replicaCount: 2
      waitForPrimaryStartup:
--- a/Openshift4/helm/openshift-xray/CHANGELOG.md
+++ b/Openshift4/helm/openshift-xray/CHANGELOG.md
@@ -1,6 +1,15 @@
 # JFrog  Openshift Artifactory-Xray Chart Changelog
 All changes to this chart will be documented in this file.

+## [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
+
+## [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

@@ -26,4 +35,4 @@ All changes to this chart will be documented in this file.
 * Updating to Xray chart version 4.1.2 and Xray app version 3.6.2

 ## [3.5.1] June 29, 2020
-* Updating to Xray chart version 3.5.1 and Xray app version 3.5.2
+* Updating to Xray chart version 3.5.1 and Xray app version 3.5.2
--- a/Openshift4/helm/openshift-xray/Chart.yaml
+++ b/Openshift4/helm/openshift-xray/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 3.15.1
+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: 6.8.3
+version: 7.1.1
--- a/Openshift4/helm/openshift-xray/README.md
+++ b/Openshift4/helm/openshift-xray/README.md
--- a/Openshift4/helm/openshift-xray/helmupgrade.sh
+++ b/Openshift4/helm/openshift-xray/helmupgrade.sh
--- 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: 6.8.3
-digest: sha256:8ae5d5a4bf04831b85f739cdb8b7bd82385b9fe65582f202d1bb57ad6f2046e1
-generated: "2020-12-29T08:09:20.559977-08:00"
+  version: 7.1.1
+digest: sha256:6bdbff052d42f9360f9d6a6c6a11f30834cf052c2eb1d7545fecec1e529f8378
+generated: "2021-04-28T23:47:11.7328972+05:30"
--- a/Openshift4/helm/openshift-xray/requirements.yaml
+++ b/Openshift4/helm/openshift-xray/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
  - name: xray
-    version: 6.8.3
+    version: 7.1.1
    repository: https://charts.jfrog.io/
--- a/Openshift4/helm/openshift-xray/values.yaml
+++ b/Openshift4/helm/openshift-xray/values.yaml
@@ -11,11 +11,13 @@ xray:
    url: "OVERRIDE"
    user: "OVERRIDE"
    password: "OVERRIDE"
-  initContainerImage: registry.connect.redhat.com/jfrog/init:1.0.1
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.15.4-1
  common:
+    rabbitmq:
+      connectionConfigFromEnvironment: true
    xrayUserId: "1000721035"
    xrayGroupId: "1000721035"
-    xrayVersion: "3.15.1-1"
+    xrayVersion: "3.18.1-1"
    customInitContainers: |
      - name: "prepare-uid-persistent-volume"
        image: "{{ .Values.initContainerImage }}"
@@ -69,13 +71,48 @@ xray:
      registry: registry.connect.redhat.com
      repository: jfrog/xray-router
      imagePullPolicy: IfNotPresent
-      tag: 3.15.1-1
+      tag: 3.18.1-1
  rabbitmq-ha:
+    enabled: false
+  # RabbitMQ
+  ## Configuration values for the rabbitmq dependency
+  ## ref: https://github.com/bitnami/charts/blob/master/bitnami/rabbitmq/README.md
+  rabbitmq:
    enabled: true
    replicaCount: 1
+    rbac:
+      create: true
+    image:
+      registry: registry.connect.redhat.com
+      repository: jfrog/xray-rabbitmq
+      tag: 3.18.1-1
+    podSecurityContext:
+      fsGroup: 1000721001
+      runAsUser: 1000721001  
+    auth:
+      username: xray
+      password: xray
+      # existingPasswordSecret: name-of-existing-secret
+      ## Alternatively, you can use a pre-existing secret with a key called rabbitmq-password by specifying existingPasswordSecret
+      # existingPasswordSecret: <name-of-existing-secret>
+      erlangCookie: XRAYRABBITMQCLUSTER
+      # existingErlangSecret: <name-of-existing-secret>
+      ## Enable encryption to rabbitmq
+      ## ref: https://www.rabbitmq.com/ssl.html
+      ##
+      tls:
+        enabled: false
+        failIfNoPeerCert: true
+        sslOptionsVerify: verify_peer
+        #caCertificate: |-
+        #serverCertificate: |-
+        #serverKey: |-
+  rabbitmq-ha:
+    enabled: false
+    replicaCount: 1
    image:
      repository: registry.connect.redhat.com/jfrog/xray-rabbitmq
-      tag: 3.15.1-1
+      tag: 3.17.2-1
    rabbitmqEpmdPort: 4369
    rabbitmqNodePort: 5672
    rabbitmqManagerPort: 15672
--- a/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md
+++ b/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog  Openshift Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.

+## [1.1.11] - Apr 9, 2021
+* Updating Operator to latest jfrog/artifactory-ha helm chart version 4.13.0 artifactory version 7.17.5
+
 ## [1.1.4] - Dec 2, 2020
 * Updating Operator to latest jfrog/artifactory-ha helm chart version 4.5.4 artifactory version 7.11.5

--- a/Openshift4/operator/artifactory-ha-operator/Dockerfile
+++ b/Openshift4/operator/artifactory-ha-operator/Dockerfile
@@ -1,4 +1,5 @@
 # Build the manager binary
+
 FROM quay.io/operator-framework/helm-operator:v1.3.0
 LABEL name="JFrog Artifactory Enterprise Operator" \
      description="Openshift operator to deploy JFrog Artifactory Enterprise based on the Red Hat Universal Base Image." \
@@ -6,8 +7,29 @@ LABEL name="JFrog Artifactory Enterprise Operator" \
      summary="JFrog Artifactory Enterprise Operator" \
      com.jfrog.license_terms="https://jfrog.com/artifactory/eula/"

-COPY licenses/ /licenses
+# 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
 COPY helm-charts  ${HOME}/helm-charts
 WORKDIR ${HOME}
+
+
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/manifests/artifactory-ha-operator.v1.1.10.clusterserviceversion.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/manifests/artifactory-ha-operator.v1.1.10.clusterserviceversion.yaml
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
@@ -0,0 +1,29 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  creationTimestamp: null
+  name: openshiftartifactoryhas.charts.helm.k8s.io
+spec:
+  group: charts.helm.k8s.io
+  names:
+    kind: OpenshiftArtifactoryHa
+    listKind: OpenshiftArtifactoryHaList
+    plural: openshiftartifactoryhas
+    singular: openshiftartifactoryha
+  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
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/metadata/annotations.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/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: openshiftartifactoryha-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
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/metadata/openshiftartifactoryha-operator.package.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/metadata/openshiftartifactoryha-operator.package.yaml
@@ -0,0 +1,5 @@
+channels:
+- currentCSV: artifactory-ha-operator.v1.1.10
+  name: alpha
+defaultChannel: ''
+packageName: openshiftartifactoryha-operator
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/tests/scorecard/config.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.10/tests/scorecard/config.yaml
@@ -0,0 +1,43 @@
+kind: Configuration
+apiversion: scorecard.operatorframework.io/v1alpha3
+metadata:
+  name: config
+stages:
+- parallel: true
+  tests:
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - basic-check-spec
+    labels:
+      suite: basic
+      test: basic-check-spec-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-bundle-validation
+    labels:
+      suite: olm
+      test: olm-bundle-validation-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-crds-have-validation
+    labels:
+      suite: olm
+      test: olm-crds-have-validation-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-crds-have-resources
+    labels:
+      suite: olm
+      test: olm-crds-have-resources-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-spec-descriptors
+    labels:
+      suite: olm
+      test: olm-spec-descriptors-test
+
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/manifests/artifactory-ha-operator.v1.1.11.clusterserviceversion.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/manifests/artifactory-ha-operator.v1.1.11.clusterserviceversion.yaml
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
@@ -0,0 +1,29 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  creationTimestamp: null
+  name: openshiftartifactoryhas.charts.helm.k8s.io
+spec:
+  group: charts.helm.k8s.io
+  names:
+    kind: OpenshiftArtifactoryHa
+    listKind: OpenshiftArtifactoryHaList
+    plural: openshiftartifactoryhas
+    singular: openshiftartifactoryha
+  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
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/metadata/annotations.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/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: openshiftartifactoryha-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
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/metadata/openshiftartifactoryha-operator.package.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/metadata/openshiftartifactoryha-operator.package.yaml
@@ -0,0 +1,5 @@
+channels:
+- currentCSV: artifactory-ha-operator.v1.1.11
+  name: alpha
+defaultChannel: ''
+packageName: openshiftartifactoryha-operator
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/tests/scorecard/config.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.11/tests/scorecard/config.yaml
@@ -0,0 +1,43 @@
+kind: Configuration
+apiversion: scorecard.operatorframework.io/v1alpha3
+metadata:
+  name: config
+stages:
+- parallel: true
+  tests:
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - basic-check-spec
+    labels:
+      suite: basic
+      test: basic-check-spec-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-bundle-validation
+    labels:
+      suite: olm
+      test: olm-bundle-validation-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-crds-have-validation
+    labels:
+      suite: olm
+      test: olm-crds-have-validation-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-crds-have-resources
+    labels:
+      suite: olm
+      test: olm-crds-have-resources-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-spec-descriptors
+    labels:
+      suite: olm
+      test: olm-spec-descriptors-test
+
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.6/manifests/artifactory-ha-operator.v1.1.6.clusterserviceversion.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.6/manifests/artifactory-ha-operator.v1.1.6.clusterserviceversion.yaml
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.6/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.6/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
@@ -0,0 +1,29 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  creationTimestamp: null
+  name: openshiftartifactoryhas.charts.helm.k8s.io
+spec:
+  group: charts.helm.k8s.io
+  names:
+    kind: OpenshiftArtifactoryHa
+    listKind: OpenshiftArtifactoryHaList
+    plural: openshiftartifactoryhas
+    singular: openshiftartifactoryha
+  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
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.6/metadata/annotations.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.6/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: openshiftartifactoryha-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
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.6/metadata/openshiftartifactoryha-operator.package.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.6/metadata/openshiftartifactoryha-operator.package.yaml
@@ -0,0 +1,5 @@
+channels:
+- currentCSV: artifactory-ha-operator.v1.1.5
+  name: alpha
+defaultChannel: ''
+packageName: openshiftartifactoryha-operator
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.6/tests/scorecard/config.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.6/tests/scorecard/config.yaml
@@ -0,0 +1,43 @@
+kind: Configuration
+apiversion: scorecard.operatorframework.io/v1alpha3
+metadata:
+  name: config
+stages:
+- parallel: true
+  tests:
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - basic-check-spec
+    labels:
+      suite: basic
+      test: basic-check-spec-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-bundle-validation
+    labels:
+      suite: olm
+      test: olm-bundle-validation-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-crds-have-validation
+    labels:
+      suite: olm
+      test: olm-crds-have-validation-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-crds-have-resources
+    labels:
+      suite: olm
+      test: olm-crds-have-resources-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-spec-descriptors
+    labels:
+      suite: olm
+      test: olm-spec-descriptors-test
+
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.7/manifests/artifactory-ha-operator.v1.1.7.clusterserviceversion.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.7/manifests/artifactory-ha-operator.v1.1.7.clusterserviceversion.yaml
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.7/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.7/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
@@ -0,0 +1,29 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  creationTimestamp: null
+  name: openshiftartifactoryhas.charts.helm.k8s.io
+spec:
+  group: charts.helm.k8s.io
+  names:
+    kind: OpenshiftArtifactoryHa
+    listKind: OpenshiftArtifactoryHaList
+    plural: openshiftartifactoryhas
+    singular: openshiftartifactoryha
+  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
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.7/metadata/annotations.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.7/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: openshiftartifactoryha-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
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.7/metadata/openshiftartifactoryha-operator.package.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.7/metadata/openshiftartifactoryha-operator.package.yaml
@@ -0,0 +1,5 @@
+channels:
+- currentCSV: artifactory-ha-operator.v1.1.7
+  name: alpha
+defaultChannel: ''
+packageName: openshiftartifactoryha-operator
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.7/tests/scorecard/config.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.7/tests/scorecard/config.yaml
@@ -0,0 +1,43 @@
+kind: Configuration
+apiversion: scorecard.operatorframework.io/v1alpha3
+metadata:
+  name: config
+stages:
+- parallel: true
+  tests:
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - basic-check-spec
+    labels:
+      suite: basic
+      test: basic-check-spec-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-bundle-validation
+    labels:
+      suite: olm
+      test: olm-bundle-validation-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-crds-have-validation
+    labels:
+      suite: olm
+      test: olm-crds-have-validation-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-crds-have-resources
+    labels:
+      suite: olm
+      test: olm-crds-have-resources-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-spec-descriptors
+    labels:
+      suite: olm
+      test: olm-spec-descriptors-test
+
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.8/manifests/artifactory-ha-operator.v1.1.8.clusterserviceversion.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.8/manifests/artifactory-ha-operator.v1.1.8.clusterserviceversion.yaml
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.8/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.8/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
@@ -0,0 +1,29 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  creationTimestamp: null
+  name: openshiftartifactoryhas.charts.helm.k8s.io
+spec:
+  group: charts.helm.k8s.io
+  names:
+    kind: OpenshiftArtifactoryHa
+    listKind: OpenshiftArtifactoryHaList
+    plural: openshiftartifactoryhas
+    singular: openshiftartifactoryha
+  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
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.8/metadata/annotations.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.8/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: openshiftartifactoryha-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
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.8/metadata/openshiftartifactoryha-operator.package.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.8/metadata/openshiftartifactoryha-operator.package.yaml
@@ -0,0 +1,5 @@
+channels:
+- currentCSV: artifactory-ha-operator.v1.1.8
+  name: alpha
+defaultChannel: ''
+packageName: openshiftartifactoryha-operator
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.8/tests/scorecard/config.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.8/tests/scorecard/config.yaml
@@ -0,0 +1,43 @@
+kind: Configuration
+apiversion: scorecard.operatorframework.io/v1alpha3
+metadata:
+  name: config
+stages:
+- parallel: true
+  tests:
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - basic-check-spec
+    labels:
+      suite: basic
+      test: basic-check-spec-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-bundle-validation
+    labels:
+      suite: olm
+      test: olm-bundle-validation-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-crds-have-validation
+    labels:
+      suite: olm
+      test: olm-crds-have-validation-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-crds-have-resources
+    labels:
+      suite: olm
+      test: olm-crds-have-resources-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-spec-descriptors
+    labels:
+      suite: olm
+      test: olm-spec-descriptors-test
+
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.9/manifests/artifactory-ha-operator.v1.1.9.clusterserviceversion.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.9/manifests/artifactory-ha-operator.v1.1.9.clusterserviceversion.yaml
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.9/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.9/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml
@@ -0,0 +1,29 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  creationTimestamp: null
+  name: openshiftartifactoryhas.charts.helm.k8s.io
+spec:
+  group: charts.helm.k8s.io
+  names:
+    kind: OpenshiftArtifactoryHa
+    listKind: OpenshiftArtifactoryHaList
+    plural: openshiftartifactoryhas
+    singular: openshiftartifactoryha
+  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
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.9/metadata/annotations.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.9/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: openshiftartifactoryha-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
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.9/metadata/openshiftartifactoryha-operator.package.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.9/metadata/openshiftartifactoryha-operator.package.yaml
@@ -0,0 +1,5 @@
+channels:
+- currentCSV: artifactory-ha-operator.v1.1.9
+  name: alpha
+defaultChannel: ''
+packageName: openshiftartifactoryha-operator
--- a/Openshift4/operator/artifactory-ha-operator/bundle/1.1.9/tests/scorecard/config.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.9/tests/scorecard/config.yaml
@@ -0,0 +1,43 @@
+kind: Configuration
+apiversion: scorecard.operatorframework.io/v1alpha3
+metadata:
+  name: config
+stages:
+- parallel: true
+  tests:
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - basic-check-spec
+    labels:
+      suite: basic
+      test: basic-check-spec-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-bundle-validation
+    labels:
+      suite: olm
+      test: olm-bundle-validation-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-crds-have-validation
+    labels:
+      suite: olm
+      test: olm-crds-have-validation-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-crds-have-resources
+    labels:
+      suite: olm
+      test: olm-crds-have-resources-test
+  - image: quay.io/operator-framework/scorecard-test:latest
+    entrypoint:
+    - scorecard-test
+    - olm-spec-descriptors
+    labels:
+      suite: olm
+      test: olm-spec-descriptors-test
+
--- a/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.10.Dockerfile
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.10.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=openshiftartifactoryha-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 1.1.10/manifests /manifests/
+COPY 1.1.10/metadata /metadata/
+LABEL com.redhat.openshift.versions="v4.5,v4.6"
+LABEL com.redhat.delivery.operator.bundle=true
+LABEL com.redhat.delivery.backport=true
--- a/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.11.Dockerfile
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.11.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=openshiftartifactoryha-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 1.1.11/manifests /manifests/
+COPY 1.1.11/metadata /metadata/
+LABEL com.redhat.openshift.versions="v4.5,v4.6"
+LABEL com.redhat.delivery.operator.bundle=true
+LABEL com.redhat.delivery.backport=true
--- a/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.6.Dockerfile
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.6.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=openshiftartifactoryha-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 1.1.6/manifests /manifests/
+COPY 1.1.6/metadata /metadata/
+LABEL com.redhat.openshift.versions="v4.5,v4.6"
+LABEL com.redhat.delivery.operator.bundle=true
+LABEL com.redhat.delivery.backport=true
--- a/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.7.Dockerfile
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.7.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=openshiftartifactoryha-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 1.1.7/manifests /manifests/
+COPY 1.1.7/metadata /metadata/
+LABEL com.redhat.openshift.versions="v4.5,v4.6"
+LABEL com.redhat.delivery.operator.bundle=true
+LABEL com.redhat.delivery.backport=true
--- a/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.8.Dockerfile
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.8.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=openshiftartifactoryha-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 1.1.8/manifests /manifests/
+COPY 1.1.8/metadata /metadata/
+LABEL com.redhat.openshift.versions="v4.5,v4.6"
+LABEL com.redhat.delivery.operator.bundle=true
+LABEL com.redhat.delivery.backport=true
--- a/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.9.Dockerfile
+++ b/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.9.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=openshiftartifactoryha-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 1.1.9/manifests /manifests/
+COPY 1.1.9/metadata /metadata/
+LABEL com.redhat.openshift.versions="v4.5,v4.6"
+LABEL com.redhat.delivery.operator.bundle=true
+LABEL com.redhat.delivery.backport=true
--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/README.md
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/README.md
@@ -1,2 +0,0 @@
-## README
-Should use the latest openshift artifactory ha chart from the partnership artifactory 
--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md
@@ -1,6 +1,20 @@
 # 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
+
+## [4.9.1] - Feb 22, 2021
+* Updating to latest jfrog/artifactory-ha helm chart version 4.9.1 artifactory version 7.15.3
+
 ## [4.7.6] - Jan 11, 2021
 * Updating to latest jfrog/artifactory-ha helm chart version 4.7.6 artifactory version 7.12.6

--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 7.12.6
+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.7.6
+version: 4.13.0
--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/helminstall.sh
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/helminstall.sh
@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+
+# PreReq'd:
+# helm install postgres bitnami/postgresql
+# follow artifactory postgresql db setup:
+# https://www.jfrog.com/confluence/display/JFROG/PostgreSQL
+POSTGRES=$(helm ls | grep postgres | wc -l)
+
+if [[ "$POSTGRES" =~ (0) ]]
+then
+  echo "External DB is required to run Jfrog Openshift Artifactory Helm chart"
+  echo ""
+  echo "Postgresql helm chart must be installed prior to installing this helm installer script."
+  echo ""
+  echo "helm install postgres bitnami/postgresql"
+  echo ""
+  echo "follow artifactory postgresql db setup:"
+  echo "https://www.jfrog.com/confluence/display/JFROG/PostgreSQL"
+  exit 1
+else
+  if [[ -z "$1" ]]
+  then
+    echo "Installing Jfrog Artifactory Openshift Helm"
+  else
+    echo "Patching Environment for RunAsAnyUid"
+    # patch the restricted scc to allow the pods to run as anyuid
+    oc patch scc restricted --patch '{"fsGroup":{"type":"RunAsAny"},"runAsUser":{"type":"RunAsAny"},"seLinuxContext":{"type":"RunAsAny"}}' --type=merge
+    if [[ -f "artifactory.cluster.license" ]]
+    then
+      echo "Creating k8s secret for Artifactory cluster licenses from file: artifactory.cluster.license"
+      # create the license secret
+      oc create secret generic artifactory-license --from-file=artifactory.cluster.license
+    fi
+    
+    if [[ -f "tls.crt" ]]
+    then
+      echo "Creating k8s secret for TLS tls-ingress from files tls.crt & tls.key"
+      # create the tls secret
+      oc create secret tls tls-ingress --cert=tls.crt --key=tls.key
+    fi
+  fi
+fi
+
+MASTER_KEY=$(openssl rand -hex 32)
+JOIN_KEY=$(openssl rand -hex 32)
+
+# install via helm with default postgresql configuration
+helm install artifactory-ha . \
+               --set artifactory-ha.nginx.service.ssloffload=true \
+               --set artifactory-ha.nginx.tlsSecretName=tls-ingress \
+               --set artifactory-ha.artifactory.node.replicaCount=1 \
+               --set artifactory-ha.artifactory.license.secret=artifactory-license,artifactory-ha.artifactory.license.dataKey=artifactory.cluster.license \
+               --set artifactory-ha.database.type=postgresql \
+               --set artifactory-ha.database.driver=org.postgresql.Driver \
+               --set artifactory-ha.database.url=jdbc:postgresql://postgres-postgresql:5432/artifactory \
+               --set artifactory-ha.database.user=artifactory \
+               --set artifactory-ha.database.password=password \
+               --set artifactory-ha.artifactory.joinKey=$JOIN_KEY \
+               --set artifactory-ha.artifactory.masterKey=$MASTER_KEY
+
+
+echo "*** IMPORTANT ****"
+echo "export MASTER_KEY=$MASTER_KEY"
+echo "export JOIN_KEY=$JOIN_KEY"
+echo "*** SUCCESS ****"
--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/helmupgrade.sh
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/helmupgrade.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# install via helm with default postgresql configuration
+helm upgrade --install artifactory-ha . \
+               --set artifactory-ha.nginx.service.ssloffload=true \
+               --set artifactory-ha.nginx.tlsSecretName=tls-ingress \
+               --set artifactory-ha.artifactory.node.replicaCount=1 \
+               --set artifactory-ha.artifactory.license.secret=artifactory-license,artifactory-ha.artifactory.license.dataKey=artifactory.cluster.license \
+               --set artifactory-ha.database.type=postgresql \
+               --set artifactory-ha.database.driver=org.postgresql.Driver \
+               --set artifactory-ha.database.url=jdbc:postgresql://postgres-postgresql:5432/artifactory \
+               --set artifactory-ha.database.user=artifactory \
+               --set artifactory-ha.database.password=password \
+               --set artifactory-ha.artifactory.joinKey=$JOIN_KEY \
+               --set artifactory-ha.artifactory.masterKey=$MASTER_KEY \
+               --set artifactory-ha.databaseUpgradeReady=true
+
--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/requirements.lock
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: artifactory-ha
  repository: https://charts.jfrog.io/
-  version: 4.7.6
-digest: sha256:f3e6b2b4494175cbadde85700458d8e3383ebb6e9c9a3c9cda19136bc55f4187
-generated: "2021-01-11T11:49:29.797662-08:00"
+  version: 4.13.0
+digest: sha256:38f7fbe754e5f9a71b1e4ac49607063f83f5e7c7e964f19a1d8a8ffffd895597
+generated: "2021-04-15T01:24:29.2028211+05:30"
--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/requirements.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
  - name: artifactory-ha
-    version: 4.7.6
+    version: 4.13.0
    repository: https://charts.jfrog.io/
--- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/values.yaml
+++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/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.12.6-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.12.6-1
+      tag: 7.17.5-11
    node:
      replicaCount: 2
      waitForPrimaryStartup:
--- a/Openshift4/operator/xray-operator/CHANGELOG.md
+++ b/Openshift4/operator/xray-operator/CHANGELOG.md
@@ -1,6 +1,24 @@
 # JFrog  Openshift Xray Chart Changelog
 All changes to this chart will be documented in this file.

+## [2.0.2] Mar 12, 2021
+* Deploying JFrog Xray 3.18.1 as an Operator into Openshift
+
+## [2.0.1] Mar 11th, 2021
+* Bug fix for Rabbitmq user id and group id in the operator not matching helm values
+
+## [2.0.0] Feb 19th, 2021
+* BREAKING CHANGE - Rabbitmq ha deprecated for Rabbitmq
+
+## [1.1.8] Feb 9nd, 2021
+* Deploying JFrog Xray 3.17.2 as an Operator into Openshift
+
+## [1.1.7] Feb 3nd, 2021
+* Deploying JFrog Xray 3.16.0 as an Operator into Openshift
+
+## [1.1.6] Jan 11th, 2021
+* Deploying JFrog Xray 3.15.1 as an Operator into Openshift
+
 ## [1.1.5] Dec 2nd, 2020
 * Deploying JFrog Xray 3.12.0 as an Operator into Openshift

--- a/Openshift4/operator/xray-operator/Dockerfile
+++ b/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
--- a/Openshift4/operator/xray-operator/bundle/1.1.7/manifests/openshiftxrays.charts.helm.k8s.io.crd.yaml
+++ b/Openshift4/operator/xray-operator/bundle/1.1.7/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
--- a/Openshift4/operator/xray-operator/bundle/1.1.7/manifests/xray-operator.v1.1.7.clusterserviceversion.yaml
+++ b/Openshift4/operator/xray-operator/bundle/1.1.7/manifests/xray-operator.v1.1.7.clusterserviceversion.yaml
--- a/Openshift4/operator/xray-operator/bundle/1.1.7/metadata/annotations.yaml
+++ b/Openshift4/operator/xray-operator/bundle/1.1.7/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
--- a/Openshift4/operator/xray-operator/bundle/1.1.7/metadata/openshiftxray-operator.package.yaml
+++ b/Openshift4/operator/xray-operator/bundle/1.1.7/metadata/openshiftxray-operator.package.yaml
@@ -0,0 +1,5 @@
+channels:
+- currentCSV: xray-operator.v1.1.7
+  name: alpha
+defaultChannel: ''
+packageName: openshiftxray-operator
--- a/Openshift4/operator/xray-operator/bundle/1.1.8/manifests/openshiftxrays.charts.helm.k8s.io.crd.yaml
+++ b/Openshift4/operator/xray-operator/bundle/1.1.8/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
--- a/Openshift4/operator/xray-operator/bundle/1.1.8/manifests/xray-operator.v1.1.8.clusterserviceversion.yaml
+++ b/Openshift4/operator/xray-operator/bundle/1.1.8/manifests/xray-operator.v1.1.8.clusterserviceversion.yaml
--- a/Openshift4/operator/xray-operator/bundle/1.1.8/metadata/annotations.yaml
+++ b/Openshift4/operator/xray-operator/bundle/1.1.8/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
--- a/Openshift4/operator/xray-operator/bundle/1.1.8/metadata/openshiftxray-operator.package.yaml
+++ b/Openshift4/operator/xray-operator/bundle/1.1.8/metadata/openshiftxray-operator.package.yaml
@@ -0,0 +1,5 @@
+channels:
+- currentCSV: xray-operator.v1.1.8
+  name: alpha
+defaultChannel: ''
+packageName: openshiftxray-operator
--- a/Openshift4/operator/xray-operator/bundle/2.0.0/manifests/openshiftxrays.charts.helm.k8s.io.crd.yaml
+++ b/Openshift4/operator/xray-operator/bundle/2.0.0/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
--- a/Openshift4/operator/xray-operator/bundle/2.0.0/manifests/xray-operator.v2.0.0.clusterserviceversion.yaml
+++ b/Openshift4/operator/xray-operator/bundle/2.0.0/manifests/xray-operator.v2.0.0.clusterserviceversion.yaml
--- a/Openshift4/operator/xray-operator/bundle/2.0.0/metadata/annotations.yaml
+++ b/Openshift4/operator/xray-operator/bundle/2.0.0/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
--- a/Openshift4/operator/xray-operator/bundle/2.0.0/metadata/openshiftxray-operator.package.yaml
+++ b/Openshift4/operator/xray-operator/bundle/2.0.0/metadata/openshiftxray-operator.package.yaml
@@ -0,0 +1,5 @@
+channels:
+- currentCSV: xray-operator.v2.0.0
+  name: alpha
+defaultChannel: ''
+packageName: openshiftxray-operator
--- a/Openshift4/operator/xray-operator/bundle/2.0.1/manifests/openshiftxrays.charts.helm.k8s.io.crd.yaml
+++ b/Openshift4/operator/xray-operator/bundle/2.0.1/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
--- a/Openshift4/operator/xray-operator/bundle/2.0.1/manifests/xray-operator.v2.0.1.clusterserviceversion.yaml
+++ b/Openshift4/operator/xray-operator/bundle/2.0.1/manifests/xray-operator.v2.0.1.clusterserviceversion.yaml
--- a/Openshift4/operator/xray-operator/bundle/2.0.1/metadata/annotations.yaml
+++ b/Openshift4/operator/xray-operator/bundle/2.0.1/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
--- a/Openshift4/operator/xray-operator/bundle/2.0.1/metadata/openshiftxray-operator.package.yaml
+++ b/Openshift4/operator/xray-operator/bundle/2.0.1/metadata/openshiftxray-operator.package.yaml
@@ -0,0 +1,5 @@
+channels:
+- currentCSV: xray-operator.v2.0.1
+  name: alpha
+defaultChannel: ''
+packageName: openshiftxray-operator
--- a/Openshift4/operator/xray-operator/bundle/2.0.2/manifests/openshiftxrays.charts.helm.k8s.io.crd.yaml
+++ b/Openshift4/operator/xray-operator/bundle/2.0.2/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
--- a/Openshift4/operator/xray-operator/bundle/2.0.2/manifests/xray-operator.v2.0.2.clusterserviceversion.yaml
+++ b/Openshift4/operator/xray-operator/bundle/2.0.2/manifests/xray-operator.v2.0.2.clusterserviceversion.yaml
--- a/Openshift4/operator/xray-operator/bundle/2.0.2/metadata/annotations.yaml
+++ b/Openshift4/operator/xray-operator/bundle/2.0.2/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
--- a/Openshift4/operator/xray-operator/bundle/2.0.2/metadata/openshiftxray-operator.package.yaml
+++ b/Openshift4/operator/xray-operator/bundle/2.0.2/metadata/openshiftxray-operator.package.yaml
@@ -0,0 +1,5 @@
+channels:
+- currentCSV: xray-operator.v2.0.2
+  name: alpha
+defaultChannel: ''
+packageName: openshiftxray-operator
--- a/Openshift4/operator/xray-operator/bundle/bundle-1.1.7.Dockerfile
+++ b/Openshift4/operator/xray-operator/bundle/bundle-1.1.7.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 1.1.7/manifests /manifests/
+COPY 1.1.7/metadata /metadata/
+LABEL com.redhat.openshift.versions="v4.5,v4.6"
+LABEL com.redhat.delivery.operator.bundle=true
+LABEL com.redhat.delivery.backport=true
--- a/Openshift4/operator/xray-operator/bundle/bundle-1.1.8.Dockerfile
+++ b/Openshift4/operator/xray-operator/bundle/bundle-1.1.8.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 1.1.8/manifests /manifests/
+COPY 1.1.8/metadata /metadata/
+LABEL com.redhat.openshift.versions="v4.5,v4.6"
+LABEL com.redhat.delivery.operator.bundle=true
+LABEL com.redhat.delivery.backport=true
--- a/Openshift4/operator/xray-operator/bundle/bundle-2.0.0.Dockerfile
+++ b/Openshift4/operator/xray-operator/bundle/bundle-2.0.0.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.0/manifests /manifests/
+COPY 2.0.0/metadata /metadata/
+LABEL com.redhat.openshift.versions="v4.5,v4.6"
+LABEL com.redhat.delivery.operator.bundle=true
+LABEL com.redhat.delivery.backport=true
--- a/Openshift4/operator/xray-operator/bundle/bundle-2.0.1.Dockerfile
+++ b/Openshift4/operator/xray-operator/bundle/bundle-2.0.1.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.1/manifests /manifests/
+COPY 2.0.1/metadata /metadata/
+LABEL com.redhat.openshift.versions="v4.5,v4.6"
+LABEL com.redhat.delivery.operator.bundle=true
+LABEL com.redhat.delivery.backport=true
--- a/Openshift4/operator/xray-operator/bundle/bundle-2.0.2.Dockerfile
+++ b/Openshift4/operator/xray-operator/bundle/bundle-2.0.2.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.2/manifests /manifests/
+COPY 2.0.2/metadata /metadata/
+LABEL com.redhat.openshift.versions="v4.5,v4.6"
+LABEL com.redhat.delivery.operator.bundle=true
+LABEL com.redhat.delivery.backport=true
--- 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,15 @@
 # JFrog  Openshift Artifactory-Xray Chart Changelog
 All changes to this chart will be documented in this file.

+## [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
+
+## [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

@@ -26,4 +35,4 @@ All changes to this chart will be documented in this file.
 * Updating to Xray chart version 4.1.2 and Xray app version 3.6.2

 ## [3.5.1] June 29, 2020
-* Updating to Xray chart version 3.5.1 and Xray app version 3.5.2
+* Updating to Xray chart version 3.5.1 and Xray app version 3.5.2
--- 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.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: 6.8.3
+version: 7.1.1
--- 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+
--- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/helmupgrade.sh
+++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/helmupgrade.sh
--- 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: 7.1.1
+digest: sha256:6bdbff052d42f9360f9d6a6c6a11f30834cf052c2eb1d7545fecec1e529f8378
+generated: "2021-04-28T22:48:55.7568567+05:30"
--- 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: 7.1.1
    repository: https://charts.jfrog.io/
--- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml
+++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml
@@ -11,11 +11,13 @@ xray:
    url: "OVERRIDE"
    user: "OVERRIDE"
    password: "OVERRIDE"
-  initContainerImage: registry.connect.redhat.com/jfrog/init:1.0.1
+  initContainerImage: registry.connect.redhat.com/jfrog/init:7.15.4-1
  common:
+    rabbitmq:
+      connectionConfigFromEnvironment: true
    xrayUserId: "1000721035"
    xrayGroupId: "1000721035"
-    xrayVersion: "3.15.1-1"
+    xrayVersion: "3.18.1-1"
    customInitContainers: |
      - name: "prepare-uid-persistent-volume"
        image: "{{ .Values.initContainerImage }}"
@@ -69,13 +71,48 @@ xray:
      registry: registry.connect.redhat.com
      repository: jfrog/xray-router
      imagePullPolicy: IfNotPresent
-      tag: 3.15.1-1
+      tag: 3.18.1-1
  rabbitmq-ha:
+    enabled: false
+  # RabbitMQ
+  ## Configuration values for the rabbitmq dependency
+  ## ref: https://github.com/bitnami/charts/blob/master/bitnami/rabbitmq/README.md
+  rabbitmq:
    enabled: true
    replicaCount: 1
+    rbac:
+      create: true
+    image:
+      registry: registry.connect.redhat.com
+      repository: jfrog/xray-rabbitmq
+      tag: 3.18.1-1
+    podSecurityContext:
+      fsGroup: 1000721001
+      runAsUser: 1000721001  
+    auth:
+      username: xray
+      password: xray
+      # existingPasswordSecret: name-of-existing-secret
+      ## Alternatively, you can use a pre-existing secret with a key called rabbitmq-password by specifying existingPasswordSecret
+      # existingPasswordSecret: <name-of-existing-secret>
+      erlangCookie: XRAYRABBITMQCLUSTER
+      # existingErlangSecret: <name-of-existing-secret>
+      ## Enable encryption to rabbitmq
+      ## ref: https://www.rabbitmq.com/ssl.html
+      ##
+      tls:
+        enabled: false
+        failIfNoPeerCert: true
+        sslOptionsVerify: verify_peer
+        #caCertificate: |-
+        #serverCertificate: |-
+        #serverKey: |-
+  rabbitmq-ha:
+    enabled: false
+    replicaCount: 1
    image:
      repository: registry.connect.redhat.com/jfrog/xray-rabbitmq
-      tag: 3.15.1-1
+      tag: 3.17.2-1
    rabbitmqEpmdPort: 4369
    rabbitmqNodePort: 5672
    rabbitmqManagerPort: 15672