mirror of https://github.com/k3s-io/k3s
f2362ed6e5
Automatic merge from submit-queue (batch tested with PRs 59441, 58264, 59287, 59396, 59439). 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>. Ensure docker daemon opts are in effect before docker login **What this PR does / why we need it**: Make sure the kubernetes-worker charm is using the configured `docker-opts` daemon options prior to running the `docker-logins` handler. **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/layer-docker/issues/112 **Special notes for your reviewer**: **Release note**: ```release-note Fixed charm issue where docker login would run prior to daemon options being set. ``` |
||
|---|---|---|
| .. | ||
| bundles | ||
| layers | ||
| prereqs | ||
| .gitignore | ||
| OWNERS | ||
| config-default.sh | ||
| config-test.sh | ||
| identify-leaders.py | ||
| kube-system-ns.yaml | ||
| return-node-ips.py | ||
| util.sh | ||