DevFW-CICD/argocd-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(argo-workflows): Declare SSO configuration explicitly on values.yaml (#2089)

Browse source 
Signed-off-by: yu-croco <yu.croco@gmail.com>
Co-authored-by: Jason Meridth <jmeridth@gmail.com>
This commit is contained in:
Aikawa 2023-06-03 23:40:50 +09:00 • committed by GitHub
parent 17d1d046a8
commit 5fb6688bcb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 82 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

44
charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
View file

@ -126,37 +126,35 @@ data:
{{- if .Values.controller.workflowDefaults }}
workflowDefaults:
{{ toYaml .Values.controller.workflowDefaults | indent 6 }}{{- end }}
{{- with .Values.server.sso }}
{{- if .Values.server.sso.enabled }}
sso:
issuer: {{ .issuer }}
issuer: {{ .Values.server.sso.issuer }}
clientId:
name: {{ .clientId.name }}
key: {{ .clientId.key }}
name: {{ .Values.server.sso.clientId.name }}
key: {{ .Values.server.sso.clientId.key }}
clientSecret:
name: {{ .clientSecret.name }}
key: {{ .clientSecret.key }}
redirectUrl: {{ .redirectUrl }}
{{- with .rbac }}
name: {{ .Values.server.sso.clientSecret.name }}
key: {{ .Values.server.sso.clientSecret.key }}
redirectUrl: {{ .Values.server.sso.redirectUrl }}
rbac:
enabled: {{ .enabled }}
enabled: {{ .Values.server.sso.rbac.enabled }}
{{- with .Values.server.sso.scopes }}
scopes: {{ toYaml . | nindent 8 }}
{{- end }}
{{- if .scopes }}
scopes: {{ toYaml .scopes | nindent 8 }}
{{- with .Values.server.sso.issuerAlias }}
issuerAlias: {{ toYaml . }}
{{- end }}
{{- if .issuerAlias }}
issuerAlias: {{ .issuerAlias }}
{{- with .Values.server.sso.sessionExpiry }}
sessionExpiry: {{ toYaml . }}
{{- end }}
{{- if .sessionExpiry }}
sessionExpiry: {{ .sessionExpiry }}
{{- with .Values.server.sso.customGroupClaimName }}
customGroupClaimName: {{ toYaml . }}
{{- end }}
{{- if .customGroupClaimName }}
customGroupClaimName: {{ .customGroupClaimName }}
{{- with .Values.server.sso.userInfoPath }}
userInfoPath: {{ toYaml . }}
{{- end }}
{{- if .userInfoPath }}
userInfoPath: {{ .userInfoPath }}
{{- end }}
{{- if .insecureSkipVerify }}
insecureSkipVerify: {{ .insecureSkipVerify }}
{{- with .Values.server.sso.insecureSkipVerify }}
insecureSkipVerify: {{ toYaml . }}
{{- end }}
{{- end }}
{{- with .Values.controller.workflowRestrictions }}
@ -184,4 +182,4 @@ data:
{{- end }}
{{- with .Values.controller.podGCDeleteDelayDuration }}
podGCDeleteDelayDuration: {{ . }}
{{- end }}
{{- end }}