Skip to content

Commit ddd46fe

Browse files
authored
Merge b6dedaa into fb228ee
2 parents fb228ee + b6dedaa commit ddd46fe

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

ydb/public/tools/lib/cmds/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,11 @@ def deploy(arguments):
359359
if 'YDB_EXPERIMENTAL_PG' in os.environ:
360360
optionals['pg_compatible_expirement'] = True
361361

362+
if os.environ.get('YDB_KAFKA_API_ENABLED', "0") == "1":
363+
kafka_api_port = int(os.environ.get("YDB_KAFKA_PROXY_PORT", "9092"))
364+
optionals['kafka_api_port'] = kafka_api_port
365+
print(f"rekby-debug: kafka enabled, port {kafka_api_port}")
366+
362367
configuration = KikimrConfigGenerator(
363368
erasure=parse_erasure(arguments),
364369
binary_paths=[arguments.ydb_binary_path] if arguments.ydb_binary_path else None,

ydb/tests/library/harness/kikimr_config.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ def __init__(
156156
default_user_sid=None,
157157
pg_compatible_expirement=False,
158158
generic_connector_config=None, # typing.Optional[TGenericConnectorConfig]
159+
kafka_api_port=None,
159160
metadata_section=None,
160161
):
161162
if extra_feature_flags is None:
@@ -178,7 +179,6 @@ def __init__(
178179
self._pdisks_info = []
179180
if self.__grpc_ssl_enable:
180181
self.__grpc_tls_data_path = grpc_tls_data_path or yatest.common.output_path()
181-
cert_pem, key_pem = tls_tools.generate_selfsigned_cert(_get_fqdn())
182182
self.__grpc_tls_ca = cert_pem
183183
self.__grpc_tls_key = key_pem
184184
self.__grpc_tls_cert = cert_pem
@@ -431,6 +431,14 @@ def __init__(
431431
self.yaml_config["feature_flags"]["enable_external_data_sources"] = True
432432
self.yaml_config["feature_flags"]["enable_script_execution_operations"] = True
433433

434+
print(f"rekby-debug: kafka port for config: {kafka_api_port}")
435+
if kafka_api_port is not None:
436+
kafka_proxy_config = dict()
437+
kafka_proxy_config["enable_kafka_proxy"] = True
438+
kafka_proxy_config["listening_port"] = kafka_api_port
439+
440+
self.yaml_config["kafka_proxy_config"] = kafka_proxy_config
441+
434442
self.full_config = dict()
435443
if metadata_section:
436444
self.full_config["metadata"] = metadata_section

0 commit comments

Comments
 (0)