Merge pull request #3661 from chrischdi/pr-fix-1-35-kubelet-pod-infra-container-image

k8s-ci-robot · web-flow · commit d6833ff500c7 · 2025-11-04T10:12:05.000-08:00
🌱 CI: clear /etc/sysconfig/kubelet to ensure --pod-infra-container-image is not set
diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/main/base/patch-k8s-install-script-kcp.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/main/base/patch-k8s-install-script-kcp.yaml
@@ -91,6 +91,12 @@
           $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
           $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
         done
+
+        # TODO: remove once we use k8s v1.35 image-builder templates.
+        # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.        
+        echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+        echo "" > /etc/sysconfig/kubelet || true
+        echo "" > /etc/default/kubelet || true
       fi
       echo "* checking binary versions"
       echo "ctr version: " "$(ctr version)"
diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/main/base/patch-k8s-install-script-kct.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/main/base/patch-k8s-install-script-kct.yaml
@@ -94,6 +94,12 @@
           $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
           $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
         done
+
+        # TODO: remove once we use k8s v1.35 image-builder templates.
+        # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+        echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+        echo "" > /etc/sysconfig/kubelet || true
+        echo "" > /etc/default/kubelet || true
       fi
       echo "* checking binary versions"
       echo "ctr version: " "$(ctr version)"
diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-k8s-install-script.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-k8s-install-script.yaml
@@ -96,6 +96,12 @@
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                 done
+
+                # TODO: remove once we use k8s v1.35 image-builder templates.
+                # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+                echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+                echo "" > /etc/sysconfig/kubelet || true
+                echo "" > /etc/default/kubelet || true
               fi
               echo "* checking binary versions"
               echo "ctr version: " "$(ctr version)"
@@ -203,6 +209,12 @@
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                 done
+
+                # TODO: remove once we use k8s v1.35 image-builder templates.
+                # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+                echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+                echo "" > /etc/sysconfig/kubelet || true
+                echo "" > /etc/default/kubelet || true
               fi
               echo "* checking binary versions"
               echo "ctr version: " "$(ctr version)"
diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.11/clusterclass/patch-k8s-install-script.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.11/clusterclass/patch-k8s-install-script.yaml
@@ -96,6 +96,12 @@
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                 done
+
+                # TODO: remove once we use k8s v1.35 image-builder templates.
+                # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+                echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+                echo "" > /etc/sysconfig/kubelet || true
+                echo "" > /etc/default/kubelet || true
               fi
               echo "* checking binary versions"
               echo "ctr version: " "$(ctr version)"
@@ -203,6 +209,12 @@
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                 done
+
+                # TODO: remove once we use k8s v1.35 image-builder templates.
+                # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+                echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+                echo "" > /etc/sysconfig/kubelet || true
+                echo "" > /etc/default/kubelet || true
               fi
               echo "* checking binary versions"
               echo "ctr version: " "$(ctr version)"
diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.12/clusterclass/patch-k8s-install-script.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.12/clusterclass/patch-k8s-install-script.yaml
@@ -96,6 +96,12 @@
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                 done
+
+                # TODO: remove once we use k8s v1.35 image-builder templates.
+                # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+                echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+                echo "" > /etc/sysconfig/kubelet || true
+                echo "" > /etc/default/kubelet || true
               fi
               echo "* checking binary versions"
               echo "ctr version: " "$(ctr version)"
@@ -203,6 +209,12 @@
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                 done
+
+                # TODO: remove once we use k8s v1.35 image-builder templates.
+                # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+                echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+                echo "" > /etc/sysconfig/kubelet || true
+                echo "" > /etc/default/kubelet || true
               fi
               echo "* checking binary versions"
               echo "ctr version: " "$(ctr version)"
diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.13/clusterclass/patch-k8s-install-script.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.13/clusterclass/patch-k8s-install-script.yaml
@@ -96,6 +96,12 @@
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                 done
+
+                # TODO: remove once we use k8s v1.35 image-builder templates.
+                # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+                echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+                echo "" > /etc/sysconfig/kubelet || true
+                echo "" > /etc/default/kubelet || true
               fi
               echo "* checking binary versions"
               echo "ctr version: " "$(ctr version)"
@@ -203,6 +209,12 @@
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                 done
+
+                # TODO: remove once we use k8s v1.35 image-builder templates.
+                # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+                echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+                echo "" > /etc/sysconfig/kubelet || true
+                echo "" > /etc/default/kubelet || true
               fi
               echo "* checking binary versions"
               echo "ctr version: " "$(ctr version)"
diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.14/clusterclass/patch-k8s-install-script.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.14/clusterclass/patch-k8s-install-script.yaml
@@ -96,6 +96,12 @@
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                 done
+
+                # TODO: remove once we use k8s v1.35 image-builder templates.
+                # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+                echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+                echo "" > /etc/sysconfig/kubelet || true
+                echo "" > /etc/default/kubelet || true
               fi
               echo "* checking binary versions"
               echo "ctr version: " "$(ctr version)"
@@ -203,6 +209,12 @@
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                 done
+
+                # TODO: remove once we use k8s v1.35 image-builder templates.
+                # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+                echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+                echo "" > /etc/sysconfig/kubelet || true
+                echo "" > /etc/default/kubelet || true
               fi
               echo "* checking binary versions"
               echo "ctr version: " "$(ctr version)"
diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/main/base/patch-k8s-install-script-kcp.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/main/base/patch-k8s-install-script-kcp.yaml
@@ -91,6 +91,12 @@
           $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
           $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
         done
+
+        # TODO: remove once we use k8s v1.35 image-builder templates.
+        # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+        echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+        echo "" > /etc/sysconfig/kubelet || true
+        echo "" > /etc/default/kubelet || true
       fi
       echo "* checking binary versions"
       echo "ctr version: " "$(ctr version)"
diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/main/base/patch-k8s-install-script-kct.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/main/base/patch-k8s-install-script-kct.yaml
@@ -94,6 +94,12 @@
           $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
           $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
         done
+
+        # TODO: remove once we use k8s v1.35 image-builder templates.
+        # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+        echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+        echo "" > /etc/sysconfig/kubelet || true
+        echo "" > /etc/default/kubelet || true
       fi
       echo "* checking binary versions"
       echo "ctr version: " "$(ctr version)"
diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-k8s-install-script.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-k8s-install-script.yaml
@@ -96,6 +96,12 @@
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                 done
+
+                # TODO: remove once we use k8s v1.35 image-builder templates.
+                # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+                echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+                echo "" > /etc/sysconfig/kubelet || true
+                echo "" > /etc/default/kubelet || true
               fi
               echo "* checking binary versions"
               echo "ctr version: " "$(ctr version)"
@@ -203,6 +209,12 @@
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                 done
+
+                # TODO: remove once we use k8s v1.35 image-builder templates.
+                # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+                echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+                echo "" > /etc/sysconfig/kubelet || true
+                echo "" > /etc/default/kubelet || true
               fi
               echo "* checking binary versions"
               echo "ctr version: " "$(ctr version)"
diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/v1.11/clusterclass/patch-k8s-install-script.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/v1.11/clusterclass/patch-k8s-install-script.yaml
@@ -96,6 +96,12 @@
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                 done
+
+                # TODO: remove once we use k8s v1.35 image-builder templates.
+                # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+                echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+                echo "" > /etc/sysconfig/kubelet || true
+                echo "" > /etc/default/kubelet || true
               fi
               echo "* checking binary versions"
               echo "ctr version: " "$(ctr version)"
@@ -203,6 +209,12 @@
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                 done
+
+                # TODO: remove once we use k8s v1.35 image-builder templates.
+                # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+                echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+                echo "" > /etc/sysconfig/kubelet || true
+                echo "" > /etc/default/kubelet || true
               fi
               echo "* checking binary versions"
               echo "ctr version: " "$(ctr version)"
diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/v1.12/clusterclass/patch-k8s-install-script.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/v1.12/clusterclass/patch-k8s-install-script.yaml
@@ -96,6 +96,12 @@
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                 done
+
+                # TODO: remove once we use k8s v1.35 image-builder templates.
+                # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+                echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+                echo "" > /etc/sysconfig/kubelet || true
+                echo "" > /etc/default/kubelet || true
               fi
               echo "* checking binary versions"
               echo "ctr version: " "$(ctr version)"
@@ -203,6 +209,12 @@
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                   $${SUDO} ctr -n k8s.io images tag "$${IMAGE_REGISTRY_PREFIX}/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
                 done
+
+                # TODO: remove once we use k8s v1.35 image-builder templates.
+                # Note: This is a temporary fix to ensure the flag --pod-infra-container-image is not set which was removed in k8s v1.35 and deprecated for a long time.
+                echo "Clearing /etc/sysconfig/kubelet and/or /etc/default/kubelet if they exist"
+                echo "" > /etc/sysconfig/kubelet || true
+                echo "" > /etc/default/kubelet || true
               fi
               echo "* checking binary versions"
               echo "ctr version: " "$(ctr version)"
diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/v1.13/clusterclass/patch-k8s-install-script.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/v1.13/clusterclass/patch-k8s-install-script.yaml
diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/v1.14/clusterclass/patch-k8s-install-script.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/v1.14/clusterclass/patch-k8s-install-script.yaml
