Retained bug fixes after the httproutes reverting

Signed-off-by: Sheng Lin <shelin@nvidia.com>

Author: shengnuo

config/rbac/role.yaml

@@ -134,8 +134,10 @@ rules:
   - watch
 - apiGroups:
   - batch
+  - batch.volcano.sh
   resources:
   - jobs
+  - jobs/status
   verbs:
   - create
   - delete
@@ -144,15 +146,6 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - batch.volcano.sh
-  resources:
-  - jobs
-  - jobs/status
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - config.openshift.io
   resources:

internal/controller/nemocustomizer_controller.go

@@ -93,7 +93,7 @@ func NewNemoCustomizerReconciler(client client.Client, scheme *runtime.Scheme, u
 // +kubebuilder:rbac:groups=run.ai,resources=trainingworkloads;runaijobs,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups="",resources=events,verbs=get;list;watch;create
 // +kubebuilder:rbac:groups=nvidia.com,resources=nemotrainingjobs;nemotrainingjobs/status;nemoentityhandlers,verbs=create;get;list;watch;update;delete;patch
-// +kubebuilder:rbac:groups=batch.volcano.sh,resources=jobs;jobs/status,verbs=get;list;watch
+// +kubebuilder:rbac:groups=batch.volcano.sh,resources=jobs;jobs/status,verbs=get;list;watch;create;update;delete;patch
 // +kubebuilder:rbac:groups=nodeinfo.volcano.sh,resources=numatopologies,verbs=get;list;watch
 // +kubebuilder:rbac:groups=scheduling.incubator.k8s.io;scheduling.volcano.sh,resources=queues;queues/status;podgroups,verbs=get;list;watch
 // +kubebuilder:rbac:groups=config.openshift.io,resources=clusterversions;proxies,verbs=get;list;watch
@@ -105,7 +105,7 @@ func NewNemoCustomizerReconciler(client client.Client, scheme *runtime.Scheme, u
 // +kubebuilder:rbac:groups=apps,resources=deployments;statefulsets,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors;prometheusrules,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=scheduling.k8s.io,resources=priorityclasses,verbs=get;list;watch;create
-// +kubebuilder:rbac:groups=batch,resources=jobs,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=batch,resources=jobs;jobs/status,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=route.openshift.io,resources=routes,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=networking.k8s.io,resources=ingresses,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=autoscaling,resources=horizontalpodautoscalars,verbs=get;list;watch;create;update;patch;delete

internal/controller/nimservice_controller.go

@@ -301,7 +301,8 @@ func (r *NIMServiceReconciler) SetupWithManager(mgr ctrl.Manager) error {
 			&resourcev1beta2.ResourceClaim{},
 			handler.EnqueueRequestsFromMapFunc(r.mapResourceClaimToNIMService),
 			builder.WithPredicates(predicate.ResourceVersionChangedPredicate{}),
-		)
+		).
+			Owns(&resourcev1beta2.ResourceClaim{})
 	}
 
 	lwsCRDExists, err := k8sutil.CRDExists(r.discoveryClient, lwsv1.SchemeGroupVersion.WithResource("leaderworkersets"))
@@ -312,6 +313,14 @@ func (r *NIMServiceReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		nimServiceBuilder = nimServiceBuilder.Owns(&lwsv1.LeaderWorkerSet{})
 	}
 
+	resourceClaimTemplateCRDExists, err := k8sutil.CRDExists(r.discoveryClient, resourcev1beta2.SchemeGroupVersion.WithResource("resourceclaimtemplates"))
+	if err != nil {
+		return err
+	}
+	if resourceClaimTemplateCRDExists {
+		nimServiceBuilder = nimServiceBuilder.Owns(&resourcev1beta2.ResourceClaimTemplate{})
+	}
+
 	isvcCRDExists, err := k8sutil.CRDExists(r.discoveryClient, kservev1beta1.SchemeGroupVersion.WithResource("inferenceservices"))
 	if err != nil {
 		return err