fix: job name too long for label (#4003)

apecloud · Jun 28, 2023 · 568fe69 · 568fe69
1 parent e790ec2
commit 568fe69
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/controllers/dataprotection/backup_controller_test.go b/controllers/dataprotection/backup_controller_test.go
@@ -282,9 +282,9 @@ var _ = Describe("Backup Controller test", func() {
 				viper.Set(constant.CfgKeyCtrlrMgrTolerations,
 					"[{\"key\":\"key1\", \"operator\": \"Exists\", \"effect\": \"NoSchedule\"}]")
 				viper.Set(constant.CfgKeyCtrlrMgrNodeSelector, "{\"beta.kubernetes.io/arch\":\"amd64\"}")
-
+				snapshotBackupName := "backup-default-postgres-cluster-20230628104804"
 				By("By creating a backup from backupPolicy: " + backupPolicyName)
-				backup = testapps.NewBackupFactory(testCtx.DefaultNamespace, backupName).
+				backup = testapps.NewBackupFactory(testCtx.DefaultNamespace, snapshotBackupName).
 					SetBackupPolicyName(backupPolicyName).
 					SetBackupType(dpv1alpha1.BackupTypeSnapshot).
 					Create(&testCtx).GetObject()

diff --git a/controllers/dataprotection/utils.go b/controllers/dataprotection/utils.go
@@ -235,10 +235,10 @@ func generateJSON(path string, value string) string {
 	return jsonString
 }
 
-// cropJobName job name cannot exceed 64 characters.
+// cropJobName job name cannot exceed 63 characters for label name limit.
 func cropJobName(jobName string) string {
 	if len(jobName) > 63 {
-		return jobName[:64]
+		return jobName[:63]
 	}
 	return jobName
 }

diff --git a/internal/controller/plan/restore.go b/internal/controller/plan/restore.go
@@ -794,7 +794,7 @@ func (p *RestoreManager) cleanupClusterAnnotations() error {
 func (p *RestoreManager) buildRestoreJobName(jobName string) string {
 	l := len(jobName)
 	if l > 63 {
-		return fmt.Sprintf("%s-%s", jobName[:58], jobName[l-5:l])
+		return fmt.Sprintf("%s-%s", jobName[:57], jobName[l-5:l])
 	}
 	return jobName
 }