Merge pull request #4002 from Skarlso/fix_cluster_dumper

k8s-ci-robot · web-flow · commit 3dbb12b5cac8 · 2023-01-24T01:30:17.000-08:00
Fix AWS CloudFormation dump after failed suit when there is no bootstrap cluster
diff --git a/test/e2e/shared/aws.go b/test/e2e/shared/aws.go
@@ -859,7 +859,11 @@ func (s *ServiceQuota) updateServiceQuotaRequestStatus(serviceQuotasClient *serv
 }
 
 func DumpEKSClusters(ctx context.Context, e2eCtx *E2EContext) {
-	logPath := filepath.Join(e2eCtx.Settings.ArtifactFolder, "clusters", e2eCtx.Environment.BootstrapClusterProxy.GetName(), "aws-resources")
+	name := "no-bootstrap-cluster"
+	if e2eCtx.Environment.BootstrapClusterProxy != nil {
+		name = e2eCtx.Environment.BootstrapClusterProxy.GetName()
+	}
+	logPath := filepath.Join(e2eCtx.Settings.ArtifactFolder, "clusters", name, "aws-resources")
 	if err := os.MkdirAll(logPath, os.ModePerm); err != nil {
 		fmt.Fprintf(GinkgoWriter, "couldn't create directory: path=%s, err=%s", logPath, err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -859,7 +859,11 @@ func (s ServiceQuota) updateServiceQuotaRequestStatus(serviceQuotasClient serv`
`859`	`859`	`}`
`860`	`860`
`861`	`861`	`func DumpEKSClusters(ctx context.Context, e2eCtx *E2EContext) {`
`862`		`- logPath := filepath.Join(e2eCtx.Settings.ArtifactFolder, "clusters", e2eCtx.Environment.BootstrapClusterProxy.GetName(), "aws-resources")`
	`862`	`+ name := "no-bootstrap-cluster"`
	`863`	`+ if e2eCtx.Environment.BootstrapClusterProxy != nil {`
	`864`	`+ name = e2eCtx.Environment.BootstrapClusterProxy.GetName()`
	`865`	`+ }`
	`866`	`+ logPath := filepath.Join(e2eCtx.Settings.ArtifactFolder, "clusters", name, "aws-resources")`
`863`	`867`	`if err := os.MkdirAll(logPath, os.ModePerm); err != nil {`
`864`	`868`	`fmt.Fprintf(GinkgoWriter, "couldn't create directory: path=%s, err=%s", logPath, err)`
`865`	`869`	`}`