Skip to content

Correctly override apache/beam containers for RC on Dataflow runner job submission - #36199

Merged
Abacn merged 1 commit into
apache:masterfrom
Abacn:rc-submission
Sep 24, 2025
Merged

Correctly override apache/beam containers for RC on Dataflow runner job submission#36199
Abacn merged 1 commit into
apache:masterfrom
Abacn:rc-submission

Conversation

@Abacn

@Abacn Abacn commented Sep 18, 2025

Copy link
Copy Markdown
Contributor

Java counterpart for #32049

Tested with a java using python rc pipeline

This has been affecting DataflowTemplates RC validation.

Please add a meaningful description for your change here


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)

Build python source distribution and wheels
Python tests
Java tests
Go tests

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

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Summary of Changes

Hello @Abacn, I'm Gemini Code Assist1! 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 addresses an issue where Dataflow job submissions using Apache Beam release candidate (RC) container images were encountering validation failures. The core change introduces a mechanism to normalize these RC image tags by stripping the 'rc' suffix, making them compatible with Dataflow's expected image naming conventions. This enhancement ensures the successful execution of pipelines utilizing RC SDKs and improves the reliability of DataflowTemplates RC validation.

Highlights

  • Container Image Normalization: Implemented a new static method, normalizeDataflowImageAndTag, to correctly process and normalize container image tags, specifically removing the 'rc' suffix from Apache Beam Python and Go SDK release candidate images.
  • Dataflow Runner Integration: Modified the applySdkEnvironmentOverrides method in DataflowRunner to utilize the new normalization logic, ensuring that apache/beam container images with 'rc' tags are properly mapped to their corresponding Dataflow-compatible images during job submission.
  • Improved Test Coverage: Added a new test case, testApplySdkEnvironmentOverridesRcByDefault, to specifically validate the correct handling and normalization of release candidate container image tags, ensuring the fix works as intended.
  • Test Code Refactoring: Introduced a helper method containerUrlToPipeline in the test suite to reduce boilerplate and improve readability for tests involving RunnerApi.Pipeline creation.
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
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

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

Copy link
Copy Markdown
Contributor

Assigning reviewers:

R: @robertwb added as fallback since no labels match configuration

Note: If you would like to opt out of this review, comment assign to next reviewer.

Available commands:

  • stop reviewer notifications - opt out of the automated review tooling
  • remind me after tests pass - tag the comment author after tests pass
  • waiting on author - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)

The PR bot will only process comments in the main thread (not review comments).

@Abacn

Abacn commented Sep 19, 2025

Copy link
Copy Markdown
Contributor Author

R: @Amar3tto (for future rc validation - 2.69.0+)

@github-actions

Copy link
Copy Markdown
Contributor

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

@Abacn

Abacn commented Sep 23, 2025

Copy link
Copy Markdown
Contributor Author

R: @damccorm

@damccorm damccorm left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@Abacn
Abacn merged commit 6c7bbde into apache:master Sep 24, 2025
15 checks passed
@Abacn
Abacn deleted the rc-submission branch September 24, 2025 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants