fix(patch): fixed assignment for nil annotation (#728)

oceanbase · Jan 14, 2025 · 9acaff2 · 9acaff2
1 parent e2148bf
commit 9acaff2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/internal/dashboard/business/oceanbase/obcluster.go b/internal/dashboard/business/oceanbase/obcluster.go
@@ -852,6 +852,9 @@ func PatchOBCluster(ctx context.Context, nn *param.K8sObjectIdentity, param *par
 
 	if param.AddDeletionProtection && !alreadyIgnoredDeletion {
 		// Update deletion protection if specified
+		if obcluster.Annotations == nil {
+			obcluster.Annotations = make(map[string]string)
+		}
 		obcluster.Annotations[oceanbaseconst.AnnotationsIgnoreDeletion] = "true"
 	} else if param.RemoveDeletionProtection && alreadyIgnoredDeletion {
 		delete(obcluster.Annotations, oceanbaseconst.AnnotationsIgnoreDeletion)

diff --git a/internal/dashboard/business/oceanbase/obtenant.go b/internal/dashboard/business/oceanbase/obtenant.go
@@ -639,6 +639,9 @@ func PatchTenant(ctx context.Context, nn types.NamespacedName, p *param.PatchTen
 	if alreadyIgnoreDeletion && p.RemoveDeletionProtection {
 		delete(tenant.Annotations, oceanbaseconst.AnnotationsIgnoreDeletion)
 	} else if !alreadyIgnoreDeletion && p.AddDeletionProtection {
+		if tenant.Annotations == nil {
+			tenant.Annotations = make(map[string]string)
+		}
 		tenant.Annotations[oceanbaseconst.AnnotationsIgnoreDeletion] = "true"
 	}
 	if len(p.Variables) > 0 {