upgrade-k8s.py: Merge production upgrades into main
For --env production, the script merged the tfvars change into the
production branch only. The push-to-production CI job force-pushes main
to the production branch. The next deploy from main then removes the
tfvars change from the production branch.
Target main for both environments. The merge to main deploys to
production through push-to-production.
Bug: T439035
Related MRs:
- !643 (merged) (This MR)
- !642 (merged)
- !641 (merged)
- main