Cherry-pick to release-1.21 branch: https://github.com/charmed-kubernetes/cdk-addons/commit/8c7b3a009c79f91c5e0c6c4ba0490c1e1a9b7214
Cherry-pick to release-1.21 branch: https:/ /github. com/charmed- kubernetes/ cdk-addons/ commit/ 8c7b3a009c79f91 c5e0c6c4ba0490c 1e1a9b7214