Cherry-picked to stable:
https://github.com/charmed-kubernetes/charm-kubernetes-master/commit/d3e8d8c5e9ca1685c2f9590d2deaeb82af7f84cc https://github.com/charmed-kubernetes/charm-kubernetes-master/commit/a565726b64858721f8cf66df766bebacff084439
Cherry-picked to stable:
https:/ /github. com/charmed- kubernetes/ charm-kubernete s-master/ commit/ d3e8d8c5e9ca168 5c2f9590d2deaeb 82af7f84cc /github. com/charmed- kubernetes/ charm-kubernete s-master/ commit/ a565726b6485872 1f8cf66df766beb acff084439
https:/