diff --git a/Openshift4/openshift-artifactory-ha/CHANGELOG.md b/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md similarity index 100% rename from Openshift4/openshift-artifactory-ha/CHANGELOG.md rename to Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md diff --git a/Openshift4/openshift-artifactory-ha/Chart.yaml b/Openshift4/helm/openshift-artifactory-ha/Chart.yaml similarity index 100% rename from Openshift4/openshift-artifactory-ha/Chart.yaml rename to Openshift4/helm/openshift-artifactory-ha/Chart.yaml diff --git a/Openshift4/openshift-artifactory-ha/LICENSE b/Openshift4/helm/openshift-artifactory-ha/LICENSE similarity index 100% rename from Openshift4/openshift-artifactory-ha/LICENSE rename to Openshift4/helm/openshift-artifactory-ha/LICENSE diff --git a/Openshift4/openshift-artifactory-ha/README.md b/Openshift4/helm/openshift-artifactory-ha/README.md similarity index 100% rename from Openshift4/openshift-artifactory-ha/README.md rename to Openshift4/helm/openshift-artifactory-ha/README.md diff --git a/Openshift4/openshift-artifactory-ha/helminstall.sh b/Openshift4/helm/openshift-artifactory-ha/helminstall.sh similarity index 100% rename from Openshift4/openshift-artifactory-ha/helminstall.sh rename to Openshift4/helm/openshift-artifactory-ha/helminstall.sh diff --git a/Openshift4/openshift-artifactory-ha/requirements.lock b/Openshift4/helm/openshift-artifactory-ha/requirements.lock similarity index 100% rename from Openshift4/openshift-artifactory-ha/requirements.lock rename to Openshift4/helm/openshift-artifactory-ha/requirements.lock diff --git a/Openshift4/openshift-artifactory-ha/requirements.yaml b/Openshift4/helm/openshift-artifactory-ha/requirements.yaml similarity index 100% rename from Openshift4/openshift-artifactory-ha/requirements.yaml rename to Openshift4/helm/openshift-artifactory-ha/requirements.yaml diff --git a/Openshift4/openshift-artifactory-ha/values.yaml b/Openshift4/helm/openshift-artifactory-ha/values.yaml similarity index 100% rename from Openshift4/openshift-artifactory-ha/values.yaml rename to Openshift4/helm/openshift-artifactory-ha/values.yaml diff --git a/Openshift4/openshift-pipelines/CHANGELOG.md b/Openshift4/helm/openshift-pipelines/CHANGELOG.md similarity index 100% rename from Openshift4/openshift-pipelines/CHANGELOG.md rename to Openshift4/helm/openshift-pipelines/CHANGELOG.md diff --git a/Openshift4/openshift-pipelines/Chart.yaml b/Openshift4/helm/openshift-pipelines/Chart.yaml similarity index 100% rename from Openshift4/openshift-pipelines/Chart.yaml rename to Openshift4/helm/openshift-pipelines/Chart.yaml diff --git a/Openshift4/openshift-pipelines/LICENSE b/Openshift4/helm/openshift-pipelines/LICENSE similarity index 100% rename from Openshift4/openshift-pipelines/LICENSE rename to Openshift4/helm/openshift-pipelines/LICENSE diff --git a/Openshift4/openshift-pipelines/README.md b/Openshift4/helm/openshift-pipelines/README.md similarity index 100% rename from Openshift4/openshift-pipelines/README.md rename to Openshift4/helm/openshift-pipelines/README.md diff --git a/Openshift4/openshift-pipelines/helminstall.sh b/Openshift4/helm/openshift-pipelines/helminstall.sh similarity index 100% rename from Openshift4/openshift-pipelines/helminstall.sh rename to Openshift4/helm/openshift-pipelines/helminstall.sh diff --git a/Openshift4/openshift-pipelines/requirements.lock b/Openshift4/helm/openshift-pipelines/requirements.lock similarity index 100% rename from Openshift4/openshift-pipelines/requirements.lock rename to Openshift4/helm/openshift-pipelines/requirements.lock diff --git a/Openshift4/openshift-pipelines/requirements.yaml b/Openshift4/helm/openshift-pipelines/requirements.yaml similarity index 100% rename from Openshift4/openshift-pipelines/requirements.yaml rename to Openshift4/helm/openshift-pipelines/requirements.yaml diff --git a/Openshift4/openshift-pipelines/values.yaml b/Openshift4/helm/openshift-pipelines/values.yaml similarity index 99% rename from Openshift4/openshift-pipelines/values.yaml rename to Openshift4/helm/openshift-pipelines/values.yaml index 24800fc..320dd84 100755 --- a/Openshift4/openshift-pipelines/values.yaml +++ b/Openshift4/helm/openshift-pipelines/values.yaml @@ -871,14 +871,15 @@ pipelines: # registry: registry.connect.redhat.com # repository: jfrog/xray-rabbitmq # tag: 3.8.6 - #image: - # registry: quay.io - # repository: jfrog/rabbitmq - # tag: 3.8.3 + image: + registry: quay.io + repository: jfrog/rabbitmq + tag: 3.9.1 + # DO NOT CHANGE CUSTOM INIT USER rabbitmq: - username: admin - password: "" + username: user + password: bitnami ## Erlang cookie to determine whether different nodes are allowed to communicate with each other erlangCookie: PIPELINESRABBITMQCLUSTER diff --git a/Openshift4/xray-operator/helm-charts/openshift-xray/CHANGELOG.md b/Openshift4/helm/openshift-xray/CHANGELOG.md old mode 100644 new mode 100755 similarity index 80% rename from Openshift4/xray-operator/helm-charts/openshift-xray/CHANGELOG.md rename to Openshift4/helm/openshift-xray/CHANGELOG.md index 87f3b19..a4c6f3b --- a/Openshift4/xray-operator/helm-charts/openshift-xray/CHANGELOG.md +++ b/Openshift4/helm/openshift-xray/CHANGELOG.md @@ -1,6 +1,9 @@ # JFrog Openshift Artifactory-Xray Chart Changelog All changes to this chart will be documented in this file. +## [6.0.6] Oct 1st, 2020 +* Updating to Xray chart version 6.0.6 and Xray app version 3.8.8 + ## [4.2.0] Aug 17, 2020 * Updating to Xray chart version 4.2.0 and Xray app version 3.8.0 diff --git a/Openshift4/openshift-xray/Chart.yaml b/Openshift4/helm/openshift-xray/Chart.yaml similarity index 91% rename from Openshift4/openshift-xray/Chart.yaml rename to Openshift4/helm/openshift-xray/Chart.yaml index 5f3b194..aa8c6b6 100755 --- a/Openshift4/openshift-xray/Chart.yaml +++ b/Openshift4/helm/openshift-xray/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 3.8.0 +appVersion: 3.8.8 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: 4.2.0 +version: 6.0.6 diff --git a/Openshift4/openshift-xray/LICENSE b/Openshift4/helm/openshift-xray/LICENSE similarity index 100% rename from Openshift4/openshift-xray/LICENSE rename to Openshift4/helm/openshift-xray/LICENSE diff --git a/Openshift4/openshift-xray/README.md b/Openshift4/helm/openshift-xray/README.md similarity index 100% rename from Openshift4/openshift-xray/README.md rename to Openshift4/helm/openshift-xray/README.md diff --git a/Openshift4/xray-operator/helm-charts/openshift-xray/helminstall.sh b/Openshift4/helm/openshift-xray/helminstall.sh old mode 100644 new mode 100755 similarity index 82% rename from Openshift4/xray-operator/helm-charts/openshift-xray/helminstall.sh rename to Openshift4/helm/openshift-xray/helminstall.sh index 2260da1..e19987c --- a/Openshift4/xray-operator/helm-charts/openshift-xray/helminstall.sh +++ b/Openshift4/helm/openshift-xray/helminstall.sh @@ -57,7 +57,10 @@ fi JFROGURL="" if [[ -z "$4" ]] then - JFROGURL="http://openshiftartifactoryha-nginx" + # HELM + JFROGURL="http://artifactory-ha-nginx" + # OPERATOR + # JFROGURL="http://openshiftartifactoryha-nginx" else JFROGURL=$4 fi @@ -68,4 +71,6 @@ helm install xray . \ --set xray.database.url=$DBURL \ --set xray.database.user=$DBUSER \ --set xray.database.password=$DBPASS \ - --set xray.xray.jfrogUrl=$JFROGURL + --set xray.xray.jfrogUrl=$JFROGURL \ + --set xray.xray.joinKey=EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE \ + --set xray.xray.masterKey=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF diff --git a/Openshift4/xray-operator/helm-charts/openshift-xray/rabbitmq.yaml b/Openshift4/helm/openshift-xray/rabbitmq.yaml similarity index 79% rename from Openshift4/xray-operator/helm-charts/openshift-xray/rabbitmq.yaml rename to Openshift4/helm/openshift-xray/rabbitmq.yaml index 521df8e..df49bf6 100644 --- a/Openshift4/xray-operator/helm-charts/openshift-xray/rabbitmq.yaml +++ b/Openshift4/helm/openshift-xray/rabbitmq.yaml @@ -16,10 +16,10 @@ spec: app: rabbitmq spec: containers: - - image: quay.io/jfrog/xray-rabbitmq-rh:3.8.0 + - image: registry.connect.redhat.com/jfrog/xray-rabbitmq:3.8.9 imagePullPolicy: "Always" name: xray-rabbitmq ports: - containerPort: 4369 - containerPort: 5672 - - containerPort: 25672 + - containerPort: 15672 diff --git a/Openshift4/xray-operator/helm-charts/openshift-xray/rabbitmqservice.yaml b/Openshift4/helm/openshift-xray/rabbitmqservice.yaml similarity index 81% rename from Openshift4/xray-operator/helm-charts/openshift-xray/rabbitmqservice.yaml rename to Openshift4/helm/openshift-xray/rabbitmqservice.yaml index a8f108a..fb51fce 100644 --- a/Openshift4/xray-operator/helm-charts/openshift-xray/rabbitmqservice.yaml +++ b/Openshift4/helm/openshift-xray/rabbitmqservice.yaml @@ -8,17 +8,17 @@ spec: selector: app: rabbitmq ports: - - name: port1 + - name: epmd protocol: TCP port: 4369 targetPort: 4369 - - name: port3 + - name: ampq protocol: TCP port: 5672 targetPort: 5672 - - name: port4 + - name: management protocol: TCP - port: 25672 + port: 15672 targetPort: 25672 type: ClusterIP diff --git a/Openshift4/helm/openshift-xray/requirements.lock b/Openshift4/helm/openshift-xray/requirements.lock new file mode 100644 index 0000000..d53cf7c --- /dev/null +++ b/Openshift4/helm/openshift-xray/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: xray + repository: https://charts.jfrog.io/ + version: 6.0.6 +digest: sha256:339b5ec4e309ce2970ed34ebc700d6fe8f436d6cbe8dd5d352f0b080401752af +generated: "2020-10-01T15:04:29.008985-07:00" diff --git a/Openshift4/xray-operator/helm-charts/openshift-xray/requirements.yaml b/Openshift4/helm/openshift-xray/requirements.yaml similarity index 78% rename from Openshift4/xray-operator/helm-charts/openshift-xray/requirements.yaml rename to Openshift4/helm/openshift-xray/requirements.yaml index b0a88e0..f6311b7 100644 --- a/Openshift4/xray-operator/helm-charts/openshift-xray/requirements.yaml +++ b/Openshift4/helm/openshift-xray/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: xray - version: 4.2.0 + version: 6.0.6 repository: https://charts.jfrog.io/ diff --git a/Openshift4/helm/openshift-xray/values.yaml b/Openshift4/helm/openshift-xray/values.yaml new file mode 100755 index 0000000..b242f3d --- /dev/null +++ b/Openshift4/helm/openshift-xray/values.yaml @@ -0,0 +1,101 @@ +# Openshift Jfrog Xray +xray: + unifiedUpgradeAllowed: true + replicaCount: 1 + xray: + masterKey: "OVERRIDE" + joinKey: "OVERRIDE" + consoleLog: false + jfrogUrl: "OVERRIDE" + postgresql: + enabled: false + database: + url: "OVERRIDE" + user: "OVERRIDE" + password: "OVERRIDE" + common: + xrayUserId: "1000721035" + xrayGroupId: "1000721035" + analysis: + name: xray-analysis + image: + registry: registry.connect.redhat.com + repository: jfrog/xray-analysis + tag: 3.8.8 + updateStrategy: RollingUpdate + podManagementPolicy: Parallel + preStartCommand: + indexer: + name: xray-indexer + image: + registry: registry.connect.redhat.com + repository: jfrog/xray-indexer + tag: 3.8.8 + updateStrategy: RollingUpdate + podManagementPolicy: Parallel + persist: + name: xray-persist + image: + registry: registry.connect.redhat.com + repository: jfrog/xray-persist + tag: 3.8.8 + updateStrategy: RollingUpdate + podManagementPolicy: Parallel + persistence: + size: 10Gi + preStartCommand: + server: + name: xray-server + image: + registry: registry.connect.redhat.com + repository: jfrog/xray-server + tag: 3.8.8 + updateStrategy: RollingUpdate + podManagementPolicy: Parallel + replicaCount: 1 + router: + name: router + image: + registry: registry.connect.redhat.com + repository: jfrog/xray-router + tag: 1.4.3 + imagePullPolicy: IfNotPresent + rabbitmq-ha: + enabled: true + replicaCount: 1 + image: + repository: registry.connect.redhat.com/jfrog/xray-rabbitmq + tag: 3.8.9 + rabbitmqEpmdPort: 4369 + rabbitmqNodePort: 5672 + rabbitmqManagerPort: 15672 + rabbitmqUsername: guest + rabbitmqPassword: guest + managementUsername: management + managementPassword: management + initContainer: + enabled: false + securityContext: + fsGroup: 1000721035 + runAsUser: 1000721035 + runAsGroup: 1000721035 + livenessProbe: + initialDelaySeconds: 120 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 6 + exec: + command: + - /bin/sh + - -c + - 'rabbitmqctl status' + readinessProbe: + initialDelaySeconds: 20 + periodSeconds: 5 + timeoutSeconds: 3 + failureThreshold: 6 + exec: + command: + - /bin/sh + - -c + - 'rabbitmqctl status' diff --git a/Openshift4/openshift-xray/values.yaml b/Openshift4/openshift-xray/values.yaml deleted file mode 100755 index 3383f53..0000000 --- a/Openshift4/openshift-xray/values.yaml +++ /dev/null @@ -1,78 +0,0 @@ -# Openshift Jfrog Xray -xray: - unifiedUpgradeAllowed: true - replicaCount: 1 - xray: - masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE - consoleLog: false - jfrogUrl: "OVERRIDE" - postgresql: - enabled: false - database: - url: "OVERRIDE" - user: "OVERRIDE" - password: "OVERRIDE" - rabbitmq-ha: - enabled: true - replicaCount: 1 - image: - tag: 3.7.21-alpine - rabbitmqUsername: guest - rabbitmqPassword: "" - persistentVolume: - enabled: true - size: 20Gi - rbac: - create: true - preStartCommand: - global: - postgresqlTlsSecret: - analysis: - name: xray-analysis - image: - repository: registry.connect.redhat.com/jfrog/xray-analysis - version: 3.6.2 - updateStrategy: RollingUpdate - podManagementPolicy: Parallel - preStartCommand: - indexer: - name: xray-indexer - image: - repository: registry.connect.redhat.com/jfrog/xray-indexer - version: 3.6.2 - updateStrategy: RollingUpdate - podManagementPolicy: Parallel - persist: - name: xray-persist - image: - repository: registry.connect.redhat.com/jfrog/xray-persist - version: 3.6.2 - updateStrategy: RollingUpdate - podManagementPolicy: Parallel - persistence: - size: 10Gi - preStartCommand: - server: - name: xray-server - image: - repository: registry.connect.redhat.com/jfrog/xray-server - version: 3.6.2 - updateStrategy: RollingUpdate - podManagementPolicy: Parallel - replicaCount: 1 - router: - name: router - image: - repository: registry.connect.redhat.com/jfrog/xray-router - version: 1.4.2 - imagePullPolicy: IfNotPresent - rabbitmq-ha: - enabled: true - replicaCount: 1 - image: - repository: registry.connect.redhat.com/jfrog/xray-rabbitmq - tag: 3.8.0 - rabbitmqEpmdPort: 4369 - rabbitmqNodePort: 5672 - rabbitmqManagerPort: 15672 \ No newline at end of file diff --git a/Openshift4/artifactory-ha-operator/.gitignore b/Openshift4/operator/artifactory-ha-operator/.gitignore similarity index 100% rename from Openshift4/artifactory-ha-operator/.gitignore rename to Openshift4/operator/artifactory-ha-operator/.gitignore diff --git a/Openshift4/artifactory-ha-operator/.osdk-scorecard.yaml b/Openshift4/operator/artifactory-ha-operator/.osdk-scorecard.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/.osdk-scorecard.yaml rename to Openshift4/operator/artifactory-ha-operator/.osdk-scorecard.yaml diff --git a/Openshift4/artifactory-ha-operator/CHANGELOG.md b/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md similarity index 100% rename from Openshift4/artifactory-ha-operator/CHANGELOG.md rename to Openshift4/operator/artifactory-ha-operator/CHANGELOG.md diff --git a/Openshift4/artifactory-ha-operator/CONTRIBUTING.md b/Openshift4/operator/artifactory-ha-operator/CONTRIBUTING.md similarity index 100% rename from Openshift4/artifactory-ha-operator/CONTRIBUTING.md rename to Openshift4/operator/artifactory-ha-operator/CONTRIBUTING.md diff --git a/Openshift4/artifactory-ha-operator/Dockerfile b/Openshift4/operator/artifactory-ha-operator/Dockerfile similarity index 100% rename from Openshift4/artifactory-ha-operator/Dockerfile rename to Openshift4/operator/artifactory-ha-operator/Dockerfile diff --git a/Openshift4/artifactory-ha-operator/Makefile b/Openshift4/operator/artifactory-ha-operator/Makefile similarity index 100% rename from Openshift4/artifactory-ha-operator/Makefile rename to Openshift4/operator/artifactory-ha-operator/Makefile diff --git a/Openshift4/artifactory-ha-operator/PROJECT b/Openshift4/operator/artifactory-ha-operator/PROJECT similarity index 100% rename from Openshift4/artifactory-ha-operator/PROJECT rename to Openshift4/operator/artifactory-ha-operator/PROJECT diff --git a/Openshift4/artifactory-ha-operator/README.md b/Openshift4/operator/artifactory-ha-operator/README.md similarity index 100% rename from Openshift4/artifactory-ha-operator/README.md rename to Openshift4/operator/artifactory-ha-operator/README.md diff --git a/Openshift4/artifactory-ha-operator/build/Dockerfile b/Openshift4/operator/artifactory-ha-operator/build/Dockerfile similarity index 100% rename from Openshift4/artifactory-ha-operator/build/Dockerfile rename to Openshift4/operator/artifactory-ha-operator/build/Dockerfile diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.0/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.0/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.0/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.0/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.0/manifests/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.0/manifests/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.0/manifests/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.0/manifests/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.0/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.0/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.0/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.0/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.0/metadata/annotations.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.0/metadata/annotations.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.0/metadata/annotations.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.0/metadata/annotations.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.0/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.0/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.0/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.0/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.1/artifactory-ha-operator.v1.0.1.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.1/artifactory-ha-operator.v1.0.1.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.1/artifactory-ha-operator.v1.0.1.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.1/artifactory-ha-operator.v1.0.1.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.1/manifests/artifactory-ha-operator.v1.0.1.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.1/manifests/artifactory-ha-operator.v1.0.1.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.1/manifests/artifactory-ha-operator.v1.0.1.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.1/manifests/artifactory-ha-operator.v1.0.1.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.1/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.1/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.1/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.1/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.1/metadata/annotations.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.1/metadata/annotations.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.1/metadata/annotations.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.1/metadata/annotations.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.1/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.1/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.1/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.1/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.2/artifactory-ha-operator.v1.0.2.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.2/artifactory-ha-operator.v1.0.2.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.2/artifactory-ha-operator.v1.0.2.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.2/artifactory-ha-operator.v1.0.2.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.2/manifests/artifactory-ha-operator.v1.0.2.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.2/manifests/artifactory-ha-operator.v1.0.2.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.2/manifests/artifactory-ha-operator.v1.0.2.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.2/manifests/artifactory-ha-operator.v1.0.2.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.2/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.2/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.2/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.2/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.2/metadata/annotations.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.2/metadata/annotations.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.2/metadata/annotations.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.2/metadata/annotations.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.2/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.2/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.2/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.2/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.3/artifactory-ha-operator.v1.0.3.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.3/artifactory-ha-operator.v1.0.3.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.3/artifactory-ha-operator.v1.0.3.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.3/artifactory-ha-operator.v1.0.3.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.3/manifests/artifactory-ha-operator.v1.0.3.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.3/manifests/artifactory-ha-operator.v1.0.3.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.3/manifests/artifactory-ha-operator.v1.0.3.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.3/manifests/artifactory-ha-operator.v1.0.3.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.3/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.3/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.3/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.3/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.3/metadata/annotations.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.3/metadata/annotations.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.3/metadata/annotations.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.3/metadata/annotations.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.0.3/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.0.3/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.0.3/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.0.3/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.1.0/artifactory-ha-operator.v1.1.0.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.0/artifactory-ha-operator.v1.1.0.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.1.0/artifactory-ha-operator.v1.1.0.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.1.0/artifactory-ha-operator.v1.1.0.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.1.0/manifests/artifactory-ha-operator.v1.1.0.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.0/manifests/artifactory-ha-operator.v1.1.0.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.1.0/manifests/artifactory-ha-operator.v1.1.0.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.1.0/manifests/artifactory-ha-operator.v1.1.0.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.1.0/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.0/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.1.0/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.1.0/manifests/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.1.0/metadata/annotations.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.0/metadata/annotations.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.1.0/metadata/annotations.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.1.0/metadata/annotations.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/1.1.0/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/1.1.0/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/1.1.0/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/1.1.0/openshiftartifactoryhas.charts.helm.k8s.io.crd.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle/bundle-1.0.0.Dockerfile b/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.0.0.Dockerfile similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/bundle-1.0.0.Dockerfile rename to Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.0.0.Dockerfile diff --git a/Openshift4/artifactory-ha-operator/bundle/bundle-1.0.1.Dockerfile b/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.0.1.Dockerfile similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/bundle-1.0.1.Dockerfile rename to Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.0.1.Dockerfile diff --git a/Openshift4/artifactory-ha-operator/bundle/bundle-1.0.2.Dockerfile b/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.0.2.Dockerfile similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/bundle-1.0.2.Dockerfile rename to Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.0.2.Dockerfile diff --git a/Openshift4/artifactory-ha-operator/bundle/bundle-1.0.3.Dockerfile b/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.0.3.Dockerfile similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/bundle-1.0.3.Dockerfile rename to Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.0.3.Dockerfile diff --git a/Openshift4/artifactory-ha-operator/bundle/bundle-1.1.0.Dockerfile b/Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.0.Dockerfile similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/bundle-1.1.0.Dockerfile rename to Openshift4/operator/artifactory-ha-operator/bundle/bundle-1.1.0.Dockerfile diff --git a/Openshift4/artifactory-ha-operator/bundle/openshiftartifactoryha-operator.package.yaml b/Openshift4/operator/artifactory-ha-operator/bundle/openshiftartifactoryha-operator.package.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle/openshiftartifactoryha-operator.package.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle/openshiftartifactoryha-operator.package.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle_old/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/bundle_old/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle_old/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle_old/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle_old/artifactory-ha-operator.v1.0.1.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/bundle_old/artifactory-ha-operator.v1.0.1.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle_old/artifactory-ha-operator.v1.0.1.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle_old/artifactory-ha-operator.v1.0.1.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle_old/artifactory-ha-operator.v1.0.2.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/bundle_old/artifactory-ha-operator.v1.0.2.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle_old/artifactory-ha-operator.v1.0.2.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle_old/artifactory-ha-operator.v1.0.2.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle_old/artifactory-ha-operator.v1.0.3.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/bundle_old/artifactory-ha-operator.v1.0.3.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle_old/artifactory-ha-operator.v1.0.3.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle_old/artifactory-ha-operator.v1.0.3.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle_old/openshiftartifactoryha-operator.crd.yaml b/Openshift4/operator/artifactory-ha-operator/bundle_old/openshiftartifactoryha-operator.crd.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle_old/openshiftartifactoryha-operator.crd.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle_old/openshiftartifactoryha-operator.crd.yaml diff --git a/Openshift4/artifactory-ha-operator/bundle_old/openshiftartifactoryha-operator.package.yaml b/Openshift4/operator/artifactory-ha-operator/bundle_old/openshiftartifactoryha-operator.package.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/bundle_old/openshiftartifactoryha-operator.package.yaml rename to Openshift4/operator/artifactory-ha-operator/bundle_old/openshiftartifactoryha-operator.package.yaml diff --git a/Openshift4/artifactory-ha-operator/config/default/kustomization.yaml b/Openshift4/operator/artifactory-ha-operator/config/default/kustomization.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/default/kustomization.yaml rename to Openshift4/operator/artifactory-ha-operator/config/default/kustomization.yaml diff --git a/Openshift4/artifactory-ha-operator/config/default/manager_auth_proxy_patch.yaml b/Openshift4/operator/artifactory-ha-operator/config/default/manager_auth_proxy_patch.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/default/manager_auth_proxy_patch.yaml rename to Openshift4/operator/artifactory-ha-operator/config/default/manager_auth_proxy_patch.yaml diff --git a/Openshift4/artifactory-ha-operator/config/manager/kustomization.yaml b/Openshift4/operator/artifactory-ha-operator/config/manager/kustomization.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/manager/kustomization.yaml rename to Openshift4/operator/artifactory-ha-operator/config/manager/kustomization.yaml diff --git a/Openshift4/artifactory-ha-operator/config/manager/manager.yaml b/Openshift4/operator/artifactory-ha-operator/config/manager/manager.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/manager/manager.yaml rename to Openshift4/operator/artifactory-ha-operator/config/manager/manager.yaml diff --git a/Openshift4/artifactory-ha-operator/config/manifests/bases/artifactory-ha-operator.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/config/manifests/bases/artifactory-ha-operator.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/manifests/bases/artifactory-ha-operator.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/config/manifests/bases/artifactory-ha-operator.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/config/manifests/kustomization.yaml b/Openshift4/operator/artifactory-ha-operator/config/manifests/kustomization.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/manifests/kustomization.yaml rename to Openshift4/operator/artifactory-ha-operator/config/manifests/kustomization.yaml diff --git a/Openshift4/artifactory-ha-operator/config/prometheus/kustomization.yaml b/Openshift4/operator/artifactory-ha-operator/config/prometheus/kustomization.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/prometheus/kustomization.yaml rename to Openshift4/operator/artifactory-ha-operator/config/prometheus/kustomization.yaml diff --git a/Openshift4/artifactory-ha-operator/config/prometheus/monitor.yaml b/Openshift4/operator/artifactory-ha-operator/config/prometheus/monitor.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/prometheus/monitor.yaml rename to Openshift4/operator/artifactory-ha-operator/config/prometheus/monitor.yaml diff --git a/Openshift4/artifactory-ha-operator/config/rbac/auth_proxy_client_clusterrole.yaml b/Openshift4/operator/artifactory-ha-operator/config/rbac/auth_proxy_client_clusterrole.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/rbac/auth_proxy_client_clusterrole.yaml rename to Openshift4/operator/artifactory-ha-operator/config/rbac/auth_proxy_client_clusterrole.yaml diff --git a/Openshift4/artifactory-ha-operator/config/rbac/auth_proxy_role.yaml b/Openshift4/operator/artifactory-ha-operator/config/rbac/auth_proxy_role.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/rbac/auth_proxy_role.yaml rename to Openshift4/operator/artifactory-ha-operator/config/rbac/auth_proxy_role.yaml diff --git a/Openshift4/artifactory-ha-operator/config/rbac/auth_proxy_role_binding.yaml b/Openshift4/operator/artifactory-ha-operator/config/rbac/auth_proxy_role_binding.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/rbac/auth_proxy_role_binding.yaml rename to Openshift4/operator/artifactory-ha-operator/config/rbac/auth_proxy_role_binding.yaml diff --git a/Openshift4/artifactory-ha-operator/config/rbac/auth_proxy_service.yaml b/Openshift4/operator/artifactory-ha-operator/config/rbac/auth_proxy_service.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/rbac/auth_proxy_service.yaml rename to Openshift4/operator/artifactory-ha-operator/config/rbac/auth_proxy_service.yaml diff --git a/Openshift4/artifactory-ha-operator/config/rbac/kustomization.yaml b/Openshift4/operator/artifactory-ha-operator/config/rbac/kustomization.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/rbac/kustomization.yaml rename to Openshift4/operator/artifactory-ha-operator/config/rbac/kustomization.yaml diff --git a/Openshift4/artifactory-ha-operator/config/rbac/leader_election_role.yaml b/Openshift4/operator/artifactory-ha-operator/config/rbac/leader_election_role.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/rbac/leader_election_role.yaml rename to Openshift4/operator/artifactory-ha-operator/config/rbac/leader_election_role.yaml diff --git a/Openshift4/artifactory-ha-operator/config/rbac/leader_election_role_binding.yaml b/Openshift4/operator/artifactory-ha-operator/config/rbac/leader_election_role_binding.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/rbac/leader_election_role_binding.yaml rename to Openshift4/operator/artifactory-ha-operator/config/rbac/leader_election_role_binding.yaml diff --git a/Openshift4/artifactory-ha-operator/config/rbac/role.yaml b/Openshift4/operator/artifactory-ha-operator/config/rbac/role.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/rbac/role.yaml rename to Openshift4/operator/artifactory-ha-operator/config/rbac/role.yaml diff --git a/Openshift4/artifactory-ha-operator/config/rbac/role_binding.yaml b/Openshift4/operator/artifactory-ha-operator/config/rbac/role_binding.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/rbac/role_binding.yaml rename to Openshift4/operator/artifactory-ha-operator/config/rbac/role_binding.yaml diff --git a/Openshift4/artifactory-ha-operator/config/scorecard/bases/config.yaml b/Openshift4/operator/artifactory-ha-operator/config/scorecard/bases/config.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/scorecard/bases/config.yaml rename to Openshift4/operator/artifactory-ha-operator/config/scorecard/bases/config.yaml diff --git a/Openshift4/artifactory-ha-operator/config/scorecard/kustomization.yaml b/Openshift4/operator/artifactory-ha-operator/config/scorecard/kustomization.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/scorecard/kustomization.yaml rename to Openshift4/operator/artifactory-ha-operator/config/scorecard/kustomization.yaml diff --git a/Openshift4/artifactory-ha-operator/config/scorecard/patches/basic.config.yaml b/Openshift4/operator/artifactory-ha-operator/config/scorecard/patches/basic.config.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/scorecard/patches/basic.config.yaml rename to Openshift4/operator/artifactory-ha-operator/config/scorecard/patches/basic.config.yaml diff --git a/Openshift4/artifactory-ha-operator/config/scorecard/patches/olm.config.yaml b/Openshift4/operator/artifactory-ha-operator/config/scorecard/patches/olm.config.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/config/scorecard/patches/olm.config.yaml rename to Openshift4/operator/artifactory-ha-operator/config/scorecard/patches/olm.config.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/catalogsourceconfig.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/catalogsourceconfig.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/catalogsourceconfig.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/catalogsourceconfig.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/crds/charts.helm.k8s.io_openshiftartifactoryhas_crd.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/crds/charts.helm.k8s.io_openshiftartifactoryhas_crd.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/crds/charts.helm.k8s.io_openshiftartifactoryhas_crd.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/crds/charts.helm.k8s.io_openshiftartifactoryhas_crd.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/crds/charts.helm.k8s.io_v1alpha1_openshiftartifactoryha_cr.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/crds/charts.helm.k8s.io_v1alpha1_openshiftartifactoryha_cr.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/crds/charts.helm.k8s.io_v1alpha1_openshiftartifactoryha_cr.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/crds/charts.helm.k8s.io_v1alpha1_openshiftartifactoryha_cr.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/namespace.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/namespace.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/namespace.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/namespace.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.0/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.0/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.0/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.0/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.1/artifactory-ha-operator.v1.0.1.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.1/artifactory-ha-operator.v1.0.1.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.1/artifactory-ha-operator.v1.0.1.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.1/artifactory-ha-operator.v1.0.1.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.2/artifactory-ha-operator.v1.0.2.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.2/artifactory-ha-operator.v1.0.2.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.2/artifactory-ha-operator.v1.0.2.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.2/artifactory-ha-operator.v1.0.2.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.3/artifactory-ha-operator.v1.0.3.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.3/artifactory-ha-operator.v1.0.3.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.3/artifactory-ha-operator.v1.0.3.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.3/artifactory-ha-operator.v1.0.3.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.1.0/artifactory-ha-operator.v1.1.0.clusterserviceversion.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.1.0/artifactory-ha-operator.v1.1.0.clusterserviceversion.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.1.0/artifactory-ha-operator.v1.1.0.clusterserviceversion.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.1.0/artifactory-ha-operator.v1.1.0.clusterserviceversion.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/artifactory-ha-operator.package.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/artifactory-ha-operator.package.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/artifactory-ha-operator.package.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/artifactory-ha-operator.package.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/operator.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/operator.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/operator.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/operator.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/operatorgroup.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/operatorgroup.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/operatorgroup.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/operatorgroup.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/project.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/project.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/project.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/project.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/role.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/role.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/role.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/role.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/role_binding.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/role_binding.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/role_binding.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/role_binding.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/service_account.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/service_account.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/service_account.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/service_account.yaml diff --git a/Openshift4/artifactory-ha-operator/deploy/subscription.yaml b/Openshift4/operator/artifactory-ha-operator/deploy/subscription.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/deploy/subscription.yaml rename to Openshift4/operator/artifactory-ha-operator/deploy/subscription.yaml diff --git a/Openshift4/artifactory-ha-operator/helm-charts/README.md b/Openshift4/operator/artifactory-ha-operator/helm-charts/README.md similarity index 100% rename from Openshift4/artifactory-ha-operator/helm-charts/README.md rename to Openshift4/operator/artifactory-ha-operator/helm-charts/README.md diff --git a/Openshift4/artifactory-ha-operator/licenses/LICENSE b/Openshift4/operator/artifactory-ha-operator/licenses/LICENSE similarity index 100% rename from Openshift4/artifactory-ha-operator/licenses/LICENSE rename to Openshift4/operator/artifactory-ha-operator/licenses/LICENSE diff --git a/Openshift4/artifactory-ha-operator/watches.yaml b/Openshift4/operator/artifactory-ha-operator/watches.yaml similarity index 100% rename from Openshift4/artifactory-ha-operator/watches.yaml rename to Openshift4/operator/artifactory-ha-operator/watches.yaml diff --git a/Openshift4/xray-operator/CHANGELOG.md b/Openshift4/operator/xray-operator/CHANGELOG.md similarity index 100% rename from Openshift4/xray-operator/CHANGELOG.md rename to Openshift4/operator/xray-operator/CHANGELOG.md diff --git a/Openshift4/xray-operator/CONTRIBUTING.md b/Openshift4/operator/xray-operator/CONTRIBUTING.md similarity index 100% rename from Openshift4/xray-operator/CONTRIBUTING.md rename to Openshift4/operator/xray-operator/CONTRIBUTING.md diff --git a/Openshift4/xray-operator/README.md b/Openshift4/operator/xray-operator/README.md similarity index 100% rename from Openshift4/xray-operator/README.md rename to Openshift4/operator/xray-operator/README.md diff --git a/Openshift4/xray-operator/build/Dockerfile b/Openshift4/operator/xray-operator/build/Dockerfile similarity index 100% rename from Openshift4/xray-operator/build/Dockerfile rename to Openshift4/operator/xray-operator/build/Dockerfile diff --git a/Openshift4/xray-operator/bundle/openshiftxray-operator.crd.yaml b/Openshift4/operator/xray-operator/bundle/openshiftxray-operator.crd.yaml similarity index 100% rename from Openshift4/xray-operator/bundle/openshiftxray-operator.crd.yaml rename to Openshift4/operator/xray-operator/bundle/openshiftxray-operator.crd.yaml diff --git a/Openshift4/xray-operator/bundle/openshiftxray-operator.package.yaml b/Openshift4/operator/xray-operator/bundle/openshiftxray-operator.package.yaml similarity index 100% rename from Openshift4/xray-operator/bundle/openshiftxray-operator.package.yaml rename to Openshift4/operator/xray-operator/bundle/openshiftxray-operator.package.yaml diff --git a/Openshift4/xray-operator/bundle/xray-operator.v1.0.0.clusterserviceversion.yaml b/Openshift4/operator/xray-operator/bundle/xray-operator.v1.0.0.clusterserviceversion.yaml similarity index 100% rename from Openshift4/xray-operator/bundle/xray-operator.v1.0.0.clusterserviceversion.yaml rename to Openshift4/operator/xray-operator/bundle/xray-operator.v1.0.0.clusterserviceversion.yaml diff --git a/Openshift4/xray-operator/bundle/xray-operator.v1.0.1.clusterserviceversion.yaml b/Openshift4/operator/xray-operator/bundle/xray-operator.v1.0.1.clusterserviceversion.yaml similarity index 100% rename from Openshift4/xray-operator/bundle/xray-operator.v1.0.1.clusterserviceversion.yaml rename to Openshift4/operator/xray-operator/bundle/xray-operator.v1.0.1.clusterserviceversion.yaml diff --git a/Openshift4/xray-operator/bundle/xray-operator.v1.0.2.clusterserviceversion.yaml b/Openshift4/operator/xray-operator/bundle/xray-operator.v1.0.2.clusterserviceversion.yaml similarity index 100% rename from Openshift4/xray-operator/bundle/xray-operator.v1.0.2.clusterserviceversion.yaml rename to Openshift4/operator/xray-operator/bundle/xray-operator.v1.0.2.clusterserviceversion.yaml diff --git a/Openshift4/xray-operator/bundle/xray-operator.v1.0.3.clusterserviceversion.yaml b/Openshift4/operator/xray-operator/bundle/xray-operator.v1.0.3.clusterserviceversion.yaml similarity index 100% rename from Openshift4/xray-operator/bundle/xray-operator.v1.0.3.clusterserviceversion.yaml rename to Openshift4/operator/xray-operator/bundle/xray-operator.v1.0.3.clusterserviceversion.yaml diff --git a/Openshift4/xray-operator/deploy/crds/charts.helm.k8s.io_openshiftxrays_crd.yaml b/Openshift4/operator/xray-operator/deploy/crds/charts.helm.k8s.io_openshiftxrays_crd.yaml similarity index 100% rename from Openshift4/xray-operator/deploy/crds/charts.helm.k8s.io_openshiftxrays_crd.yaml rename to Openshift4/operator/xray-operator/deploy/crds/charts.helm.k8s.io_openshiftxrays_crd.yaml diff --git a/Openshift4/xray-operator/deploy/crds/charts.helm.k8s.io_v1alpha1_openshiftxray_cr.yaml b/Openshift4/operator/xray-operator/deploy/crds/charts.helm.k8s.io_v1alpha1_openshiftxray_cr.yaml similarity index 100% rename from Openshift4/xray-operator/deploy/crds/charts.helm.k8s.io_v1alpha1_openshiftxray_cr.yaml rename to Openshift4/operator/xray-operator/deploy/crds/charts.helm.k8s.io_v1alpha1_openshiftxray_cr.yaml diff --git a/Openshift4/xray-operator/deploy/olm-catalog/xray-operator/1.0.0/xray-operator.v1.0.0.clusterserviceversion.yaml b/Openshift4/operator/xray-operator/deploy/olm-catalog/xray-operator/1.0.0/xray-operator.v1.0.0.clusterserviceversion.yaml similarity index 100% rename from Openshift4/xray-operator/deploy/olm-catalog/xray-operator/1.0.0/xray-operator.v1.0.0.clusterserviceversion.yaml rename to Openshift4/operator/xray-operator/deploy/olm-catalog/xray-operator/1.0.0/xray-operator.v1.0.0.clusterserviceversion.yaml diff --git a/Openshift4/xray-operator/deploy/olm-catalog/xray-operator/1.0.1/xray-operator.v1.0.1.clusterserviceversion.yaml b/Openshift4/operator/xray-operator/deploy/olm-catalog/xray-operator/1.0.1/xray-operator.v1.0.1.clusterserviceversion.yaml similarity index 100% rename from Openshift4/xray-operator/deploy/olm-catalog/xray-operator/1.0.1/xray-operator.v1.0.1.clusterserviceversion.yaml rename to Openshift4/operator/xray-operator/deploy/olm-catalog/xray-operator/1.0.1/xray-operator.v1.0.1.clusterserviceversion.yaml diff --git a/Openshift4/xray-operator/deploy/olm-catalog/xray-operator/1.0.2/xray-operator.v1.0.2.clusterserviceversion.yaml b/Openshift4/operator/xray-operator/deploy/olm-catalog/xray-operator/1.0.2/xray-operator.v1.0.2.clusterserviceversion.yaml similarity index 100% rename from Openshift4/xray-operator/deploy/olm-catalog/xray-operator/1.0.2/xray-operator.v1.0.2.clusterserviceversion.yaml rename to Openshift4/operator/xray-operator/deploy/olm-catalog/xray-operator/1.0.2/xray-operator.v1.0.2.clusterserviceversion.yaml diff --git a/Openshift4/xray-operator/deploy/olm-catalog/xray-operator/1.0.3/xray-operator.v1.0.3.clusterserviceversion.yaml b/Openshift4/operator/xray-operator/deploy/olm-catalog/xray-operator/1.0.3/xray-operator.v1.0.3.clusterserviceversion.yaml similarity index 100% rename from Openshift4/xray-operator/deploy/olm-catalog/xray-operator/1.0.3/xray-operator.v1.0.3.clusterserviceversion.yaml rename to Openshift4/operator/xray-operator/deploy/olm-catalog/xray-operator/1.0.3/xray-operator.v1.0.3.clusterserviceversion.yaml diff --git a/Openshift4/xray-operator/deploy/olm-catalog/xray-operator/xray-operator.package.yaml b/Openshift4/operator/xray-operator/deploy/olm-catalog/xray-operator/xray-operator.package.yaml similarity index 100% rename from Openshift4/xray-operator/deploy/olm-catalog/xray-operator/xray-operator.package.yaml rename to Openshift4/operator/xray-operator/deploy/olm-catalog/xray-operator/xray-operator.package.yaml diff --git a/Openshift4/xray-operator/deploy/operator.yaml b/Openshift4/operator/xray-operator/deploy/operator.yaml similarity index 100% rename from Openshift4/xray-operator/deploy/operator.yaml rename to Openshift4/operator/xray-operator/deploy/operator.yaml diff --git a/Openshift4/xray-operator/deploy/role.yaml b/Openshift4/operator/xray-operator/deploy/role.yaml similarity index 100% rename from Openshift4/xray-operator/deploy/role.yaml rename to Openshift4/operator/xray-operator/deploy/role.yaml diff --git a/Openshift4/xray-operator/deploy/role_binding.yaml b/Openshift4/operator/xray-operator/deploy/role_binding.yaml similarity index 100% rename from Openshift4/xray-operator/deploy/role_binding.yaml rename to Openshift4/operator/xray-operator/deploy/role_binding.yaml diff --git a/Openshift4/xray-operator/deploy/service_account.yaml b/Openshift4/operator/xray-operator/deploy/service_account.yaml similarity index 100% rename from Openshift4/xray-operator/deploy/service_account.yaml rename to Openshift4/operator/xray-operator/deploy/service_account.yaml diff --git a/Openshift4/xray-operator/deploy/subscription.yaml b/Openshift4/operator/xray-operator/deploy/subscription.yaml similarity index 100% rename from Openshift4/xray-operator/deploy/subscription.yaml rename to Openshift4/operator/xray-operator/deploy/subscription.yaml diff --git a/Openshift4/openshift-xray/CHANGELOG.md b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md old mode 100755 new mode 100644 similarity index 100% rename from Openshift4/openshift-xray/CHANGELOG.md rename to Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md diff --git a/Openshift4/xray-operator/helm-charts/openshift-xray/Chart.yaml b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml similarity index 100% rename from Openshift4/xray-operator/helm-charts/openshift-xray/Chart.yaml rename to Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml diff --git a/Openshift4/xray-operator/helm-charts/openshift-xray/LICENSE b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/LICENSE similarity index 100% rename from Openshift4/xray-operator/helm-charts/openshift-xray/LICENSE rename to Openshift4/operator/xray-operator/helm-charts/openshift-xray/LICENSE diff --git a/Openshift4/xray-operator/helm-charts/openshift-xray/README.md b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/README.md similarity index 100% rename from Openshift4/xray-operator/helm-charts/openshift-xray/README.md rename to Openshift4/operator/xray-operator/helm-charts/openshift-xray/README.md diff --git a/Openshift4/openshift-xray/helminstall.sh b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/helminstall.sh old mode 100755 new mode 100644 similarity index 100% rename from Openshift4/openshift-xray/helminstall.sh rename to Openshift4/operator/xray-operator/helm-charts/openshift-xray/helminstall.sh diff --git a/Openshift4/openshift-xray/rabbitmq.yaml b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/rabbitmq.yaml similarity index 100% rename from Openshift4/openshift-xray/rabbitmq.yaml rename to Openshift4/operator/xray-operator/helm-charts/openshift-xray/rabbitmq.yaml diff --git a/Openshift4/openshift-xray/rabbitmqservice.yaml b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/rabbitmqservice.yaml similarity index 100% rename from Openshift4/openshift-xray/rabbitmqservice.yaml rename to Openshift4/operator/xray-operator/helm-charts/openshift-xray/rabbitmqservice.yaml diff --git a/Openshift4/openshift-xray/requirements.lock b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/requirements.lock similarity index 100% rename from Openshift4/openshift-xray/requirements.lock rename to Openshift4/operator/xray-operator/helm-charts/openshift-xray/requirements.lock diff --git a/Openshift4/openshift-xray/requirements.yaml b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/requirements.yaml similarity index 100% rename from Openshift4/openshift-xray/requirements.yaml rename to Openshift4/operator/xray-operator/helm-charts/openshift-xray/requirements.yaml diff --git a/Openshift4/xray-operator/helm-charts/openshift-xray/values.yaml b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml similarity index 100% rename from Openshift4/xray-operator/helm-charts/openshift-xray/values.yaml rename to Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml diff --git a/Openshift4/xray-operator/licenses/LICENSE b/Openshift4/operator/xray-operator/licenses/LICENSE similarity index 100% rename from Openshift4/xray-operator/licenses/LICENSE rename to Openshift4/operator/xray-operator/licenses/LICENSE diff --git a/Openshift4/xray-operator/watches.yaml b/Openshift4/operator/xray-operator/watches.yaml similarity index 100% rename from Openshift4/xray-operator/watches.yaml rename to Openshift4/operator/xray-operator/watches.yaml diff --git a/Openshift4/xray-operator/helm-charts/openshift-xray/requirements.lock b/Openshift4/xray-operator/helm-charts/openshift-xray/requirements.lock deleted file mode 100644 index 521af70..0000000 --- a/Openshift4/xray-operator/helm-charts/openshift-xray/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: xray - repository: https://charts.jfrog.io/ - version: 4.2.0 -digest: sha256:5e016b3e02e80668003980f2e0399f152f7d83e39957813db3aa3efa9651474f -generated: "2020-08-17T14:49:47.771127-07:00"