Support hostPID and autoscaling

config/rbac/role.yaml

@@ -8,10 +8,9 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - endpoints
+  - namespaces
   verbs:
-  - list
-  - watch
+  - get
 - apiGroups:
   - ""
   resources:
@@ -44,28 +43,14 @@ rules:
   resources:
   - persistentvolumes
   verbs:
-  - list
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - delete
   - get
 - apiGroups:
   - ""
   resources:
-  - services
+  - pods
   verbs:
-  - create
   - delete
-  - update
-- apiGroups:
-  - ""
-  resources:
-  - services/finalizers
-  verbs:
-  - update
+  - list
 - apiGroups:
   - apps
   resources:
@@ -128,6 +113,7 @@ rules:
   resources:
   - storageclasses
   verbs:
+  - create
   - get
   - update
 - apiGroups:

controllers/diskconfig_controller.go

@@ -127,24 +127,24 @@ func (r *DiskConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 }
 
 func (r *DiskConfigReconciler) reconcileDelete(ctx context.Context, configName, configNamespace string, logger logr.Logger) (ctrl.Result, error) {
+	nsFinalizer := utils.RenderFinalizer(configName, configNamespace)
+
 	logger.Info("Fetch StrorageClasses...")
 
 	scList := storagev1.StorageClassList{}
 	if err := r.Client.List(ctx, &scList); err != nil {
 		return ctrl.Result{}, fmt.Errorf("unable to list StorageClasses: %w", err)
 	}
 
-	scFinalizer := utils.RenderFinalizer(configName, configNamespace)
-
 	for i := range scList.Items {
-		if scList.Items[i].DeletionTimestamp != nil || !controllerutil.ContainsFinalizer(&scList.Items[i], scFinalizer) {
+		if !controllerutil.ContainsFinalizer(&scList.Items[i], nsFinalizer) {
 			continue
 		}
 
-		controllerutil.RemoveFinalizer(&scList.Items[i], scFinalizer)
+		controllerutil.RemoveFinalizer(&scList.Items[i], nsFinalizer)
 
 		logger := logger.WithValues("sc_name", scList.Items[i].Name)
-		logger.Info("Remove StorageClass finalizer...", "finalizer", scFinalizer)
+		logger.Info("Remove StorageClass finalizer...", "finalizer", nsFinalizer)
 
 		if err := r.Client.Update(ctx, &scList.Items[i]); err != nil {
 			logger.Info("Failed to remove finalizer of StorageClass", "error", err.Error())
@@ -170,7 +170,7 @@ func (r *DiskConfigReconciler) reconcileDelete(ctx context.Context, configName,
 	pvcSelector := labels.NewSelector().Add(*label)
 
 	pvcList := corev1.PersistentVolumeClaimList{}
-	if err = r.List(ctx, &pvcList, &client.ListOptions{
+	if err = r.Client.List(ctx, &pvcList, &client.ListOptions{
 		Namespace:     configNamespace,
 		LabelSelector: pvcSelector,
 	}); err != nil {
@@ -190,7 +190,7 @@ func (r *DiskConfigReconciler) reconcileDelete(ctx context.Context, configName,
 		go func() {
 			defer wg.Done()
 
-			unlock, err := utils.WaitForSemaphore(ctx, sem, errChan)
+			unlock, err := utils.WaitForSemaphore(ctx, sem)
 			if err != nil {
 				logger.Info("Context deadline")
 				errChan <- fmt.Errorf("context deadline %s->%s", pvcList.Items[i].GetNamespace(), pvcList.Items[i].GetName())
@@ -203,7 +203,7 @@ func (r *DiskConfigReconciler) reconcileDelete(ctx context.Context, configName,
 				logger := logger.WithValues("pvc_name", pvcList.Items[i].Name, "pvc_namespace", pvcList.Items[i].Namespace)
 				logger.Info("Update PVC finalizer...", "finalizer", finalizer)
 
-				if err = r.Update(ctx, &pvcList.Items[i]); err != nil {
+				if err = r.Client.Update(ctx, &pvcList.Items[i]); err != nil {
 					logger.Info("Failed to remove finalizer of PVC", "error", err.Error())
 					errChan <- fmt.Errorf("unable to remove finalizer of PVC %s->%s: %w", pvcList.Items[i].Namespace, pvcList.Items[i].Name, err)
 					return
@@ -249,7 +249,6 @@ func (r *DiskConfigReconciler) reconcileUpdate(ctx context.Context, config *disc
 	logger = logger.WithValues("sc_name", config.Spec.StorageClassName)
 
 	scFinalizer := utils.RenderFinalizer(config.Name, config.Namespace)
-
 	if !controllerutil.ContainsFinalizer(&sc, scFinalizer) {
 		controllerutil.AddFinalizer(&sc, scFinalizer)
 

controllers/job_controller.go

@@ -74,12 +74,17 @@ func (r *JobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 
 	logger.Info("Delete Job...")
 
-	return ctrl.Result{}, r.Client.Delete(ctx, &batchv1.Job{
+	err = r.Client.Delete(ctx, &batchv1.Job{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      req.Name,
 			Namespace: req.Namespace,
 		},
 	})
+	if !apierrors.IsNotFound(err) {
+		return ctrl.Result{}, err
+	}
+
+	return ctrl.Result{}, nil
 }
 
 // SetupWithManager sets up the controller with the Manager.