Skip to content
This repository was archived by the owner on Jun 30, 2022. It is now read-only.

Commit d931cdd

Browse files
charlesccychenaaltay
authored andcommitted
Use worker harness container corresponding to SDK version
----Release Notes---- [] ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=122697631
1 parent 0c4d8c3 commit d931cdd

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

google/cloud/dataflow/internal/apiclient.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,11 @@ def __init__(self, packages, options, environment_version):
239239
if self.worker_options.worker_harness_container_image:
240240
pool.workerHarnessContainerImage = (
241241
self.worker_options.worker_harness_container_image)
242+
else:
243+
# Default to using the worker harness container image for the current SDK
244+
# version.
245+
pool.workerHarnessContainerImage = (
246+
'dataflow.gcr.io/v1beta3/python:%s' % version.__version__)
242247
if self.worker_options.teardown_policy:
243248
if self.worker_options.teardown_policy == 'TEARDOWN_NEVER':
244249
pool.teardownPolicy = (

google/cloud/dataflow/utils/options.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,10 @@ def _add_argparse_args(cls, parser):
315315
parser.add_argument(
316316
'--worker_harness_container_image',
317317
default=None,
318-
help='Docker image to use for the worker harness.')
318+
help=('Docker registry location of container image to use for the '
319+
'worker harness. Default is the container for the version of the '
320+
'SDK. Note: currently, only approved Google Cloud Dataflow '
321+
'container images may be used here.'))
319322
parser.add_argument(
320323
'--teardown_policy',
321324
choices=['TEARDOWN_ALWAYS', 'TEARDOWN_NEVER', 'TEARDOWN_ON_SUCCESS'],

0 commit comments

Comments
 (0)