Revert "Cleanly separate v1 worker and v2 sdk harness container image handling in DataflowRunner

[kennknowles]

This reverts commit 5e25608 from #36138

There appears to be a service-side bug which does not use the flag. (it makes sense, and this bug is why we had the logic to make sure the two containers were exactly the same even when that didn't make sense)

---

Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

• Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
• Update CHANGES.md with noteworthy changes.
• If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

[kennknowles]

R: @Abacn

[gemini-code-assist]

Summary of Changes

Hello @kennknowles, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request reverts a previous change that aimed to differentiate between container images for Dataflow V1 workers and V2 SDK harnesses. The reversion is necessary due to an identified service-side bug that prevents the proper utilization of this separation. Consequently, the system now treats both container image configuration options as referring to the same image, ensuring operational consistency and stability for Dataflow jobs. The workerHarnessContainerImage option is now deprecated in favor of sdkContainerImage.

Highlights

• Reverted Container Image Separation: The previous attempt to cleanly separate V1 worker and V2 SDK harness container image handling has been reverted due to an identified service-side bug that prevented its proper utilization.
• Unified Container Image Handling: The workerHarnessContainerImage and sdkContainerImage options are now treated as aliases, with sdkContainerImage being the preferred option, and both are enforced to have the same value to ensure operational consistency.
• Deprecation of workerHarnessContainerImage: The workerHarnessContainerImage option has been deprecated, and its Javadoc updated to encourage users to transition to sdkContainerImage.
• Consolidated Image Getter Logic: Internal methods for determining the container image URL, name, and version have been consolidated into a single set of functions (e.g., getContainerImageForJob), removing explicit V1/V2 distinctions.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

[github-actions]

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control. If you'd like to restart, comment assign set of reviewers