bugfix: clean up orphaned thinruntime resources

charts/thin/templates/config/runtime.yaml

@@ -7,6 +7,15 @@ metadata:
     chart: {{ template "thin.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+  ownerReferences:
+  {{- if .Values.owner.enabled }}
+    - apiVersion: {{ .Values.owner.apiVersion }}
+      blockOwnerDeletion: {{ .Values.owner.blockOwnerDeletion }}
+      controller: {{ .Values.owner.controller }}
+      kind: {{ .Values.owner.kind }}
+      name: {{ .Values.owner.name }}
+      uid: {{ .Values.owner.uid }}
+  {{- end }}
 data:
   runtime.json: |
     {{ .Values.runtimeValue }}

charts/thin/templates/fuseconfig/fuseconfig.yaml

@@ -9,6 +9,15 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: thin-fuse
+  ownerReferences:
+  {{- if .Values.owner.enabled }}
+    - apiVersion: {{ .Values.owner.apiVersion }}
+      blockOwnerDeletion: {{ .Values.owner.blockOwnerDeletion }}
+      controller: {{ .Values.owner.controller }}
+      kind: {{ .Values.owner.kind }}
+      name: {{ .Values.owner.name }}
+      uid: {{ .Values.owner.uid }}
+  {{- end }}
 data:
   config.json: |
     {{ .Values.fuse.configValue }}
@@ -23,6 +32,15 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: thin-fuse
+  ownerReferences:
+  {{- if .Values.owner.enabled }}
+    - apiVersion: {{ .Values.owner.apiVersion }}
+      blockOwnerDeletion: {{ .Values.owner.blockOwnerDeletion }}
+      controller: {{ .Values.owner.controller }}
+      kind: {{ .Values.owner.kind }}
+      name: {{ .Values.owner.name }}
+      uid: {{ .Values.owner.uid }}
+  {{- end }}
 type: Opaque
 stringData:
   config.json: |

pkg/ddc/thin/shutdown.go

@@ -69,7 +69,16 @@ func (t *ThinEngine) destroyMaster() (err error) {
 		if err != nil {
 			return
 		}
+	} else {
+		// When upgrade Fluid to v1.0.0+ from a lower version, there may be some orphaned configmaps when deleting a ThinRuntime if it's created before the upgradation.
+		// Detect such orphaned configmaps and clean them up.
+		err = t.cleanUpOrphanedResources()
+		if err != nil {
+			t.Log.Info("WARNING: failed to delete orphaned resource, some resources may not be cleaned up in the cluster", "err", err)
+			err = nil
+		}
 	}
+
 	return
 }
 
@@ -251,3 +260,20 @@ func (t *ThinEngine) cleanAll() (err error) {
 
 	return nil
 }
+
+func (t *ThinEngine) cleanUpOrphanedResources() (err error) {
+	orphanedConfigMapName := fmt.Sprintf("%s-runtimeset", t.name)
+	cm, err := kubeclient.GetConfigmapByName(t.Client, orphanedConfigMapName, t.namespace)
+	if err != nil {
+		return err
+	}
+
+	if cm != nil {
+		if err = kubeclient.DeleteConfigMap(t.Client, orphanedConfigMapName, t.namespace); err != nil && utils.IgnoreNotFound(err) != nil {
+			return err
+		}
+		t.Log.Info("Found orphaned configmap, successfully deleted it", "configmap", orphanedConfigMapName)
+	}
+
+	return nil
+}

pkg/ddc/thin/shutdown_test.go

@@ -233,10 +233,19 @@ func TestThinEngine_destroyMaster(t *testing.T) {
 		}
 	}
 
+	orphanedCm := &corev1.ConfigMap{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: "fluid",
+			Name:      "test-runtimeset",
+		},
+	}
+	client := fake.NewFakeClientWithScheme(testScheme, orphanedCm)
+
 	engine := ThinEngine{
 		name:      "test",
 		namespace: "fluid",
 		Log:       fake.NullLogger(),
+		Client:    client,
 		runtime: &datav1alpha1.ThinRuntime{
 			Spec: datav1alpha1.ThinRuntimeSpec{
 				Fuse: datav1alpha1.ThinFuseSpec{},
@@ -270,6 +279,12 @@ func TestThinEngine_destroyMaster(t *testing.T) {
 		t.Errorf("fail to exec check helm release: %v", err)
 	}
 
+	if cm, err := kubeclient.GetConfigmapByName(engine.Client, orphanedCm.Name, orphanedCm.Namespace); err != nil {
+		t.Errorf("fail to delete orphaned resources: %v", err)
+	} else if cm != nil {
+		t.Errorf("orphaned configmap should be cleaned up")
+	}
+
 	// check release error
 	err = gohook.Hook(helm.CheckRelease, mockExecCheckReleaseErr, nil)
 	if err != nil {