Update Dataflow dev container image tag. (#27545)

apache · Jul 18, 2023 · 6152a70 · 6152a70
1 parent 62a8087
commit 6152a70
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py b/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
@@ -1160,7 +1160,7 @@ def _get_required_container_version():
         current version of the SDK.
     """
   if 'dev' in beam_version.__version__:
-    return names.BEAM_FNAPI_CONTAINER_VERSION
+    return names.BEAM_DEV_SDK_CONTAINER_TAG
   else:
     return _get_container_image_tag()
 

diff --git a/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py b/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py
@@ -635,7 +635,7 @@ def test_pinned_worker_harness_image_tag_used_in_dev_sdk(self):
             '/beam_python%d.%d_sdk:%s' % (
                 sys.version_info[0],
                 sys.version_info[1],
-                names.BEAM_FNAPI_CONTAINER_VERSION)))
+                names.BEAM_DEV_SDK_CONTAINER_TAG)))
 
     pipeline_options = PipelineOptions(
         ['--temp_location', 'gs://any-location/temp'])
@@ -651,7 +651,7 @@ def test_pinned_worker_harness_image_tag_used_in_dev_sdk(self):
             '/beam_python%d.%d_sdk:%s' % (
                 sys.version_info[0],
                 sys.version_info[1],
-                names.BEAM_FNAPI_CONTAINER_VERSION)))
+                names.BEAM_DEV_SDK_CONTAINER_TAG)))
 
   @mock.patch(
       'apache_beam.runners.dataflow.internal.apiclient.'

diff --git a/sdks/python/apache_beam/runners/dataflow/internal/names.py b/sdks/python/apache_beam/runners/dataflow/internal/names.py
@@ -30,15 +30,10 @@
 SOURCE_TYPE = 'CustomSourcesType'
 SERIALIZED_SOURCE_KEY = 'serialized_source'
 
-# In a released SDK, container tags are selected based on the SDK version.
-# Unreleased versions use container versions based on values of
-# BEAM_CONTAINER_VERSION and BEAM_FNAPI_CONTAINER_VERSION (see below).
-
-# Update this version to the next version whenever there is a change that will
-# require changes to legacy Dataflow worker execution environment.
-BEAM_CONTAINER_VERSION = 'beam-master-20230629'
-# Update this version to the next version whenever there is a change that
+# In a released SDK, Python sdk container image is tagged with the SDK version.
+# Unreleased sdks use container image tag specified below.
+# Update this tag whenever there is a change that
 # requires changes to SDK harness container or SDK harness launcher.
-BEAM_FNAPI_CONTAINER_VERSION = 'beam-master-20230705'
+BEAM_DEV_SDK_CONTAINER_TAG = 'beam-master-20230717'
 
 DATAFLOW_CONTAINER_IMAGE_REPOSITORY = 'gcr.io/cloud-dataflow/v1beta3'