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

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

View File

@@ -760,7 +760,8 @@ spec:
internalPort: 443
image:
pullPolicy: IfNotPresent
repository: image-registry.openshift-image-registry.svc:5000/jfrog-artifactory/nginx-artifactory-pro
#repository: image-registry.openshift-image-registry.svc:5000/jfrog-artifactory/nginx-artifactory-pro
repository: registry.redhat.io/rhel8/nginx-116
labels: {}
livenessProbe:
enabled: true
@@ -819,7 +820,7 @@ spec:
#tcp_nopush on;
keepalive_timeout 65;
#gzip on;
include /etc/nginx/conf.d/*.conf;
include {{ .Values.nginx.persistence.mountPath }}/conf.d/*.conf;
}
name: nginx
nodeSelector: {}

View File

@@ -583,7 +583,7 @@ metadata:
]
capabilities: Basic Install
name: artifactory-ha-operator.v1.0.0
namespace: placeholder
namespace: jfrog-artifactory
spec:
apiservicedefinitions: {}
customresourcedefinitions: {}
@@ -729,6 +729,17 @@ spec:
- update
- watch
serviceAccountName: artifactory-ha-operator
clusterPermissions:
- rules:
- apiGroups:
- security.openshift.io
resources:
- securitycontextconstraints
resourceNames:
- anyuid
verbs:
- use
serviceAccountName: artifactory-ha-operator
strategy: deployment
installModes:
- supported: true