zware/JFrog-Cloud-Installers
1
0
Fork 0
mirror of https://github.com/ZwareBear/JFrog-Cloud-Installers.git synced 2026-01-21 11:06:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

updates to ha chart v2.0.31, using redhat nginx and redhat ubi artifactory. plan to disable embedded postgresql for certification

Browse Source
This commit is contained in:
John Peterson
2020-03-19 20:03:51 -07:00
parent e1d129d1a5
commit daf344e55e
15 changed files with 97 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,11 +2,14 @@
# Requires one custom init container
# to resolve the user id perm issue with redhat
artifactory-ha:
initContainerImage: registry.redhat.io/ubi8-minimal
waitForDatabase: false
artifactory:
## Add custom init containers execution before predefined init containers
customInitContainersBegin: |
- name: "redhat-custom-setup"
image: "{{ .Values.initContainerImage }}"
#image: "{{ .Values.initContainerImage }}"
image: {{ index .Values "initContainerImage" }}
imagePullPolicy: "{{ .Values.artifactory.image.pullPolicy }}"
command:
- 'sh'
@@ -17,4 +20,68 @@ artifactory-ha:
volumeMounts:
- mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
name: volume
## Add custom init containers
## Change to use RH UBI images
image:
repository: "image-registry.openshift-image-registry.svc:5000/jfrog-artifactory/artifactory-pro"
node:
waitForPrimaryStartup:
enabled: false
nginx:
image:
repository: "image-registry.openshift-image-registry.svc:5000/jfrog-artifactory/nginx-artifactory-pro"
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;
}