Fixing changelog versions to be based off the operator version

Openshift4/operator/artifactory-ha-operator/CHANGELOG.md

@@ -1,26 +1,29 @@
 # JFrog  Openshift Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [3.1.0] - Aug 17, 2020
+## [1.1.0] - Sept 30, 2020
-* Updating to latest jfrog/artifactory-ha helm chart version 3.1.0 artifactory version 3.1.0
+* Updating Operator to latest jfrog/artifactory-ha helm chart version 4.1.0 artifactory version 7.9.0
 
-## [3.0.5] - July 16, 2020
+## [1.0.3] - Aug 17, 2020
-* Updating to latest jfrog/artifactory-ha helm chart version 3.0.5 artifactory version 7.6.3
+* Updating Operator to latest jfrog/artifactory-ha helm chart version 3.1.0 artifactory version 7.7.3
 
-## [2.6.0] - June 29, 2020
+## [1.0.2] - July 16, 2020
+* Updating Operator to latest jfrog/artifactory-ha helm chart version 3.0.5 artifactory version 7.6.3
+
+## [1.0.1] - June 29, 2020
 * Updating to latest jfrog/artifactory-ha helm chart version 2.6.0 artifactory version 7.6.1
 
-## [2.4.6] - May 12, 2020
+## [1.0.0] - May 12, 2020
 * Updating to latest jfrog/artifactory-ha helm chart version 2.4.6 artifactory version 7.4.3
 
-## [2.3.0] - April 13, 2020
+## [0.4.0] - April 13, 2020
 * Updating to latest jfrog/artifactory-ha helm chart version 2.3.0
 
-## [2.2.9] - April 11, 2020
+## [0.3.0] - April 11, 2020
 * Fixed issues with master key
 
-## [2.1.9] - March 17, 2020
+## [0.2.0] - March 17, 2020
 * Updated Artifactory version to 7.3.2
 
-## [2.0.35] - March 09, 2020
+## [0.1.0] - March 09, 2020
 * Updated Artifactory version to 7.2.1

Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md

@@ -0,0 +1,29 @@
+# JFrog  Openshift Artifactory-ha Chart Changelog
+All changes to this chart will be documented in this file.
+
+## [4.1.0] - Sept 30, 2020
+* Updating to latest jfrog/artifactory-ha helm chart version 4.1.0 artifactory version 7.9.0
+
+## [3.1.0] - Aug 17, 2020
+* Updating to latest jfrog/artifactory-ha helm chart version 3.1.0 artifactory version 7.7.3
+
+## [3.0.5] - Jul 16, 2020
+* Updating to latest jfrog/artifactory helm chart version 3.0.5 artifactory version 7.6.3
+
+## [2.6.0] - June 29, 2020
+* Updating to latest jfrog/artifactory helm chart version 2.6.0 artifactory version 7.6.1
+
+## [2.4.6] - May 12, 2020
+* Updating to latest jfrog/artifactory-ha helm chart version 2.4.6 artifactory version 7.4.3
+
+## [2.3.0] - April 13, 2020
+* Updating to latest jfrog/artifactory-ha helm chart version 2.3.0
+
+## [2.2.9] - April 11, 2020
+* Fixed issues with master key
+
+## [2.1.9] - March 17, 2020
+* Updated Artifactory version to 7.3.2
+
+## [2.0.35] - March 09, 2020
+* Updated Artifactory version to 7.2.1

Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+appVersion: 7.9.0
+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
+keywords:
+- artifactory
+- jfrog
+- devops
+maintainers:
+- email: vinaya@jfrog.com
+  name: Vinay Aggarwal
+- email: johnp@jfrog.com
+  name: John Peterson
+name: openshift-artifactory-ha
+sources:
+- https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
+- https://github.com/jfrog/charts
+version: 4.1.0

Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/helminstall.sh

@@ -0,0 +1,57 @@
+#!/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
+
+# 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=EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE \
+               --set artifactory-ha.artifactory.masterKey=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+

Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/requirements.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: artifactory-ha
+  repository: https://charts.jfrog.io/
+  version: 4.1.0
+digest: sha256:8df1fd70eeabbb7687da0dd534d2161a413389ec40f331d5eb8e95ae50119222
+generated: "2020-09-30T12:30:08.142288-07:00"

Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/requirements.yaml

@@ -0,0 +1,4 @@
+dependencies:
+  - name: artifactory-ha
+    version: 4.1.0
+    repository: https://charts.jfrog.io/

Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/values.yaml

