mirror of https://github.com/k3s-io/k3s
Merge pull request #59116 from hyperbolic2346/mwilson/priv-typo-fix
Automatic merge from submit-queue (batch tested with PRs 57683, 59116, 58728, 59140, 58976). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fixing issue with capitalization in allow-privileged **What this PR does / why we need it**: Config option in kubernetes-master allow-privileged would do odd things if you used True instead of true. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/374 **Special notes for your reviewer**: **Release note**: ```release-note Fixed issue with kubernetes-worker option allow-privileged not properly handling the value True with a capital T. ```pull/6/head
commit
57bd4f8344
|
@ -838,7 +838,7 @@ def is_privileged():
|
|||
"""Return boolean indicating whether or not to set allow-privileged=true.
|
||||
|
||||
"""
|
||||
privileged = hookenv.config('allow-privileged')
|
||||
privileged = hookenv.config('allow-privileged').lower()
|
||||
if privileged == 'auto':
|
||||
return is_state('kubernetes-master.gpu.enabled')
|
||||
else:
|
||||
|
@ -886,7 +886,7 @@ def on_gpu_available(kube_control):
|
|||
|
||||
"""
|
||||
config = hookenv.config()
|
||||
if config['allow-privileged'] == "false":
|
||||
if config['allow-privileged'].lower() == "false":
|
||||
hookenv.status_set(
|
||||
'active',
|
||||
'GPUs available. Set allow-privileged="auto" to enable.'
|
||||
|
|
|
@ -810,7 +810,7 @@ def set_privileged():
|
|||
"""Update the allow-privileged flag for kubelet.
|
||||
|
||||
"""
|
||||
privileged = hookenv.config('allow-privileged')
|
||||
privileged = hookenv.config('allow-privileged').lower()
|
||||
if privileged == 'auto':
|
||||
gpu_enabled = is_state('kubernetes-worker.gpu.enabled')
|
||||
privileged = 'true' if gpu_enabled else 'false'
|
||||
|
|
Loading…
Reference in New Issue