Merge pull request #69 from simonferquel/handle-delete-foreground

Handle Deletes with propagation policy = foreground
docker · Jan 29, 2019 · 33d3550 · 33d3550
2 parents 356b291 + cb0fdc2
commit 33d3550
Show file tree

Hide file tree

Showing 6 changed files with 176 additions and 81 deletions.
diff --git a/api/client/informers/compose/v1alpha3/stack.go b/api/client/informers/compose/v1alpha3/stack.go
@@ -49,3 +49,26 @@ func (f *stackInformer) Informer() cache.SharedIndexInformer {
 func (f *stackInformer) Lister() v1alpha3.StackLister {
 	return v1alpha3.NewStackLister(f.Informer().GetIndexer())
 }
+
+// NewFilteredStackInformer creates a stack informer with specific list options
+func NewFilteredStackInformer(client clientset.Interface, resyncPeriod time.Duration, tweakListOptions func(*v1.ListOptions)) cache.SharedIndexInformer {
+	return cache.NewSharedIndexInformer(
+		&cache.ListWatch{
+			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
+				if tweakListOptions != nil {
+					tweakListOptions(&options)
+				}
+				return client.ComposeV1alpha3().Stacks(v1.NamespaceAll).List(options)
+			},
+			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
+				if tweakListOptions != nil {
+					tweakListOptions(&options)
+				}
+				return client.ComposeV1alpha3().Stacks(v1.NamespaceAll).Watch(options)
+			},
+		},
+		&compose_v1alpha3.Stack{},
+		resyncPeriod,
+		cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc},
+	)
+}
diff --git a/e2e/compose_test.go b/e2e/compose_test.go
@@ -1063,6 +1063,17 @@ configs:
 		expectNoError(err)
 		waitUntil(ns.IsStackAvailable(s.Name))
 	})
+	It("Should delete stacks with propagation=Foreground", func() {
+		_, err := ns.CreateStack(cluster.StackOperationV1alpha3, "app", `version: '3.2'
+services:
+  front:
+    image: nginx:1.12.1-alpine`)
+		Expect(err).NotTo(HaveOccurred())
+		waitUntil(ns.IsStackAvailable("app"))
+		err = ns.DeleteStackWithPropagation("app", metav1.DeletePropagationForeground)
+		Expect(err).NotTo(HaveOccurred())
+		waitUntil(ns.ContainsZeroStack())
+	})
 
 })
 

diff --git a/internal/controller/stacklistener.go b/internal/controller/stacklistener.go
@@ -4,10 +4,11 @@ import (
 	"time"
 
 	"github.com/docker/compose-on-kubernetes/api/client/clientset"
-	"github.com/docker/compose-on-kubernetes/api/client/informers"
+	"github.com/docker/compose-on-kubernetes/api/client/informers/compose/v1alpha3"
 	"github.com/docker/compose-on-kubernetes/api/compose/latest"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/cache"
 )
 
@@ -87,8 +88,9 @@ func NewStackListener(clientSet clientset.Interface,
 	reconcileQueue chan<- string,
 	reconcileDeletionQueue chan<- *latest.Stack,
 	ownerCache StackOwnerCacher) *StackListener {
-	informersFactory := informers.NewSharedInformerFactory(clientSet, reconciliationInterval)
-	stacksInformer := informersFactory.Compose().V1alpha3().Stacks().Informer()
+	stacksInformer := v1alpha3.NewFilteredStackInformer(clientSet, reconciliationInterval, func(o *metav1.ListOptions) {
+		o.IncludeUninitialized = true
+	})
 	result := &StackListener{
 		stacks:                 stacksInformer,
 		reconcileQueue:         reconcileQueue,

diff --git a/internal/controller/stackreconciler.go b/internal/controller/stackreconciler.go
@@ -89,6 +89,11 @@ func (r *StackReconciler) reconcileStack(key string) {
 		log.Errorf("Cannot reconcile stack %s: %s", key, err)
 		return
 	}
+	if stack.DeletionTimestamp != nil {
+		// pending deletion
+		r.deleteStackChildren(stack)
+		return
+	}
 	updater, err := r.resourceUpdater.getUpdater(stack, convert.IsStackDirty(stack))
 	if err != nil {
 		log.Errorf("Updater resolution failed: %s", err)