Fix/Enhance Routes; Add uid workaround for repo server
This commit is contained in:
parent
805371544d
commit
290c5fed1e
3 changed files with 19 additions and 4 deletions
|
@ -52,6 +52,9 @@ spec:
|
||||||
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }}
|
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }}
|
||||||
command:
|
command:
|
||||||
- argocd-repo-server
|
- argocd-repo-server
|
||||||
|
{{- if .Values.openshift.enabled }}
|
||||||
|
- uid_entrypoint.sh
|
||||||
|
{{- end }}
|
||||||
{{- if .Values.redis.enabled }}
|
{{- if .Values.redis.enabled }}
|
||||||
- --redis
|
- --redis
|
||||||
- {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
|
- {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
|
||||||
|
@ -64,7 +67,14 @@ spec:
|
||||||
{{- if .Values.repoServer.containerSecurityContext }}
|
{{- if .Values.repoServer.containerSecurityContext }}
|
||||||
securityContext: {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }}
|
securityContext: {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.repoServer.env }}
|
{{- if .Values.openshift.enabled }}
|
||||||
|
env:
|
||||||
|
- name: USER_NAME
|
||||||
|
value: argocd
|
||||||
|
{{- if .Values.repoServer.env }}
|
||||||
|
{{- toYaml .Values.repoServer.env | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
|
{{- else if .Values.repoServer.env }}
|
||||||
env:
|
env:
|
||||||
{{- toYaml .Values.repoServer.env | nindent 8 }}
|
{{- toYaml .Values.repoServer.env | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
@ -23,7 +23,9 @@ spec:
|
||||||
port:
|
port:
|
||||||
targetPort: https
|
targetPort: https
|
||||||
tls:
|
tls:
|
||||||
termination: passthrough
|
termination: {{ .Values.server.route.termination_type | default "passthrough" }}
|
||||||
insecureEdgeTerminationPolicy: None
|
insecureEdgeTerminationPolicy: {{ .Values.server.route.termination_policy | default "None" }}
|
||||||
wildcardPolicy: None
|
wildcardPolicy: None
|
||||||
|
status:
|
||||||
|
ingress: []
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
@ -167,7 +167,7 @@ dex:
|
||||||
|
|
||||||
image:
|
image:
|
||||||
repository: quay.io/dexidp/dex
|
repository: quay.io/dexidp/dex
|
||||||
tag: v2.14.0
|
tag: v2.22.0
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
initImage:
|
initImage:
|
||||||
repository:
|
repository:
|
||||||
|
@ -786,3 +786,6 @@ configs:
|
||||||
# argocdServerAdminPassword:
|
# argocdServerAdminPassword:
|
||||||
# Password modification time defaults to current time if not set
|
# Password modification time defaults to current time if not set
|
||||||
# argocdServerAdminPasswordMtime: "2006-01-02T15:04:05Z"
|
# argocdServerAdminPasswordMtime: "2006-01-02T15:04:05Z"
|
||||||
|
|
||||||
|
openshift:
|
||||||
|
enabled: true
|
||||||
|
|
Loading…
Reference in a new issue