From 6ca96b5cb9734404292a3a7dd1f4eb58e6098f1a Mon Sep 17 00:00:00 2001 From: damccorm Date: Wed, 1 Nov 2023 16:56:23 +0000 Subject: [PATCH 1/2] Set Dataflow container to release version. --- runners/google-cloud-dataflow-java/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle index 69759fc76a6f..ae3a1311606a 100644 --- a/runners/google-cloud-dataflow-java/build.gradle +++ b/runners/google-cloud-dataflow-java/build.gradle @@ -51,8 +51,8 @@ evaluationDependsOn(":sdks:java:container:java11") ext.dataflowLegacyEnvironmentMajorVersion = '8' ext.dataflowFnapiEnvironmentMajorVersion = '8' -ext.dataflowLegacyContainerVersion = 'beam-master-20231026' -ext.dataflowFnapiContainerVersion = 'beam-master-20231026' +ext.dataflowLegacyContainerVersion = '2.52.0' +ext.dataflowFnapiContainerVersion = '2.52.0' ext.dataflowContainerBaseRepository = 'gcr.io/cloud-dataflow/v1beta3' processResources { From 1895d3e91dfce7d93a54ff27b08cbc35dfce752c Mon Sep 17 00:00:00 2001 From: Valentyn Tymofieiev Date: Wed, 1 Nov 2023 11:50:13 -0700 Subject: [PATCH 2/2] Upgrade protobuf version to remediate a leak. --- sdks/python/container/py310/base_image_requirements.txt | 2 +- sdks/python/container/py311/base_image_requirements.txt | 2 +- sdks/python/container/py38/base_image_requirements.txt | 2 +- sdks/python/container/py39/base_image_requirements.txt | 2 +- sdks/python/setup.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdks/python/container/py310/base_image_requirements.txt b/sdks/python/container/py310/base_image_requirements.txt index c1d4f2c551dc..035d5697b0d7 100644 --- a/sdks/python/container/py310/base_image_requirements.txt +++ b/sdks/python/container/py310/base_image_requirements.txt @@ -98,7 +98,7 @@ pandas==1.5.3 parameterized==0.9.0 pluggy==1.3.0 proto-plus==1.22.3 -protobuf==4.24.4 +protobuf==4.25.0 psycopg2-binary==2.9.9 pyarrow==11.0.0 pyasn1==0.5.0 diff --git a/sdks/python/container/py311/base_image_requirements.txt b/sdks/python/container/py311/base_image_requirements.txt index 0126b5506d63..f6fea89d0188 100644 --- a/sdks/python/container/py311/base_image_requirements.txt +++ b/sdks/python/container/py311/base_image_requirements.txt @@ -95,7 +95,7 @@ pandas==1.5.3 parameterized==0.9.0 pluggy==1.3.0 proto-plus==1.22.3 -protobuf==4.24.4 +protobuf==4.25.0 psycopg2-binary==2.9.9 pyarrow==11.0.0 pyasn1==0.5.0 diff --git a/sdks/python/container/py38/base_image_requirements.txt b/sdks/python/container/py38/base_image_requirements.txt index 979600b03897..d2d48f19d351 100644 --- a/sdks/python/container/py38/base_image_requirements.txt +++ b/sdks/python/container/py38/base_image_requirements.txt @@ -102,7 +102,7 @@ parameterized==0.9.0 pkgutil_resolve_name==1.3.10 pluggy==1.3.0 proto-plus==1.22.3 -protobuf==4.24.4 +protobuf==4.25.0 psycopg2-binary==2.9.9 pyarrow==11.0.0 pyasn1==0.5.0 diff --git a/sdks/python/container/py39/base_image_requirements.txt b/sdks/python/container/py39/base_image_requirements.txt index 0dda688963e8..4fb867387475 100644 --- a/sdks/python/container/py39/base_image_requirements.txt +++ b/sdks/python/container/py39/base_image_requirements.txt @@ -99,7 +99,7 @@ pandas==1.5.3 parameterized==0.9.0 pluggy==1.3.0 proto-plus==1.22.3 -protobuf==4.24.4 +protobuf==4.25.0 psycopg2-binary==2.9.9 pyarrow==11.0.0 pyasn1==0.5.0 diff --git a/sdks/python/setup.py b/sdks/python/setup.py index e0bc6197e93b..b9fd89f0707e 100644 --- a/sdks/python/setup.py +++ b/sdks/python/setup.py @@ -297,7 +297,7 @@ def get_portability_package_data(): # # 3. Exclude protobuf 4 versions that leak memory, see: # https://github.com/apache/beam/issues/28246 - 'protobuf>=3.20.3,<4.25.0,!=4.0.*,!=4.21.*,!=4.22.0,!=4.23.*,!=4.24.0,!=4.24.1,!=4.24.2', # pylint: disable=line-too-long + 'protobuf>=3.20.3,<4.26.0,!=4.0.*,!=4.21.*,!=4.22.0,!=4.23.*,!=4.24.*', # pylint: disable=line-too-long 'pydot>=1.2.0,<2', 'python-dateutil>=2.8.0,<3', 'pytz>=2018.3',