Cherry-pick to stable branch: https://github.com/charmed-kubernetes/charm-kubernetes-control-plane/commit/db817508331455516de1da4d6bbb21618208f64a
Cherry-pick to stable branch: https:/ /github. com/charmed- kubernetes/ charm-kubernete s-control- plane/commit/ db8175083314555 16de1da4d6bbb21 618208f64a