mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Ensure daemon opts are in effect before docker login
This commit is contained in:
parent
d3b783d5ec
commit
4af548bb5a
@ -451,8 +451,17 @@ def extra_args_changed():
|
||||
|
||||
|
||||
@when('config.changed.docker-logins')
|
||||
@when_not('docker.restart')
|
||||
def docker_logins_changed():
|
||||
"""Login to a docker registry with configured credentials."""
|
||||
config = hookenv.config()
|
||||
|
||||
if data_changed('docker-opts', config['docker-opts']):
|
||||
hookenv.log('Skipping docker login until daemon is restarted.')
|
||||
# State will be removed by layer-docker after restart
|
||||
set_state('docker.restart')
|
||||
return
|
||||
|
||||
previous_logins = config.previous('docker-logins')
|
||||
logins = config['docker-logins']
|
||||
logins = json.loads(logins)
|
||||
|
Loading…
Reference in New Issue
Block a user