feat: Fix/Enhance Routes; Add uid workaround for repo server (#276)
* Fix/Enhance Routes; Add uid workaround for repo server * Fix CI linting * Update default openshift.enabled value; Fix argocd-repo-server env template * Bump chart version to fix linting Co-authored-by: Spencer Gilbert <Spencer.Gilbert@gmail.com>
This commit is contained in:
parent
9f1bb53898
commit
a5070f5f07
4 changed files with 20 additions and 6 deletions
|
|
@ -53,6 +53,9 @@ spec:
|
|||
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }}
|
||||
command:
|
||||
- argocd-repo-server
|
||||
{{- if .Values.openshift.enabled }}
|
||||
- uid_entrypoint.sh
|
||||
{{- end }}
|
||||
{{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}
|
||||
- --redis
|
||||
- {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
|
||||
|
|
@ -65,10 +68,16 @@ spec:
|
|||
{{- if .Values.repoServer.containerSecurityContext }}
|
||||
securityContext: {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }}
|
||||
{{- end }}
|
||||
{{- if .Values.repoServer.env }}
|
||||
{{- if or (.Values.repoServer.env) (.Values.openshift.enabled) }}
|
||||
env:
|
||||
{{- if .Values.repoServer.env }}
|
||||
{{- toYaml .Values.repoServer.env | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if .Values.openshift.enabled }}
|
||||
- name: USER_NAME
|
||||
value: argocd
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
volumeMounts:
|
||||
{{- if .Values.repoServer.volumeMounts }}
|
||||
{{- toYaml .Values.repoServer.volumeMounts | nindent 8}}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,9 @@ spec:
|
|||
port:
|
||||
targetPort: https
|
||||
tls:
|
||||
termination: passthrough
|
||||
insecureEdgeTerminationPolicy: None
|
||||
termination: {{ .Values.server.route.termination_type | default "passthrough" }}
|
||||
insecureEdgeTerminationPolicy: {{ .Values.server.route.termination_policy | default "None" }}
|
||||
wildcardPolicy: None
|
||||
status:
|
||||
ingress: []
|
||||
{{- end }}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue