Merge pull request #3598 from k8s-infra-cherrypick-robot/cherry-pick-3594-to-release-1.14

k8s-ci-robot · web-flow · commit 65208f622a57 · 2025-08-25T08:41:08.000-07:00
[release-1.14] 🌱 Set log collector for clusterctl upgrade tests
diff --git a/test/e2e/clusterctl_upgrade_test.go b/test/e2e/clusterctl_upgrade_test.go
@@ -276,7 +276,7 @@ func kindManagementClusterNewClusterProxyFunc(name string, kubeconfigPath string
 	if testTarget == VCSimTestTarget {
 		return vcsim.NewClusterProxy(name, kubeconfigPath, scheme)
 	}
-	return framework.NewClusterProxy(name, kubeconfigPath, scheme)
+	return framework.NewClusterProxy(name, kubeconfigPath, scheme, framework.WithMachineLogCollector(framework.DockerLogCollector{}))
 }
 
 func crdShouldBeMigrated(crd apiextensionsv1.CustomResourceDefinition) bool {

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ func kindManagementClusterNewClusterProxyFunc(name string, kubeconfigPath string`
`276`	`276`	`if testTarget == VCSimTestTarget {`
`277`	`277`	`return vcsim.NewClusterProxy(name, kubeconfigPath, scheme)`
`278`	`278`	`}`
`279`		`- return framework.NewClusterProxy(name, kubeconfigPath, scheme)`
	`279`	`+ return framework.NewClusterProxy(name, kubeconfigPath, scheme, framework.WithMachineLogCollector(framework.DockerLogCollector{}))`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`func crdShouldBeMigrated(crd apiextensionsv1.CustomResourceDefinition) bool {`