From 077c60eb5e49ab4e274c2547d0900b2fd2b9c36d Mon Sep 17 00:00:00 2001 From: John Peterson Date: Tue, 12 May 2020 12:33:01 -0700 Subject: [PATCH] Operator RT version 7.4.3 --- Openshift4/artifactory-ha-operator/CHANGELOG.md | 17 +++++++++++++++++ ...a-operator.v1.0.0.clusterserviceversion.yaml | 6 +++++- ...s.io_v1alpha1_openshiftartifactoryha_cr.yaml | 6 +++++- ...a-operator.v1.0.0.clusterserviceversion.yaml | 6 +++++- 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100755 Openshift4/artifactory-ha-operator/CHANGELOG.md diff --git a/Openshift4/artifactory-ha-operator/CHANGELOG.md b/Openshift4/artifactory-ha-operator/CHANGELOG.md new file mode 100755 index 0000000..02341d1 --- /dev/null +++ b/Openshift4/artifactory-ha-operator/CHANGELOG.md @@ -0,0 +1,17 @@ +# JFrog Openshift Artifactory-ha Chart Changelog +All changes to this chart will be documented in this file. + +## [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 diff --git a/Openshift4/artifactory-ha-operator/bundle/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml b/Openshift4/artifactory-ha-operator/bundle/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml index 26a23ce..2602018 100644 --- a/Openshift4/artifactory-ha-operator/bundle/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml +++ b/Openshift4/artifactory-ha-operator/bundle/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml @@ -16,8 +16,9 @@ metadata: "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.3" + "version": "7.4.3" }, + "joinKey": "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE", "masterKey": "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", "node": { "replicaCount": 2, @@ -49,6 +50,9 @@ metadata: "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 + }, "tlsSecretName": "OVERRIDE" }, "postgresql": { diff --git a/Openshift4/artifactory-ha-operator/deploy/crds/charts.helm.k8s.io_v1alpha1_openshiftartifactoryha_cr.yaml b/Openshift4/artifactory-ha-operator/deploy/crds/charts.helm.k8s.io_v1alpha1_openshiftartifactoryha_cr.yaml index fbc6476..d149a42 100644 --- a/Openshift4/artifactory-ha-operator/deploy/crds/charts.helm.k8s.io_v1alpha1_openshiftartifactoryha_cr.yaml +++ b/Openshift4/artifactory-ha-operator/deploy/crds/charts.helm.k8s.io_v1alpha1_openshiftartifactoryha_cr.yaml @@ -20,9 +20,11 @@ spec: name: volume image: repository: registry.connect.redhat.com/jfrog/artifactory-pro - version: 7.3.2 + version: 7.4.3 + joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF node: + replicaCount: 2 waitForPrimaryStartup: enabled: false database: @@ -94,6 +96,8 @@ spec: include {{ .Values.nginx.persistence.mountPath }}/conf.d/*.conf; } tlsSecretName: OVERRIDE + service: + ssloffload: false postgresql: enabled: false waitForDatabase: false 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/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.0/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml index 26a23ce..2602018 100644 --- a/Openshift4/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.0/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml +++ b/Openshift4/artifactory-ha-operator/deploy/olm-catalog/artifactory-ha-operator/1.0.0/artifactory-ha-operator.v1.0.0.clusterserviceversion.yaml @@ -16,8 +16,9 @@ metadata: "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.3" + "version": "7.4.3" }, + "joinKey": "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE", "masterKey": "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", "node": { "replicaCount": 2, @@ -49,6 +50,9 @@ metadata: "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 + }, "tlsSecretName": "OVERRIDE" }, "postgresql": {