openshift artifactory ha updates to v7.4.1 and openshift xray v3.2.3 helm charts

Openshift4/.gitignore

@@ -1,6 +1,6 @@
 artifactory.cluster.license
-jfrog.team.crt
+tls.crt
-jfrog.team.key
+tls.key
 artifactory-ha-operator/helm-charts/openshift-artifactory-ha
 *.tar.gz
 *.tgz

Openshift4/openshift-artifactory-ha/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 7.3.2
+appVersion: 7.4.1
 description: Openshift JFrog Artifactory HA subcharting Artifactory HA to work in Openshift environment
 home: https://www.jfrog.com/artifactory/
 icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-ha/logo/artifactory-logo.png
@@ -16,4 +16,4 @@ name: openshift-artifactory-ha
 sources:
 - https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
 - https://github.com/jfrog/charts
-version: 2.3.0
+version: 2.4.2

Openshift4/openshift-artifactory-ha/helminstall.sh

@@ -18,22 +18,38 @@ then
   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
+

Openshift4/openshift-artifactory-ha/requirements.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: artifactory-ha
   repository: https://charts.jfrog.io/
-  version: 2.3.0
+  version: 2.4.2
-digest: sha256:1a0b97f17a29da8dfe7f7dfbf5860258f216d1d82b06ffb55733b85f09e7cbaf
+digest: sha256:e9f80a6605bf281075c8b34fc9590728af545ed1f152a72ff985fea3708cd5f3
-generated: "2020-04-13T11:22:22.813393-07:00"
+generated: "2020-04-21T13:04:32.953359-07:00"

Openshift4/openshift-artifactory-ha/requirements.yaml

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

Openshift4/openshift-artifactory-ha/values.yaml

@@ -33,13 +33,16 @@ artifactory-ha:
             name: volume
     ## Change to use RH UBI images
     image:
-      repository: registry.connect.redhat.com/jfrog/artifactory-pro
+      repository: quay.io/jfrog/artifactory-rh-pro
-      version: 7.3.2
+      version: 7.4.1
+      #repository: registry.connect.redhat.com/jfrog/artifactory-pro
+      #version: 7.3.2
     node:
       replicaCount: 2
       waitForPrimaryStartup:
         enabled: false
     masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+    joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
   postgresql:
     enabled: false
   nginx:
@@ -48,6 +51,8 @@ artifactory-ha:
       version: latest
     ## K8S secret name for the TLS secret to be used for SSL
     tlsSecretName: "OVERRIDE"
+    service:
+      ssloffload: false
     http:
       externalPort: 80
       internalPort: 8080

Openshift4/openshift-xray/CHANGELOG.md

@@ -0,0 +1,17 @@
+# JFrog  Openshift Artifactory-Xray Chart Changelog
+All changes to this chart will be documented in this file.
+
+## [2.4.0] - April 14, 2020
+* Updating to latest jfrog/artifactory-ha helm chart version 2.4.0 adding new requirements.yaml entry for xray helm charts to combine together into one umbrella chart
+
+## [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/openshift-xray/Chart.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+appVersion: 3.2.3
+description: Universal component scan for security and license inventory and impact analysis
+sources:
+- https://bintray.com/jfrog/product/xray/view
+- https://github.com/jfrog/charts
+keywords:
+- xray
+- jfrog
+maintainers:
+- email: vinaya@jfrog.com
+  name: Vinay Aggarwal
+- email: johnp@jfrog.com
+  name: John Peterson
+name: openshift-xray
+version: 3.2.4

Openshift4/openshift-xray/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/openshift-xray/helminstall.sh

