mirror of
https://github.com/helm/charts.git
synced 2026-08-23 22:37:45 +00:00
[stable/artifactory] Fixed permission issue for TLS secret (#4885)
* fixed support for ingress and existingPVC * Bumped version * Fixed typo * Values.nginx.persistence.existingClaim * Fixed support for k8s 1.9.6 * fixed path * Check if TLS cert is provided via secret * bumped version
This commit is contained in:
committed by
k8s-ci-robot
parent
15d70f1164
commit
4d66fe67a6
@@ -1,7 +1,7 @@
|
||||
apiVersion: v1
|
||||
name: artifactory
|
||||
home: https://www.jfrog.com/artifactory/
|
||||
version: 7.1.1
|
||||
version: 7.1.2
|
||||
appVersion: 5.10.1
|
||||
description: Universal Repository Manager supporting all major packaging formats,
|
||||
build tools and CI servers.
|
||||
|
||||
@@ -46,6 +46,10 @@ spec:
|
||||
- '/bin/sh'
|
||||
- '-c'
|
||||
- >
|
||||
if [ -f /tmp/ssl/*.crt ]; then
|
||||
rm -rf /var/opt/jfrog/nginx/ssl/example.*;
|
||||
cp -fv /tmp/ssl/* /var/opt/jfrog/nginx/ssl;
|
||||
fi;
|
||||
until [ -f /etc/nginx/conf.d/artifactory.conf ]; do sleep 1; done;
|
||||
sed -i -e 's,proxy_pass .*,proxy_pass http://{{ template "artifactory.fullname" . }}:{{ .Values.artifactory.externalPort }}/artifactory/;,g' \
|
||||
-e 's,server_name .*,server_name ~(?<repo>.+)\\.{{ template "artifactory.fullname" . }} {{ template "artifactory.fullname" . }};,g' \
|
||||
@@ -68,7 +72,7 @@ spec:
|
||||
mountPath: {{ .Values.nginx.persistence.mountPath | quote }}
|
||||
{{- if .Values.nginx.tlsSecretName }}
|
||||
- name: ssl-secret-volume
|
||||
mountPath: "/var/opt/jfrog/nginx/ssl"
|
||||
mountPath: "/tmp/ssl"
|
||||
{{- end }}
|
||||
resources:
|
||||
{{ toYaml .Values.nginx.resources | indent 10 }}
|
||||
|
||||
Reference in New Issue
Block a user