Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
eos
eos-charts
Commits
d8c1b9e9
Commit
d8c1b9e9
authored
Jun 14, 2021
by
Enrico Bocchi
Browse files
fusex: Fix overriding defaults set to 1s with 0s
parent
79aeb966
Pipeline
#2728195
passed with stage
in 1 minute and 7 seconds
Changes
1
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
fusex/templates/configmap.yaml
View file @
d8c1b9e9
...
@@ -5,6 +5,13 @@ metadata:
...
@@ -5,6 +5,13 @@ metadata:
labels
:
labels
:
{{
- include "fusex.labels" . | nindent 4
}}
{{
- include "fusex.labels" . | nindent 4
}}
data
:
data
:
#
# Helm interprets a value set to 0 as null and hence uses the default
# This is buggy for us as it does not allow to override a 1 default with a 0.
#
# Here we check if the type of the values is float64 and, if so, we use it instead of the default.
# Upstream tracker: https://github.com/helm/helm/issues/3164
#
fuse.eos.conf
:
|
fuse.eos.conf
:
|
{{- with .Values.fusex.config }}
{{- with .Values.fusex.config }}
{
{
...
@@ -13,15 +20,15 @@ data:
...
@@ -13,15 +20,15 @@ data:
"remotemountdir": "{{ .remotemountdir }}",
"remotemountdir": "{{ .remotemountdir }}",
"localmountdir": "/eos",
"localmountdir": "/eos",
"auth": {
"auth": {
"shared-mount": {{
.auth.shared_mount | default 1
}},
"shared-mount": {{
if kindIs "float64" .auth.shared_mount }}{{ .auth.shared_mount }}{{ else }}1{{ end
}},
"sss": {{
.auth.sss | default 1
}},
"sss": {{
if kindIs "float64" .auth.sss }}{{ .auth.sss }}{{ else }}1{{ end
}},
"ssskeytab": "/etc/eos/fuse.sss.keytab",
"ssskeytab": "/etc/eos/fuse.sss.keytab",
"gsi-first": {{
.auth.gsi_first | default 0
}},
"gsi-first": {{
if kindIs "float64" .auth.gsi_first }}{{ .auth.gsi_first }}{{ else }}0{{ end
}},
"krb5": {{
.auth.krb5 | default 0
}},
"krb5": {{
if kindIs "float64" .auth.krb5 }}{{ .auth.krb5 }}{{ else }}0{{ end
}},
"oauth2": {{
.auth.oauth2 | default 1
}}
"oauth2": {{
if kindIs "float64" .auth.oauth2 }}{{ .auth.oauth2 }}{{ else }}1{{ end
}}
},
},
"options": {
"options": {
"hide-versions": {{ .options.hide_versions
| default 0
}}
"hide-versions": {{
if kindIs "float64"
.options.hide_versions
}}{{ .options.hide_versions }}{{ else }}0{{ end
}}
}
}
}
}
{{- end }}
{{- end }}
...
...
Enrico Bocchi
@ebocchi
mentioned in issue
#37 (closed)
·
Jun 14, 2021
mentioned in issue
#37 (closed)
mentioned in issue #37
Toggle commit list
Fabio Luchetti
@faluchet
mentioned in commit
45067296
·
Jul 08, 2021
mentioned in commit
45067296
mentioned in commit 4506729600605527ef9bbe23d4c9dc3e21ac4021
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment