Cherry-picked to release-1.20: https://github.com/charmed-kubernetes/cdk-addons/commit/504d91c300d88e38e7c84e3f23f97cd30d14df81
Cherry-picked to release-1.20: https:/ /github. com/charmed- kubernetes/ cdk-addons/ commit/ 504d91c300d88e3 8e7c84e3f23f97c d30d14df81