fix(observer): fixed unexpected deletion of pvcs in other k8s when it has independent lifecycle (#592)

powerfooI · web-flow · commit 5597afa34cb2 · 2024-10-18T15:23:15.000+08:00
diff --git a/internal/resource/observer/utils.go b/internal/resource/observer/utils.go
@@ -663,6 +663,11 @@ func (m *OBServerManager) cleanWorkerK8sResource() error {
 		}
 	}
 
+	if val, exist := resourceutils.GetAnnotationField(m.OBServer, oceanbaseconst.AnnotationsIndependentPVCLifecycle); exist && val == "true" {
+		m.Logger.Info("Independent PVC lifecycle, skip deleting pvc")
+		return errs
+	}
+
 	// delete pvc
 	pvc := &corev1.PersistentVolumeClaim{}
 	if err := m.K8sResClient.DeleteAllOf(m.Ctx, pvc,

Original file line number	Diff line number	Diff line change
`@@ -663,6 +663,11 @@ func (m *OBServerManager) cleanWorkerK8sResource() error {`
`663`	`663`	`}`
`664`	`664`	`}`
`665`	`665`
	`666`	`+ if val, exist := resourceutils.GetAnnotationField(m.OBServer, oceanbaseconst.AnnotationsIndependentPVCLifecycle); exist && val == "true" {`
	`667`	`+ m.Logger.Info("Independent PVC lifecycle, skip deleting pvc")`
	`668`	`+ return errs`
	`669`	`+ }`
	`670`	`+`
`666`	`671`	`// delete pvc`
`667`	`672`	`pvc := &corev1.PersistentVolumeClaim{}`
`668`	`673`	`if err := m.K8sResClient.DeleteAllOf(m.Ctx, pvc,`