Prevent blocking namespace deletion by ignoring chart removals in terminating namespaces

Author: tralafiti

pkg/controllers/chart/chart.go

@@ -90,6 +90,7 @@ type Controller struct {
 	jobs            batchcontroller.JobController
 	jobCache        batchcontroller.JobCache
 	secretCache     corecontroller.SecretCache
+	namespaceCache  corecontroller.NamespaceCache
 	apply           apply.Apply
 	recorder        record.EventRecorder
 	apiServerPort   string
@@ -114,7 +115,8 @@ func Register(
 	sas corecontroller.ServiceAccountController,
 	cm corecontroller.ConfigMapController,
 	s corecontroller.SecretController,
-	sCache corecontroller.SecretCache) {
+	sCache corecontroller.SecretCache,
+	nsCache corecontroller.NamespaceCache) {
 
 	c := &Controller{
 		systemNamespace: systemNamespace,
@@ -127,6 +129,7 @@ func Register(
 		jobs:            jobs,
 		jobCache:        jobCache,
 		secretCache:     sCache,
+		namespaceCache:  nsCache,
 		recorder:        recorder,
 		apiServerPort:   apiServerPort,
 	}
@@ -335,6 +338,14 @@ func (c *Controller) OnRemove(key string, chart *v1.HelmChart) (*v1.HelmChart, e
 		return nil, nil
 	}
 
+	// if the target namespace is terminating, we are not allowed to spawn jobs
+	// skip to not block indefinitely. namespace deletion will remove the chart
+	if ns, err := c.namespaceCache.Get(chart.Namespace); err != nil {
+		return nil, fmt.Errorf("could not perform uninstall: namespace %s not found", chart.Namespace)
+	} else if ns.Status.Phase == corev1.NamespaceTerminating {
+		return nil, nil
+	}
+
 	expectedJob, objs, err := c.getJobAndRelatedResources(chart)
 	if err != nil {
 		return nil, err

pkg/controllers/controllers.go

@@ -97,6 +97,7 @@ func Register(ctx context.Context, systemNamespace, controllerName string, cfg c
 		appCtx.Core.ConfigMap(),
 		appCtx.Core.Secret(),
 		appCtx.Core.Secret().Cache(),
+		appCtx.Core.Namespace().Cache(),
 	)
 
 	klog.Infof("Starting helm controller with %d threads", opts.Threadiness)