Merge pull request #16796 from rifelpet/gcp-job-name

k8s-ci-robot · web-flow · commit 70cbc64d226b · 2024-08-31T00:22:44.000+01:00
Don't truncate the top level domains for GCP jobs
diff --git a/tests/e2e/kubetest2-kops/deployer/common.go b/tests/e2e/kubetest2-kops/deployer/common.go
@@ -300,14 +300,17 @@ func defaultClusterName(cloudProvider string) (string, error) {
 		jobName = jobName[:79]
 	}
 	if jobType == "presubmit" {
-		jobName = fmt.Sprintf("e2e-pr%s.%s.%s", pullNumber, jobName, suffix)
+		jobName = fmt.Sprintf("e2e-pr%s.%s", pullNumber, jobName)
 	} else {
-		jobName = fmt.Sprintf("e2e-%s.%s", jobName, suffix)
+		jobName = fmt.Sprintf("e2e-%s", jobName)
 	}
-	if len(jobName) > 63 && cloudProvider == "gce" { // GCP has char limit of 64
-		jobName = jobName[:63]
+
+	// GCP has char limit of 64
+	gcpLimit := 63 - (len(suffix) + 1) // 1 for the dot
+	if len(jobName) > gcpLimit && cloudProvider == "gce" {
+		jobName = jobName[:gcpLimit]
 	}
-	return jobName, nil
+	return fmt.Sprintf("%v.%v", jobName, suffix), nil
 }
 
 // stateStore returns the kops state store to use

Original file line number	Diff line number	Diff line change
`@@ -300,14 +300,17 @@ func defaultClusterName(cloudProvider string) (string, error) {`
`300`	`300`	`jobName = jobName[:79]`
`301`	`301`	`}`
`302`	`302`	`if jobType == "presubmit" {`
`303`		`- jobName = fmt.Sprintf("e2e-pr%s.%s.%s", pullNumber, jobName, suffix)`
	`303`	`+ jobName = fmt.Sprintf("e2e-pr%s.%s", pullNumber, jobName)`
`304`	`304`	`} else {`
`305`		`- jobName = fmt.Sprintf("e2e-%s.%s", jobName, suffix)`
	`305`	`+ jobName = fmt.Sprintf("e2e-%s", jobName)`
`306`	`306`	`}`
`307`		`- if len(jobName) > 63 && cloudProvider == "gce" { // GCP has char limit of 64`
`308`		`- jobName = jobName[:63]`
	`307`	`+`
	`308`	`+ // GCP has char limit of 64`
	`309`	`+ gcpLimit := 63 - (len(suffix) + 1) // 1 for the dot`
	`310`	`+ if len(jobName) > gcpLimit && cloudProvider == "gce" {`
	`311`	`+ jobName = jobName[:gcpLimit]`
`309`	`312`	`}`
`310`		`- return jobName, nil`
	`313`	`+ return fmt.Sprintf("%v.%v", jobName, suffix), nil`
`311`	`314`	`}`
`312`	`315`
`313`	`316`	`// stateStore returns the kops state store to use`