Cherry-pick to stable branch: https://github.com/charmed-kubernetes/charm-kubernetes-master/commit/bfc2ffb5b156f20933b77bcf37d2f80d56b012c1
Cherry-pick to stable branch: https:/ /github. com/charmed- kubernetes/ charm-kubernete s-master/ commit/ bfc2ffb5b156f20 933b77bcf37d2f8 0d56b012c1