Merge pull request #35 from ganganxiaojiu/main

delete pvc include olap

cmd/constants.go

@@ -47,8 +47,11 @@ const (
 	DefaultSparkUIName       = "spark-ui"
 )
 const (
-	FeaturesOlapKey      = "olap"
-	DefaultDorisPortName = "query-port"
+	FeaturesOlapKey          = "olap"
+	DefaultDorisPortName     = "query-port"
+	DefaultOlapPVCLabelKey   = "app.doris.ownerreference/name"
+	DefaultDorisBENameSuffix = "-doris-be"
+	DefaultDorisFENameSuffix = "-doris-fe"
 )
 
 var (

cmd/delete.go

@@ -76,6 +76,10 @@ func constructPVCLabel(name string) string {
 	return DefaultPVCLabelKey + "=" + name
 }
 
+func constructOlabPVCLabel(name string) string {
+	return DefaultOlapPVCLabelKey + "=" + name + DefaultDorisBENameSuffix
+}
+
 func deleteNineInfraPVC(name string, namespace string) error {
 	if name == "" || namespace == "" {
 		return nil
@@ -93,6 +97,29 @@ func deleteNineInfraPVC(name string, namespace string) error {
 	return nil
 }
 
+func deleteOlapPVC(name string, namespace string) error {
+	if name == "" || namespace == "" {
+		return nil
+	}
+	path, _ := rootCmd.Flags().GetString(kubeconfig)
+	c, err := GetKubeClient(path)
+	if err != nil {
+		return err
+	}
+
+	olapPvcLabel := DefaultOlapPVCLabelKey + "=" + name + DefaultDorisBENameSuffix
+	err = c.CoreV1().PersistentVolumeClaims(namespace).DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{LabelSelector: olapPvcLabel})
+	if err != nil {
+		return err
+	}
+	olapPvcLabel = DefaultOlapPVCLabelKey + "=" + name + DefaultDorisFENameSuffix
+	err = c.CoreV1().PersistentVolumeClaims(namespace).DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{LabelSelector: olapPvcLabel})
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func (d *deleteCmd) run(args []string) error {
 	path, _ := rootCmd.Flags().GetString(kubeconfig)
 	nc, err := GetNineInfraClient(path)
@@ -112,6 +139,10 @@ func (d *deleteCmd) run(args []string) error {
 			if err != nil {
 				return err
 			}
+			err = deleteOlapPVC(d.deleteOpts.Name+DefaultNineSuffix, d.deleteOpts.NS)
+			if err != nil {
+				return err
+			}
 		} else {
 			fmt.Println("All PVCs used by Nine will not be deleted")
 		}