cr fixes

Author: enoodle

deploy/fake-gpu-operator/templates/compute-domain-controller/clusterrole.yaml

@@ -4,7 +4,6 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: compute-domain-controller-role
-  namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups: ["resource.k8s.io"]
   resources: ["resourceclaims"]

internal/compute-domain-controller/app.go

@@ -11,6 +11,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	computedomainv1beta1 "github.com/NVIDIA/k8s-dra-driver-gpu/api/nvidia.com/resource/v1beta1"
 	"github.com/run-ai/fake-gpu-operator/internal/common/app"
@@ -85,7 +86,10 @@ func (app *ComputeDomainApp) runController(ctx context.Context) error {
 	cfg := ctrl.GetConfigOrDie()
 
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
-		Scheme:                 scheme,
+		Scheme: scheme,
+		Metrics: metricsserver.Options{
+			BindAddress: app.config.MetricsBindAddress,
+		},
 		HealthProbeBindAddress: app.config.HealthProbeAddress,
 		LeaderElection:         app.config.LeaderElection,
 		LeaderElectionID:       "fake-compute-domain-controller",
@@ -114,4 +118,4 @@ func (app *ComputeDomainApp) runController(ctx context.Context) error {
 }
 
 // Verify that ComputeDomainApp implements the App interface
-var _ app.App = &ComputeDomainApp{}
+var _ app.App = &ComputeDomainApp{}

internal/compute-domain-controller/computedomain_controller.go

@@ -68,20 +68,20 @@ func (r *ComputeDomainReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
-	if domain.DeletionTimestamp.IsZero() {
-		if err := r.ensureFinalizer(ctx, domain); err != nil {
-			return ctrl.Result{}, err
-		}
-		if err := r.ensureResourceClaimTemplates(ctx, domain); err != nil {
-			return ctrl.Result{}, err
-		}
-	} else {
+	if !domain.DeletionTimestamp.IsZero() {
 		if err := r.handleDeletion(ctx, domain); err != nil {
 			return ctrl.Result{}, err
 		}
 		return ctrl.Result{}, nil
 	}
 
+	if err := r.ensureFinalizer(ctx, domain); err != nil {
+		return ctrl.Result{}, err
+	}
+	if err := r.ensureResourceClaimTemplates(ctx, domain); err != nil {
+		return ctrl.Result{}, err
+	}
+
 	logger.V(4).Info("reconciled ComputeDomain", "namespace", domain.Namespace, "name", domain.Name)
 	return ctrl.Result{}, nil
 }