@@ -0,0 +1,99 @@
+# Openshift Artifactory HA
+# This helm chart subcharts the latest jfrog/artifactory-ha chart
+# and applies various things like initContainers, nginx mainConf, etc
+# to enable the artifactory-ha helm chart to work in an openshift environment
+artifactory-ha:
+  ###################################
+  # EDIT TO YOUR DB CONFIGURATION
+  ###################################
+  database:
+    type: "OVERRIDE"
+    driver: "OVERRIDE"
+    url: "OVERRIDE"
+    user: "OVERRIDE"
+    password: "OVERRIDE"
+  initContainerImage: registry.connect.redhat.com/jfrog/init:1.0.1
+  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:
+    uid: "1000721030"
+    ## Change to use RH UBI images
+    image:
+      registry: registry.connect.redhat.com
+      repository: jfrog/artifactory-pro
+      tag: 7.9.0
+    node:
+      replicaCount: 2
+      waitForPrimaryStartup:
+        enabled: false
+    masterKey: "OVERRIDE"
+    joinKey: "OVERRIDE"
+  postgresql:
+    enabled: false
+  nginx:
+    uid: "1000720104"
+    gid: "1000720107"
+    image:
+      registry: registry.redhat.io
+      repository: rhel8/nginx-116
+      tag: latest
+    ## K8S secret name for the TLS secret to be used for SSL
+    tlsSecretName: "OVERRIDE"
+    service:
+      ssloffload: false
+    http:
+      externalPort: 80
+      internalPort: 8080
+    https:
+      externalPort: 443
+      internalPort: 8443
+    mainConf: |
+      # Main Nginx configuration file
+      worker_processes  4;
+      error_log  {{ .Values.nginx.persistence.mountPath }}/logs//error.log warn;
+      pid        /tmp/nginx.pid;
+      events {
+        worker_connections  1024;
+      }
+      http {
+        include       /etc/nginx/mime.types;
+        default_type  application/octet-stream;
+        variables_hash_max_size 1024;
+        variables_hash_bucket_size 64;
+        server_names_hash_max_size 4096;
+        server_names_hash_bucket_size 128;
+        types_hash_max_size 2048;
+        types_hash_bucket_size 64;
+        proxy_read_timeout 2400s;
+        client_header_timeout 2400s;
+        client_body_timeout 2400s;
+        proxy_connect_timeout 75s;
+        proxy_send_timeout 2400s;
+        proxy_buffer_size 32k;
+        proxy_buffers 40 32k;
+        proxy_busy_buffers_size 64k;
+        proxy_temp_file_write_size 250m;
+        proxy_http_version 1.1;
+        client_body_buffer_size 128k;
+        log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+        '$status $body_bytes_sent "$http_referer" '
+        '"$http_user_agent" "$http_x_forwarded_for"';
+        log_format timing 'ip = $remote_addr '
+        'user = \"$remote_user\" '
+        'local_time = \"$time_local\" '
+        'host = $host '
+        'request = \"$request\" '
+        'status = $status '
+        'bytes = $body_bytes_sent '
+        'upstream = \"$upstream_addr\" '
+        'upstream_time = $upstream_response_time '
+        'request_time = $request_time '
+        'referer = \"$http_referer\" '
+        'UA = \"$http_user_agent\"';
+        access_log  {{ .Values.nginx.persistence.mountPath }}/logs/access.log  timing;
+        sendfile        on;
+        #tcp_nopush     on;
+        keepalive_timeout  65;
+        #gzip  on;
+        include {{ .Values.nginx.persistence.mountPath }}/conf.d/*.conf;
+      }

Openshift4/operator/xray-operator/CHANGELOG.md

@@ -1,15 +1,18 @@
 # JFrog  Openshift Xray Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [3.8.0] Aug 17, 2020
+## [1.1.0] Oct 1, 2020
+* Deploying JFrog Xray 3.8.8 as an Operator into Openshift
+
+## [1.0.3] Aug 17, 2020
 * Deploying JFrog Xray 3.8.0 as an Operator into Openshift
 
-## [3.6.2] - July 28, 2020
+## [1.0.2] - July 28, 2020
 * Deploying JFrog Xray 3.6.2 as an Operator into Openshift
 
-## [3.5.2] - June 29, 2020
+## [1.0.1] - June 29, 2020
 * Deploying JFrog Xray 3.5.2 as an Operator into Openshift
 
-## [3.3.0] - May 22, 2020
+## [1.0.0] - May 22, 2020
 * Deploying JFrog Xray 3.3.0 as an Operator initial version of Jfrog Xray supported
 

Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md

@@ -1,6 +1,9 @@
 # JFrog  Openshift Artifactory-Xray Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [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
 

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

@@ -1,7 +1,9 @@
 apiVersion: v1
-appVersion: 3.8.0
+appVersion: 3.8.8
-description: Universal component scan for security and license inventory and impact
+description: Universal component scan for security and license inventory and impact analysis
-  analysis
+sources:
+- https://bintray.com/jfrog/product/xray/view
+- https://github.com/jfrog/charts
 keywords:
 - xray
 - jfrog
@@ -11,7 +13,4 @@ maintainers:
 - email: johnp@jfrog.com
   name: John Peterson
 name: openshift-xray
-sources:
+version: 6.0.6
-- https://bintray.com/jfrog/product/xray/view
-- https://github.com/jfrog/charts
-version: 4.2.0

Openshift4/operator/xray-operator/helm-charts/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

Openshift4/operator/xray-operator/helm-charts/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

Openshift4/operator/xray-operator/helm-charts/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
 

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

@@ -1,6 +1,6 @@
 dependencies:
 - name: xray
   repository: https://charts.jfrog.io/
-  version: 4.2.0
+  version: 6.0.6
-digest: sha256:5e016b3e02e80668003980f2e0399f152f7d83e39957813db3aa3efa9651474f
+digest: sha256:339b5ec4e309ce2970ed34ebc700d6fe8f436d6cbe8dd5d352f0b080401752af
-generated: "2020-08-17T14:49:47.771127-07:00"
+generated: "2020-10-01T15:04:29.008985-07:00"

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

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

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

@@ -1,64 +1,101 @@
+# Openshift Jfrog Xray
 xray:
-  analysis:
+  unifiedUpgradeAllowed: true
-    image:
+  replicaCount: 1
-      repository: registry.connect.redhat.com/jfrog/xray-analysis
+  xray:
-      version: 3.6.2
+    masterKey: "OVERRIDE"
-    name: xray-analysis
+    joinKey: "OVERRIDE"
-    podManagementPolicy: Parallel
+    consoleLog: false
-    preStartCommand: null
+    jfrogUrl: "OVERRIDE"
-    updateStrategy: RollingUpdate
-  database:
-    password: OVERRIDE
-    url: OVERRIDE
-    user: OVERRIDE
-  global:
-    postgresqlTlsSecret: null
-  indexer:
-    image:
-      repository: registry.connect.redhat.com/jfrog/xray-indexer
-      version: 3.6.2
-    name: xray-indexer
-    podManagementPolicy: Parallel
-    updateStrategy: RollingUpdate
-  persist:
-    image:
-      repository: registry.connect.redhat.com/jfrog/xray-persist
-      version: 3.6.2
-    name: xray-persist
-    persistence:
-      size: 10Gi
-    podManagementPolicy: Parallel
-    preStartCommand: null
-    updateStrategy: RollingUpdate
   postgresql:
     enabled: false
-  rabbitmq-ha:
+  database:
-    enabled: true
+    url: "OVERRIDE"
+    user: "OVERRIDE"
+    password: "OVERRIDE"
+  common:
+    xrayUserId: "1000721035"
+    xrayGroupId: "1000721035"
+  analysis:
+    name: xray-analysis
     image:
-      repository: registry.connect.redhat.com/jfrog/xray-rabbitmq
+      registry: registry.connect.redhat.com
-      tag: 3.8.0
+      repository: jfrog/xray-analysis
-    rabbitmqEpmdPort: 4369
+      tag: 3.8.8
-    rabbitmqManagerPort: 15672
+    updateStrategy: RollingUpdate
-    rabbitmqNodePort: 5672
+    podManagementPolicy: Parallel
-    replicaCount: 1
+    preStartCommand:
-  replicaCount: 1
+  indexer:
-  router:
+    name: xray-indexer
     image:
-      imagePullPolicy: IfNotPresent
+      registry: registry.connect.redhat.com
-      repository: registry.connect.redhat.com/jfrog/xray-router
+      repository: jfrog/xray-indexer
-      version: 1.4.2
+      tag: 3.8.8
-    name: router
+    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:
-    image:
-      repository: registry.connect.redhat.com/jfrog/xray-server
-      version: 3.6.2
     name: xray-server
+    image:
+      registry: registry.connect.redhat.com
+      repository: jfrog/xray-server
+      tag: 3.8.8
+    updateStrategy: RollingUpdate
     podManagementPolicy: Parallel
     replicaCount: 1
-    updateStrategy: RollingUpdate
+  router:
-  unifiedUpgradeAllowed: true
+    name: router
-  xray:
+    image:
-    consoleLog: false
+      registry: registry.connect.redhat.com
-    jfrogUrl: OVERRIDE
+      repository: jfrog/xray-router
-    joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+      tag: 1.4.3
-    masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      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'