Unfortunately, the code-generation scripts and templates in deployment-charts have been changed since we last refreshed our draft charts. Re-run the generation and re-apply our customizations on top of the newer templates.
Status: developing as a separate patch, until this is in a good state to squash with the other open work.