Skip to content

Handle Flink 2 job server tag in releases and SDK snapshot #37939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Abacn merged 1 commit into from
Mar 24, 2026
+15 −1
Merged

Handle Flink 2 job server tag in releases and SDK snapshot #37939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/finalize_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ jobs:
docker buildx imagetools create --tag "${IMAGE}:latest" "${IMAGE}:${RELEASE}"
done

# Flink 2 images have different tagging, add latest tag to latest supported Flink version
echo "================Confirming Runner container Release and RC version==========="
BEAM_FLINK_REPO=apache/beam_flink_job_server
LATEST_FLINK_VERSION=$(wget -qO- https://raw.githubusercontent.com/apache/beam/refs/tags/v${RELEASE}-RC${RC_NUM}/gradle.properties | grep -E flink_versions | tr ',' '\n' | tail -1)
docker buildx imagetools create --tag "${BEAM_FLINK_REPO}:latest" "${BEAM_FLINK_REPO}:${RELEASE}${RC_VERSION}-flink${LATEST_FLINK_VERSION}"

publish_python_artifacts:
if: ${{github.event.inputs.PUBLISH_PYTHON_ARTIFACTS == 'yes'}}
runs-on: [self-hosted, ubuntu-20.04, main]
Expand Down
7 changes: 6 additions & 1 deletion buildSrc/src/main/groovy/org/apache/beam/gradle/BeamDockerPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class BeamDockerPlugin implements Plugin<Project> {
String dockerComposeFile = 'docker-compose.yml'
Set<Task> dependencies = [] as Set
Set<String> tags = [] as Set
String tagSuffix = null
Map<String, String> namedTags = [:]
Map<String, String> labels = [:]
Map<String, String> buildArgs = [:]
Expand Down Expand Up @@ -100,7 +101,11 @@ class BeamDockerPlugin implements Plugin<Project> {
}

Set<String> getTags() {
return this.tags + project.getVersion().toString()
def allTags = this.tags + project.getVersion().toString()
if (tagSuffix) {
allTags = allTags.collect { it.endsWith(tagSuffix) ? it : it + tagSuffix }.toSet()
}
return allTags
}

Set<String> getPlatform() {
Expand Down
3 changes: 3 additions & 0 deletions runners/flink/job-server-container/flink_job_server_container.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,10 @@ task copyDockerfileDependencies(type: Copy) {
def pushContainers = project.rootProject.hasProperty(["isRelease"]) || project.rootProject.hasProperty("push-containers")
def containerName = project.parent.name.startsWith("2") ? "flink_job_server" : "flink${project.parent.name}_job_server"
def containerTag = project.rootProject.hasProperty(["docker-tag"]) ? project.rootProject["docker-tag"] : project.sdk_version
String verInSuffix = null
if (project.parent.name.startsWith("2")) {
containerTag += "-flink${project.parent.name}"
verInSuffix = "-flink${project.parent.name}"
}

docker {
Expand All @@ -68,6 +70,7 @@ docker {
tag: containerTag)
// tags used by dockerTag task
tags containerImageTags()
tagSuffix verInSuffix
files "./build/"
buildx project.useBuildx()
platform(*project.containerPlatforms())
Expand Down
Loading