updates to artifactory 7.6.1 and xray 3.5.2

Openshift4/artifactory-ha-operator/.osdk-scorecard.yaml

@@ -7,4 +7,4 @@ scorecard:
     - olm:
         cr-manifest:
           - "deploy/crds/charts.helm.k8s.io_v1alpha1_openshiftartifactoryha_cr.yaml"
-        csv-path: "deploy/olm-catalog/artifactory-ha-operator/1.0.0/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml"
+        csv-path: "deploy/olm-catalog/artifactory-ha-operator/1.0.1/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml"

Openshift4/artifactory-ha-operator/CHANGELOG.md

@@ -1,6 +1,9 @@
 # JFrog  Openshift Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [2.6.0] - 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
 * Updating to latest jfrog/artifactory-ha helm chart version 2.4.6 artifactory version 7.4.3
 

Openshift4/artifactory-ha-operator/bundle/openshiftartifactoryha-operator.package.yaml

@@ -1,4 +1,4 @@
 packageName: openshiftartifactoryha-operator
 channels:
   - name: alpha
-    currentCSV: artifactory-ha-operator.v1.0.0
+    currentCSV: artifactory-ha-operator.v1.0.1

Openshift4/artifactory-ha-operator/deploy/crds/charts.helm.k8s.io_v1alpha1_openshiftartifactoryha_cr.yaml

@@ -20,7 +20,7 @@ spec:
               name: volume
       image:
         repository: registry.connect.redhat.com/jfrog/artifactory-pro
-        version: 7.4.3
+        version: 7.6.1
       joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
       masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
       node:

Openshift4/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.0/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml

@@ -13,7 +13,6 @@ metadata:
           "spec": {
             "artifactory-ha": {
               "artifactory": {
-                "customInitContainersBegin": "- name: \"redhat-custom-setup\"\n  image: {{ index .Values \"initContainerImage\" }}\n  imagePullPolicy: \"{{ .Values.artifactory.image.pullPolicy }}\"\n  command:\n    - 'sh'\n    - '-c'\n    - 'chown -R 1030:1030 {{ .Values.artifactory.persistence.mountPath }}'\n  securityContext:\n      runAsUser: 0\n  volumeMounts:\n    - mountPath: \"{{ .Values.artifactory.persistence.mountPath }}\"\n      name: volume\n",
                 "image": {
                   "repository": "registry.connect.redhat.com/jfrog/artifactory-pro",
                   "version": "7.4.3"
@@ -35,7 +34,6 @@ metadata:
                 "user": "OVERRIDE"
               },
               "initContainerImage": "registry.redhat.io/ubi8-minimal",
-              "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\" } ] }",
               "nginx": {
                 "http": {
                   "externalPort": 80,
@@ -49,7 +47,6 @@ metadata:
                   "repository": "registry.redhat.io/rhel8/nginx-116",
                   "version": "latest"
                 },
-                "mainConf": "# Main Nginx configuration file\nworker_processes  4;\nerror_log  {{ .Values.nginx.persistence.mountPath }}/logs//error.log warn;\npid        /tmp/nginx.pid;\nevents {\n  worker_connections  1024;\n}\nhttp {\n  include       /etc/nginx/mime.types;\n  default_type  application/octet-stream;\n  variables_hash_max_size 1024;\n  variables_hash_bucket_size 64;\n  server_names_hash_max_size 4096;\n  server_names_hash_bucket_size 128;\n  types_hash_max_size 2048;\n  types_hash_bucket_size 64;\n  proxy_read_timeout 2400s;\n  client_header_timeout 2400s;\n  client_body_timeout 2400s;\n  proxy_connect_timeout 75s;\n  proxy_send_timeout 2400s;\n  proxy_buffer_size 32k;\n  proxy_buffers 40 32k;\n  proxy_busy_buffers_size 64k;\n  proxy_temp_file_write_size 250m;\n  proxy_http_version 1.1;\n  client_body_buffer_size 128k;\n  log_format  main  '$remote_addr - $remote_user [$time_local] \"$request\" '\n  '$status $body_bytes_sent \"$http_referer\" '\n  '\"$http_user_agent\" \"$http_x_forwarded_for\"';\n  log_format timing 'ip = $remote_addr '\n  'user = \\\"$remote_user\\\" '\n  'local_time = \\\"$time_local\\\" '\n  'host = $host '\n  'request = \\\"$request\\\" '\n  'status = $status '\n  'bytes = $body_bytes_sent '\n  'upstream = \\\"$upstream_addr\\\" '\n  'upstream_time = $upstream_response_time '\n  'request_time = $request_time '\n  'referer = \\\"$http_referer\\\" '\n  'UA = \\\"$http_user_agent\\\"';\n  access_log  {{ .Values.nginx.persistence.mountPath }}/logs/access.log  timing;\n  sendfile        on;\n  #tcp_nopush     on;\n  keepalive_timeout  65;\n  #gzip  on;\n  include {{ .Values.nginx.persistence.mountPath }}/conf.d/*.conf;\n}\n",
                 "service": {
                   "ssloffload": false
                 },