OSSM-2419 Prevent deadlock

[luksa]

No description provided.

[luksa]

@jwendell what's wrong here.. looks like the builder image is missing something?

[jwendell]

I think we need b697cfb in 2.3

[jwendell]

@luksa can you cherry-pick it as part of this PR as a separate commit? You can try it locally using the 2.3 builder image too.

[luksa]

@jwendell we need to keep go mod vendor, right (b697cfb removes it)?

[jwendell]

@jwendell we need to keep go mod vendor, right (b697cfb removes it)?

That commit itself doesn't remove it I think. I tried to keep commits separated in 2.4 PR (#40). That said, yeah, maybe you need to do some adjustments for 2.3.

[luksa]

make gen previously did a go mod vendor, but the commit removes this... I've now modified the cherry-picked commit so it still runs go mod vendor.

[jwendell]

make gen previously did a go mod vendor, but the commit removes this... I've now modified the cherry-picked commit so it still runs go mod vendor.

Thanks, that was my mistake. That removal should be part of the other commit that removes vendor dir.

[luksa]

@jwendell I think that change now makes everything worse :)

[jwendell]

ok, let me try it locally

[luksa]

Oops, forgot the don't squash label... but too late now.