add pvc template name label

KusionStack · Jan 13, 2025 · 7233fbd · 7233fbd
1 parent 2fa4811
commit 7233fbd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/go.mod b/go.mod
@@ -22,7 +22,7 @@ require (
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/kubernetes v0.0.0-00010101000000-000000000000
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
-	kusionstack.io/kube-api v0.6.5
+	kusionstack.io/kube-api v0.6.6-0.20250113090319-42d8f98d4368
 	kusionstack.io/resourceconsist v0.0.1
 	sigs.k8s.io/controller-runtime v0.15.1
 )

diff --git a/go.sum b/go.sum
@@ -1139,8 +1139,12 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
 k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+kusionstack.io/kube-api v0.6.4-0.20250113084940-4ce418a7f717 h1:CgD4Ma8OaO3/i8+auLAW8rnr5gu4x5xzRLpyNy0WcvQ=
+kusionstack.io/kube-api v0.6.4-0.20250113084940-4ce418a7f717/go.mod h1:J0+EHiroG/88X904Y9TV9iMRcoEuD5tXMTLMBDSwM+Y=
 kusionstack.io/kube-api v0.6.5 h1:aVF6YsejHd1ujpI5oW6rdu2bhsYzX0PM5OnoHvAtIzs=
 kusionstack.io/kube-api v0.6.5/go.mod h1:J0+EHiroG/88X904Y9TV9iMRcoEuD5tXMTLMBDSwM+Y=
+kusionstack.io/kube-api v0.6.6-0.20250113090319-42d8f98d4368 h1:REFRZShqoWNiiZno+PRmMM//+V4usM+JcqkqSW5g6Zk=
+kusionstack.io/kube-api v0.6.6-0.20250113090319-42d8f98d4368/go.mod h1:J0+EHiroG/88X904Y9TV9iMRcoEuD5tXMTLMBDSwM+Y=
 kusionstack.io/resourceconsist v0.0.1 h1:+k/jriq5Ld7fQUYfWSMGynz/FesHtl3Rk2fmQPjBe0g=
 kusionstack.io/resourceconsist v0.0.1/go.mod h1:816xS/fY6EOUbPFjXIWW/TGs8/YE46qP4ElKeIiwFdU=
 modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=

diff --git a/pkg/controllers/collaset/utils/pvc.go b/pkg/controllers/collaset/utils/pvc.go
@@ -25,7 +25,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/rand"
-
 	appsv1alpha1 "kusionstack.io/kube-api/apps/v1alpha1"
 )
 
@@ -51,10 +50,14 @@ func BuildPvcWithHash(cls *appsv1alpha1.CollaSet, pvcTmp *corev1.PersistentVolum
 	}
 	claim.Labels[appsv1alpha1.PvcTemplateHashLabelKey] = hash
 	claim.Labels[appsv1alpha1.PodInstanceIDLabelKey] = id
+	claim.Labels[appsv1alpha1.PvcTemplateLabelKey] = pvcTmp.Name
 	return claim, nil
 }
 
 func ExtractPvcTmpName(cls *appsv1alpha1.CollaSet, pvc *corev1.PersistentVolumeClaim) (string, error) {
+	if pvcTmpName, exist := pvc.Labels[appsv1alpha1.PvcTemplateLabelKey]; exist {
+		return pvcTmpName, nil
+	}
 	lastDashIndex := strings.LastIndex(pvc.Name, "-")
 	if lastDashIndex == -1 {
 		return "", fmt.Errorf("pvc %s has no postfix", pvc.Name)