feat(e2e): Add test for legacy Resource Quota removal during HRQ creation

Author: ryotarai

test/e2e/pfn_hrq_test.go

@@ -12,6 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	api "sigs.k8s.io/hierarchical-namespaces/api/v1alpha2"
+	"sigs.k8s.io/hierarchical-namespaces/internal/hrq/utils"
 	"sigs.k8s.io/yaml"
 
 	"github.com/google/uuid"
@@ -114,6 +115,24 @@ var _ = Describe("Scoped Hierarchical Resource Quota", Label("pfnet"), func() {
 
 		FieldShouldContain("hrq", parentNs, hrq.Name, ".status.used", "pods:1")
 	})
+
+	It("should remove the legacy RQ", func() {
+		hrqName := "legacy-hrq"
+
+		// Legacy RQ remains before the new RQ is created
+		legacyRQ := mustCreateLegacyRQ(parentNs, hrqName, corev1.ResourceList{corev1.ResourcePods: resource.MustParse("1")})
+		RunShouldContain(legacyRQ.Name, propagationTime, "kubectl get resourcequota -n", parentNs)
+
+		// Create the HRQ
+		setScopedHRQ(hrqName, parentNs, corev1.ResourceList{corev1.ResourcePods: resource.MustParse("1")}, &scopeSelector)
+
+		// Confirm the new RQ is created
+		newRQName := api.ResourceQuotaSingletonName + "-" + parentNs + "-" + hrqName + "-" + md5Hash(parentNs+"/"+hrqName)
+		RunShouldContain(newRQName, propagationTime, "kubectl get resourcequota -n", parentNs, newRQName)
+
+		// Legacy RQ is removed
+		RunShouldNotContain(legacyRQ.Name, propagationTime, "kubectl get resourcequota -n", parentNs)
+	})
 })
 
 func mustCreatePod(prefix, nsnm string) (corev1.Pod, error) {
@@ -217,6 +236,32 @@ func createSubNS(parent, prefix string) string {
 	return nsName
 }
 
+func mustCreateLegacyRQ(ns, hrqName string, resourceList corev1.ResourceList) corev1.ResourceQuota {
+	hrq := corev1.ResourceQuota{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "ResourceQuota",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      utils.LegacyScopedRQName(hrqName),
+			Namespace: ns,
+			Labels: map[string]string{
+				api.HRQLabelCleanup: "true",
+			},
+		},
+		Spec: corev1.ResourceQuotaSpec{
+			Hard: resourceList,
+		},
+	}
+	manifest, err := yaml.Marshal(hrq)
+	Expect(err).NotTo(HaveOccurred())
+
+	MustApplyYAML(string(manifest))
+	RunShouldContain(hrq.Name, propagationTime, "kubectl get resourcequota -n", ns, hrq.Name)
+
+	return hrq
+}
+
 func genPriorityScopeSelector() (corev1.ScopeSelector, string, func()) {
 	priority := uuid.New().String()
 	err := TryRun("kubectl create priorityclass", priority, "--value=100")