ydbd_slice: review fixes

- --yaml-dynconfig removed
- dynconfig.yaml generator fixed ( remove storage only options )
- fix the typo

Author: melazyk

ydb/tools/ydbd_slice/__init__.py

@@ -558,13 +558,6 @@ def yaml_config_path_args():
         required=False,
         help="Path to file with config.yaml configuration",
     )
-    args.add_argument(
-        "--yaml-dynconfig",
-        metavar="YAML_DYNCONFIG",
-        default="",
-        required=False,
-        help="Path to file with dynconfig.yaml configuration",
-    )
 
     return args
 
@@ -654,14 +647,13 @@ def dispatch_run(func, args, walle_provider, need_confirmation=False):
     kikimr_bin, kikimr_compressed_bin = deduce_kikimr_bin_from_args(args)
     clear_tmp = not args.dry_run and args.temp_dir is None
 
-    if args.yaml_config and args.yaml_dynconfig:
+    if args.yaml_config:
         configurator = yaml_configurator.YamlConfigurator(
             args.cluster,
             temp_dir,
             kikimr_bin,
             kikimr_compressed_bin,
-            args.yaml_config,
-            args.yaml_dynconfig
+            args.yaml_config
         )
         cluster_details = configurator.cluster_description
     else:
@@ -1530,28 +1522,19 @@ def main(walle_provider=None):
         if not args.yaml_config:
             warnings.warn(
                 '''
-
-
-###### WARNING #######
-
 Using cluster.yaml for cluster configuration is deprecated.
 Only the 'domains' section should be filled with database and slot configurations.
-The config.yaml and dynconfig.yaml should be passed as raw files through the --yaml-config and --yaml-dynconfig parameters.
+The config.yaml should be passed as a raw file through the --yaml-config.
 
-    ydbd_slice install cluster.yaml all --binary /path/to/ydbd --yaml-config /path/to/config.yaml --yaml-dynconfig /path/to/dynconfig.yaml
+Example:
+    ydbd_slice install cluster.yaml all --binary /path/to/ydbd --yaml-config /path/to/config.yaml
 
 To save the resulting configuration files from an old cluster.yaml, use the --save-raw-cfg option.
 
+Example:
     ydbd_slice install cluster.yaml all --binary /path/to/ydbd --save-raw-cfg /path/to/save
 
-The resulting configuration files will be saved in the /path/to/save directory. You can find config.yaml and dynconfig.yaml in the /path/to/save/kikimr-static directory.
-
-To generate dynconfig.yaml from config.yaml, you can use the dynconfig-generator command.
-
-    ydbd_slice dynconfig-generator --yaml-config /path/to/config.yaml --output-file /path/to/dynconfig.yaml
-
-###### WARNING #######
-
+The resulting configuration files will be saved in the /path/to/save directory. You can find config.yaml in the /path/to/save/kikimr-static directory.
 ''',
                 DeprecationWarning
             )

ydb/tools/ydbd_slice/yaml_configurator.py

@@ -10,6 +10,15 @@
     kikimr_cfg_for_static_node_new_style,
 )
 
+# Remove specified keys
+STORAGE_ONLY_KEYS = [
+        'static_erasure',
+        'host_configs',
+        'nameservice_config',
+        'blob_storage_config',
+        'hosts'
+]
+
 
 class YamlConfig(object):
     def __init__(self, yaml_config_path: str):
@@ -21,14 +30,19 @@ def __init__(self, yaml_config_path: str):
 
     @property
     def dynamic_simple(self):
+        subconfig = copy.deepcopy(self.__yaml_config)
+
+        for key in STORAGE_ONLY_KEYS:
+            subconfig.pop(key, None)
+
         cluster_uuid = self.__yaml_config.get('nameservice_config', {}).get('cluster_uuid', '')
         dynconfig = {
             'metadata': {
                 'kind': 'MainConfig',
                 'cluster': cluster_uuid,
                 'version': 0,
             },
-            'config': copy.deepcopy(self.__yaml_config),
+            'config': subconfig,
             'allowed_labels': {
                 'node_id': {'type': 'string'},
                 'host': {'type': 'string'},
@@ -48,7 +62,6 @@ def __init__(
                 bin_path: os.PathLike,
                 compressed_bin_path: os.PathLike,
                 config_path: os.PathLike,
-                dynconfig_path: os.PathLike = ""
             ):
         # walle provider is not used
         # use config_path instad of cluster_path
@@ -59,14 +72,12 @@ def __init__(
             self.cluster_description.domains = _domains.get('domains', [])
 
         self.__static_cfg = out_dir
+        # might be needed in the future to do something locally using the ydbd binary
         self.__kikimr_bin_file = bin_path
         self.__kikimr_compressed_bin_file = compressed_bin_path
         with open(config_path, 'r') as f:
             self.static = f.read()
 
-        with open(dynconfig_path, 'r') as f:
-            self.dynamic = f.read()
-
     @property
     def kikimr_bin(self):
         return self.bin_path
@@ -127,7 +138,7 @@ def hosts_names(self):
         return [host['host'] for host in self.static_dict.get('hosts', [])]
 
     @property
-    def kickimr_cfg(self):
+    def kikimr_cfg(self):
         return kikimr_cfg_for_static_node_new_style()
 
     @property
@@ -149,21 +160,11 @@ def create_static_cfg(self) -> str:
         )
         write_to_file(
             os.path.join(self.__static_cfg, 'kikimr.cfg'),
-            self.kickimr_cfg
-        )
-        write_to_file(
-            os.path.join(self.__static_cfg, 'dynconfig.yaml'),
-            self.__dynamic
+            self.kikimr_cfg
         )
         write_to_file(
             os.path.join(self.__static_cfg, 'dynamic_server.cfg'),
             self.dynamic_cfg
         )
 
         return self.__static_cfg
-
-    def create_dynamic_cfg(self) -> str:
-        write_to_file(
-            os.path.join(self.__static_cfg, 'dynconfig.yaml'),
-            self.__dynamic
-        )