diff --git a/charts/osg-hosted-ce/Chart.yaml b/charts/osg-hosted-ce/Chart.yaml index 9c6a97d..0e28a4d 100644 --- a/charts/osg-hosted-ce/Chart.yaml +++ b/charts/osg-hosted-ce/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v1 appVersion: "5.1.5" description: OSG Hosted Compute Element name: osg-hosted-ce -version: 4.5.2 +version: 4.5.3 diff --git a/charts/osg-hosted-ce/templates/configmap.yaml b/charts/osg-hosted-ce/templates/configmap.yaml index 873b306..d09b061 100644 --- a/charts/osg-hosted-ce/templates/configmap.yaml +++ b/charts/osg-hosted-ce/templates/configmap.yaml @@ -77,7 +77,8 @@ data: # Templatize IDTOKEN generation for glidein -> CE collector advertising (SOFTWARE-5556) {{- range $index, $map := .Values.SciTokenRemoteUserMapping }} {{- range $url, $user := $map }} - JOB_ROUTER_CREATE_IDTOKEN_{{ $user }} @=end + # N.B. Special chars in a helm template regex need to be escaped with '\\' + JOB_ROUTER_CREATE_IDTOKEN_{{ mustRegexReplaceAll "[^A-Za-z0-9_]" $user "_" }} @=end sub = "{{ $user }}@users.htcondor.org" kid = "POOL" lifetime = 604800 @@ -86,7 +87,7 @@ data: filename = "ce_{{ $user }}.idtoken" owner = "{{ $user }}" @end - JOB_ROUTER_CREATE_IDTOKEN_NAMES = $(JOB_ROUTER_CREATE_IDTOKEN_NAMES) {{ $user }} + JOB_ROUTER_CREATE_IDTOKEN_NAMES = $(JOB_ROUTER_CREATE_IDTOKEN_NAMES) {{ mustRegexReplaceAll "[^A-Za-z0-9_]" $user "_" }} {{- end }} {{- end }}