Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
4af548bb
Commit
4af548bb
authored
Feb 06, 2018
by
Kevin W Monroe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure daemon opts are in effect before docker login
parent
d3b783d5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
0 deletions
+9
-0
kubernetes_worker.py
...ju/layers/kubernetes-worker/reactive/kubernetes_worker.py
+9
-0
No files found.
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View file @
4af548bb
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
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