Fix code irregular issues (#12595)

* Fix code irregular issues

Signed-off-by: Yun Li <yunli1@microsoft.com>

src/sonic-ctrmgrd/ctrmgr/container_startup.py

@@ -28,7 +28,6 @@ UNIT_TESTING = 0
 
 def debug_msg(m):
     msg = "{}: {}".format(inspect.stack()[1][3], m)
-    print(msg)
     syslog.syslog(syslog.LOG_DEBUG, msg)
 
 
@@ -232,15 +231,6 @@ def container_up(feature, owner, version):
             do_freeze(feature, "This version is marked disabled. Exiting ...")
             return
 
-        # if not instance_higher(feature, state_data[VERSION], version):
-        #     # TODO: May Remove label <feature_name>_<version>_enabled
-        #     # Else kubelet will continue to re-deploy every 5 mins, until
-        #     # master removes the lable to un-deploy.
-        #     #
-        #     do_freeze(feature, "bail out as current deploy version {} is not higher".
-        #             format(version))
-        #     return
-
         update_data(state_db, feature, { VERSION: version })
 
         mode = state_data[REMOTE_STATE]

src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py

@@ -101,7 +101,6 @@ remote_ctr_config = {
 
 def log_debug(m):
     msg = "{}: {}".format(inspect.stack()[1][3], m)
-    #print(msg)
     syslog.syslog(syslog.LOG_DEBUG, msg)
 
 
@@ -176,7 +175,7 @@ class MainServer:
             self.db_connectors[db_name] = swsscommon.DBConnector(db_name, 0)
 
 
-    def register_timer(self, ts, handler, args=()):
+    def register_timer(self, ts, handler, args=None):
         """ Register timer based handler. 
             The handler will be called on/after give timestamp, ts
         """
@@ -239,7 +238,10 @@ class MainServer:
                     lst = self.timer_handlers[k]
                     del self.timer_handlers[k]
                     for fn in lst:
-                        fn[0](*fn[1])
+                        if fn[1] is None:
+                            fn[0]()
+                        else:
+                            fn[0](*fn[1])
                 else:
                     timeout = (k - ct_ts).seconds
                     break

src/sonic-ctrmgrd/ctrmgr/kube_commands.py

@@ -337,8 +337,6 @@ def _do_join(server, port, insecure):
     out = ""
     ret = 0
     try:
-        #local_ipv6 = _get_local_ipv6()
-        #_download_file(server, port, insecure)
         _gen_cli_kubeconf(server, port, insecure)
         _do_reset(True)
         _run_command("modprobe br_netfilter")