@@ -0,0 +1,71 @@
+#!/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)
+ARTIFACTORY=$(helm ls | grep artifactory | wc -l)
+if [[ "$POSTGRES" =~ (0) ]]
+then
+  echo "External DB is required to run Jfrog Openshift Xray 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
+elif [[ "$ARTIFACTORY" =~ (0) ]]
+then
+  echo "Artifactory Instance is required to run Jfrog Openshift Xray Helm chart"
+  echo ""
+  echo "Please use helm to first install Artifactory: openshift-artifactory-ha"
+  echo ""
+  echo "Then install Openshift xray helm chart once artifactory is ready."
+  echo ""
+  exit 1
+else
+  echo "Installing Openshift Xray Helm"
+fi
+
+DBURL=""
+if [[ -z "$1" ]]
+then
+  DBURL="postgres://postgres-postgresql:5432/xraydb?sslmode=disable"
+else
+  DBURL=$1
+fi
+
+DBUSER=""
+if [[ -z "$2" ]]
+then
+  DBUSER="artifactory"
+else
+  DBUSER=$2
+fi
+
+DBPASS=""
+if [[ -z "$3" ]]
+then
+  DBPASS="password"
+else
+  DBPASS=$3
+fi
+
+JFROGURL=""
+if [[ -z "$4" ]]
+then
+  JFROGURL="http://artifactory-ha-nginx"
+else
+  JFROGURL=$4
+fi
+
+
+# install via helm with default postgresql configuration
+helm install xray . \
+               --set xray.database.url=$DBURL \
+               --set xray.database.user=$DBUSER \
+               --set xray.database.password=$DBPASS \
+               --set xray.xray.jfrogUrl=$JFROGURL

Openshift4/openshift-xray/rabbitmq.yaml

@@ -0,0 +1,25 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: rabbitmq
+  name: rabbitmq
+  namespace: default
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: rabbitmq
+  template:
+    metadata:
+      labels:
+        app: rabbitmq
+    spec:
+      containers:
+        - image: quay.io/jfrog/xray-rabbitmq-rh:3.8.0
+          imagePullPolicy: "Always"
+          name: xray-rabbitmq
+          ports:
+            -  containerPort: 4369
+            -  containerPort: 5672
+            -  containerPort: 25672

Openshift4/openshift-xray/rabbitmqservice.yaml

@@ -0,0 +1,26 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: rabbitmq-lb
+  labels:
+    app: rabbitmq
+spec:
+  selector:
+    app: rabbitmq
+  ports:
+  - name: port1
+    protocol: TCP
+    port: 4369
+    targetPort: 4369
+  - name: port3
+    protocol: TCP
+    port: 5672
+    targetPort: 5672
+  - name: port4
+    protocol: TCP
+    port: 25672
+    targetPort: 25672
+  type: ClusterIP
+
+
+

Openshift4/openshift-xray/requirements.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: xray
+  repository: https://charts.jfrog.io/
+  version: 3.2.4
+digest: sha256:78c6667a953eef5337a57d67214ac327a0e7779349982325f697e906fdaba1a8
+generated: "2020-04-21T11:17:43.64727-07:00"

Openshift4/openshift-xray/requirements.yaml

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

Openshift4/openshift-xray/values.yaml

@@ -0,0 +1,77 @@
+# Openshift Jfrog Xray
+xray:
+  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: quay.io/jfrog/xray-analysis-rh
+      # version:
+    updateStrategy: RollingUpdate
+    podManagementPolicy: Parallel
+    preStartCommand:
+  indexer:
+    name: xray-indexer
+    image:
+      repository: quay.io/jfrog/xray-indexer-rh
+      # version:
+    updateStrategy: RollingUpdate
+    podManagementPolicy: Parallel
+  persist:
+    name: xray-persist
+    image:
+      repository: quay.io/jfrog/xray-persist-rh
+      # version:
+    updateStrategy: RollingUpdate
+    podManagementPolicy: Parallel
+    persistence:
+      size: 10Gi
+    preStartCommand:
+  server:
+    name: xray-server
+    image:
+      repository: quay.io/jfrog/xray-server-rh
+      # version:
+    updateStrategy: RollingUpdate
+    podManagementPolicy: Parallel
+    replicaCount: 1
+  router:
+    name: router
+    image:
+      repository: quay.io/jfrog/router-rh
+      version: 1.2.1
+      imagePullPolicy: IfNotPresent
+  rabbitmq-ha:
+    enabled: true
+    replicaCount: 1
+    image:
+      repository: quay.io/jfrog/xray-rabbitmq-rh
+      tag: 3.8.0
+    rabbitmqEpmdPort: 4369
+    rabbitmqNodePort: 5672
+    rabbitmqManagerPort: 15672