Add changes for cherry-picked commits to update the remaining k8s versions
Testing done:
N / A
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.
Issue number: N / A
Description of changes:
Add changes for cherry-picked commits to update the remaining k8s versions
Testing done:
N / A
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.