Merge branch 'main' into fixup-2.5.2

Author: indrora

.github/workflows/test.yml

@@ -71,4 +71,4 @@ jobs:
             (echo; echo "Unexpected difference in directories after code generation. Run 'make generate manifests' and commit."; exit 1)
 
       - name: Lint Helm manifests
-        run: make lint-manifests
+        run: make lint-manifests