Merge pull request #124 from topolvm/fix-cronjob-name

ushitora-anqou · web-flow · commit 902d05c0b9ff · 2024-05-14T09:12:47.000+09:00
fix: use at most 15 letters for node name in cronjob name
diff --git a/internal/controller/pie/pieprobe_controller.go b/internal/controller/pie/pieprobe_controller.go
@@ -514,11 +514,11 @@ func getCronJobName(kind int, nodeNamePtr *string, pieProbe *piev1alpha1.PieProb
 	if len(pieProbeName) > 10 {
 		pieProbeName = pieProbeName[:10]
 	}
-	if len(nodeName) > 11 {
-		nodeName = nodeName[:11]
+	if len(nodeName) > 15 {
+		nodeName = nodeName[:15]
 	}
-	if len(storageClass) > 14 {
-		storageClass = storageClass[:14]
+	if len(storageClass) > 12 {
+		storageClass = storageClass[:12]
 	}
 
 	if kind == ProvisionProbe {

Original file line number	Diff line number	Diff line change
`@@ -514,11 +514,11 @@ func getCronJobName(kind int, nodeNamePtr string, pieProbe piev1alpha1.PieProb`
`514`	`514`	`if len(pieProbeName) > 10 {`
`515`	`515`	`pieProbeName = pieProbeName[:10]`
`516`	`516`	`}`
`517`		`- if len(nodeName) > 11 {`
`518`		`- nodeName = nodeName[:11]`
	`517`	`+ if len(nodeName) > 15 {`
	`518`	`+ nodeName = nodeName[:15]`
`519`	`519`	`}`
`520`		`- if len(storageClass) > 14 {`
`521`		`- storageClass = storageClass[:14]`
	`520`	`+ if len(storageClass) > 12 {`
	`521`	`+ storageClass = storageClass[:12]`
`522`	`522`	`}`
`523`	`523`
`524`	`524`	`if kind == ProvisionProbe {`