fix: compute domain template name

Author: enoodle

internal/compute-domain-controller/computedomain_controller.go

@@ -116,7 +116,7 @@ func (r *ComputeDomainReconciler) handleDeletion(ctx context.Context, domain *co
 }
 
 func (r *ComputeDomainReconciler) ensureResourceClaimTemplates(ctx context.Context, domain *computedomainv1beta1.ComputeDomain) error {
-	return r.ensureTemplate(ctx, domain, domain.Name, consts.ComputeDomainWorkloadDeviceClass, "workload")
+	return r.ensureTemplate(ctx, domain, templateName(domain), consts.ComputeDomainWorkloadDeviceClass, "workload")
 }
 
 func (r *ComputeDomainReconciler) getAllocationMode(domain *computedomainv1beta1.ComputeDomain) string {
@@ -204,7 +204,7 @@ func (r *ComputeDomainReconciler) ensureTemplate(
 
 func (r *ComputeDomainReconciler) deleteResourceClaimTemplates(ctx context.Context, domain *computedomainv1beta1.ComputeDomain) error {
 	template := &resourceapi.ResourceClaimTemplate{}
-	key := client.ObjectKey{Namespace: domain.Namespace, Name: domain.Name}
+	key := client.ObjectKey{Namespace: domain.Namespace, Name: templateName(domain)}
 	if err := r.Get(ctx, key, template); err != nil {
 		if apierrors.IsNotFound(err) {
 			return nil
@@ -322,3 +322,11 @@ func (r *ComputeDomainReconciler) statusEqual(current computedomainv1beta1.Compu
 	}
 	return true
 }
+
+func templateName(domain *computedomainv1beta1.ComputeDomain) string {
+	templateName := domain.Name
+	if domain.Spec.Channel != nil {
+		templateName = domain.Spec.Channel.ResourceClaimTemplate.Name
+	}
+	return templateName
+}

internal/compute-domain-controller/computedomain_controller_test.go

@@ -56,6 +56,13 @@ func TestComputeDomainReconciler_Reconcile(t *testing.T) {
 					Namespace: "default",
 					UID:       "test-uid",
 				},
+				Spec: computedomainv1beta1.ComputeDomainSpec{
+					Channel: &computedomainv1beta1.ComputeDomainChannelSpec{
+						ResourceClaimTemplate: computedomainv1beta1.ComputeDomainResourceClaimTemplate{
+							Name: "test-template-name",
+						},
+					},
+				},
 			},
 			expectedWorkloadTemplate: true,
 			expectedFinalizer:        true,
@@ -69,11 +76,18 @@ func TestComputeDomainReconciler_Reconcile(t *testing.T) {
 					DeletionTimestamp: &metav1.Time{Time: time.Now()},
 					Finalizers:        []string{consts.ComputeDomainFinalizer},
 				},
+				Spec: computedomainv1beta1.ComputeDomainSpec{
+					Channel: &computedomainv1beta1.ComputeDomainChannelSpec{
+						ResourceClaimTemplate: computedomainv1beta1.ComputeDomainResourceClaimTemplate{
+							Name: "test-template-name",
+						},
+					},
+				},
 			},
 			existingObjects: []client.Object{
 				&resourceapi.ResourceClaimTemplate{
 					ObjectMeta: metav1.ObjectMeta{
-						Name:      "test-domain",
+						Name:      "test-template-name",
 						Namespace: "default",
 						Labels: map[string]string{
 							consts.ComputeDomainTemplateLabel: "test-domain",
@@ -128,7 +142,7 @@ func TestComputeDomainReconciler_Reconcile(t *testing.T) {
 
 			workloadTemplate := &resourceapi.ResourceClaimTemplate{}
 			err = fakeClient.Get(context.Background(), types.NamespacedName{
-				Name:      "test-domain",
+				Name:      test.computeDomain.Spec.Channel.ResourceClaimTemplate.Name,
 				Namespace: "default",
 			}, workloadTemplate)
 			// Check ResourceClaimTemplates

test/integration/compute_domain_test.go

@@ -42,6 +42,7 @@ var _ = Describe("Compute Domain Controller Integration Tests", func() {
 			manifestPath := "manifests/compute-domain-basic.yaml"
 			namespace := "compute-domain-test-compute-domain-basic"
 			computeDomainName := "test-domain"
+			templateName := "test-domain-template"
 
 			setupTest(manifestPath, namespace, &testNamespaces)
 
@@ -55,13 +56,13 @@ var _ = Describe("Compute Domain Controller Integration Tests", func() {
 			// Wait for ResourceClaimTemplate to be created by the controller
 			Eventually(func() error {
 				_, err := kubeClient.ResourceV1().ResourceClaimTemplates(namespace).Get(
-					context.Background(), computeDomainName, metav1.GetOptions{})
+					context.Background(), templateName, metav1.GetOptions{})
 				return err
 			}).WithTimeout(30 * time.Second).Should(Succeed())
 
 			// Verify ResourceClaimTemplate details
 			rct, err := kubeClient.ResourceV1().ResourceClaimTemplates(namespace).Get(
-				context.Background(), computeDomainName, metav1.GetOptions{})
+				context.Background(), templateName, metav1.GetOptions{})
 			Expect(err).NotTo(HaveOccurred())
 
 			// Check that it has the correct labels

test/integration/manifests/compute-domain-basic.yaml

@@ -15,4 +15,4 @@ spec:
   channel:
     allocationMode: Single
     resourceClaimTemplate:
-      name: test-domain
+      name: test-domain-template