Fix k8s node joining failure for Arista-7060X6-16PE-384C-B-O128S2 SKU (#20883)

Description of PR
Summary: Fix k8s node joining failure for Arista-7060X6-16PE-384C-B-O128S2 SKU
Fixes # (issue)

Type of change
 Bug fix
 Testbed and Framework(new/improvement)
 New Test case
 Skipped for non-supported platforms
 Test case improvement

Approach
What is the motivation for this PR?
For SKU Arista-7060X6-16PE-384C-B-O128S2, k8s test case fails due to joining failure, need to fix.

How did you do it?
The reason why the case fails is that there's a parameter for kubelet which will prefer IPv6 address, but in testbed, we are using IPv4, so just need to specify the --node-ip=mgmt_ip.

How did you verify/test it?
Run the modified code on Arista-7060X6-16PE-384C-B-O128S2 DUT, the case runs successfully.

Any platform specific information?
N/A

Supported testbed topology if it's a new test case?
N/A

signed-off-by: [email protected]
Signed-off-by: selldinesh <[email protected]>

Author: lixiaoyuner

tests/kubesonic/test_k8s_join_disjoin.py

@@ -23,6 +23,8 @@
 MINIKUBE_SETUP_CHECK_INTERVAL = 10
 KUBERNETES_VERSION = "v1.22.2"
 KUBELET_CONFIGMAP = "kubelet-config-1.22"
+KUBELET_DEFAULT_CONFIG = "/etc/default/kubelet"
+KUBELET_DEFAULT_CONFIG_BAK = f"{KUBELET_DEFAULT_CONFIG}.bak"
 DAEMONSET_NODE_LABEL = "deployDaemonset"
 DAEMONSET_POD_LABEL = "test-ds-pod"
 DAEMONSET_CONTAINER_NAME = "mock-ds-container"
@@ -184,6 +186,44 @@ def remove_minikube_vip_dns(duthost, vmhost):
     logger.info("Minikube vip dns is removed")
 
 
+def is_the_sku_need_to_remove_node_ip_param(duthost):
+    hwsku = duthost.facts.get("hwsku") if hasattr(duthost, "facts") else None
+    if not hwsku:
+        # Fallback query (ignore errors gracefully)
+        result = duthost.shell("sonic-cfggen -d -v DEVICE_METADATA.localhost.hwsku", module_ignore_errors=True)
+        hwsku = result.get("stdout", "").strip()
+    return hwsku == "Arista-7060X6-16PE-384C-B-O128S2"
+
+
+def remove_node_ip_param(duthost):
+    """Remove '--node-ip=::' from kubelet config.
+    Creates a backup of the original file once (if not already present) so it can be restored.
+    A series of sed patterns is used to safely eliminate the token with or without surrounding spaces.
+    """
+    if not is_the_sku_need_to_remove_node_ip_param(duthost):
+        return
+    logger.info("Detected SKU which requires removal of '--node-ip=::' from kubelet config")
+    duthost.shell(f"sudo cp {KUBELET_DEFAULT_CONFIG} {KUBELET_DEFAULT_CONFIG_BAK}", module_ignore_errors=True)
+    duthost.shell(f"sudo sed -i 's/--node-ip=::/--node-ip={duthost.mgmt_ip}/g' {KUBELET_DEFAULT_CONFIG}")
+    duthost.shell("sudo systemctl daemon-reload")
+    logger.info("Kubelet config '--node-ip=::' parameter removed")
+
+
+def restore_node_ip_param(duthost):
+    """Restore kubelet config from backup."""
+    if not is_the_sku_need_to_remove_node_ip_param(duthost):
+        return
+    logger.info("Restoring kubelet config to original state if backup exists")
+    restore_cmd = (
+        f"if [ -f {KUBELET_DEFAULT_CONFIG_BAK} ]; then "
+        f"sudo mv {KUBELET_DEFAULT_CONFIG_BAK} {KUBELET_DEFAULT_CONFIG}; "
+        f"fi"
+    )
+    duthost.shell(restore_cmd)
+    duthost.shell("sudo systemctl daemon-reload")
+    logger.info("Kubelet config node ip param restore completed")
+
+
 def deploy_test_daemonset(vmhost):
     logger.info("Start to deploy daemonset and check the status")
     daemonset_yaml = "/tmp/daemonset.yaml"
@@ -330,6 +370,9 @@ def setup_and_teardown(duthost, vmhost, creds):
     # Prepare dns for minikube vip
     prepare_minikube_vip_dns(duthost, vmhost)
 
+    # Remove node-ip param if the sku is needed
+    remove_node_ip_param(duthost)
+
     yield
 
     # Clean up the k8s table in configdb
@@ -341,6 +384,9 @@ def setup_and_teardown(duthost, vmhost, creds):
     # Restore certs for duthost join
     restore_cert(duthost)
 
+    # Restore node-ip param if the sku is needed
+    restore_node_ip_param(duthost)
+
     if asic_type == "vs":
 
         # Restore vmhost param