Cherry-pick to stable: https://github.com/charmed-kubernetes/charm-kubernetes-master/commit/df7ea70859a31c3346a06a201847ed725e8a5589
Cherry-pick to stable: https:/ /github. com/charmed- kubernetes/ charm-kubernete s-master/ commit/ df7ea70859a31c3 346a06a201847ed 725e8a5589