delete ra deployment when sink is not found

kafka/source/pkg/reconciler/source/kafkasource.go

@@ -29,6 +29,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"knative.dev/eventing/pkg/reconciler/source"
+	"knative.dev/eventing/pkg/utils"
 	"knative.dev/pkg/apis"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 
@@ -112,6 +113,10 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, src *v1beta1.KafkaSource
 	sinkURI, err := r.sinkResolver.URIFromDestinationV1(*dest, src)
 	if err != nil {
 		src.Status.MarkNoSink("NotFound", "")
+		//delete adapter deployment if sink not found
+		if err := r.deleteReceiveAdapter(ctx, src); err != nil && !apierrors.IsNotFound(err) {
+			logging.FromContext(ctx).Error("Unable to delete receiver adapter when sink is missing", zap.Error(err))
+		}
 		return fmt.Errorf("getting sink URI: %v", err)
 	}
 	src.Status.MarkSink(sinkURI)
@@ -186,6 +191,13 @@ func (r *Reconciler) createReceiveAdapter(ctx context.Context, src *v1beta1.Kafk
 	return ra, nil
 }
 
+//deleteReceiveAdapter deletes the reciever adapter deployment if any
+func (r *Reconciler) deleteReceiveAdapter(ctx context.Context, src *v1beta1.KafkaSource) error {
+	name := utils.GenerateFixedName(src, fmt.Sprintf("kafkasource-%s", src.Name))
+
+	return r.KubeClientSet.AppsV1().Deployments(src.Namespace).Delete(name, &metav1.DeleteOptions{})
+}
+
 func podSpecChanged(oldPodSpec corev1.PodSpec, newPodSpec corev1.PodSpec) bool {
 	if !equality.Semantic.DeepDerivative(newPodSpec, oldPodSpec) {
 		return true

test/e2e/helpers/kafka_helper.go

@@ -24,6 +24,7 @@ import (
 	"github.com/google/uuid"
 
 	"github.com/davecgh/go-spew/spew"
+	appsv1 "k8s.io/api/apps/v1"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
@@ -33,16 +34,22 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	testlib "knative.dev/eventing/test/lib"
 	pkgtest "knative.dev/pkg/test"
+
+	sourcesv1beta1 "knative.dev/eventing-contrib/kafka/source/pkg/apis/sources/v1beta1"
+	kafkaclientset "knative.dev/eventing-contrib/kafka/source/pkg/client/clientset/versioned"
 )
 
 const (
 	strimziApiGroup      = "kafka.strimzi.io"
 	strimziApiVersion    = "v1beta1"
 	strimziTopicResource = "kafkatopics"
+	interval             = 3 * time.Second
+	timeout              = 30 * time.Second
 )
 
 var (
-	topicGVR = schema.GroupVersionResource{Group: strimziApiGroup, Version: strimziApiVersion, Resource: strimziTopicResource}
+	topicGVR        = schema.GroupVersionResource{Group: strimziApiGroup, Version: strimziApiVersion, Resource: strimziTopicResource}
+	KafkaChannelGVR = schema.GroupVersionResource{Group: "messaging.knative.dev", Version: "v1beta1", Resource: "kafkachannels"}
 )
 
 func MustPublishKafkaMessage(client *testlib.Client, bootstrapServer string, topic string, key string, headers map[string]string, value string) {
@@ -232,3 +239,48 @@ func MustCreateTopic(client *testlib.Client, clusterName string, clusterNamespac
 
 	client.Tracker.Add(topicGVR.Group, topicGVR.Version, topicGVR.Resource, clusterNamespace, topicName)
 }
+
+//CheckKafkaSourceState waits for specified kafka source resource state
+//On timeout reports error
+func CheckKafkaSourceState(c *testlib.Client, name string, inState func(ks *sourcesv1beta1.KafkaSource) (bool, error)) error {
+	kafkaSourceClientSet, err := kafkaclientset.NewForConfig(c.Config)
+	if err != nil {
+		return err
+	}
+	kSources := kafkaSourceClientSet.SourcesV1beta1().KafkaSources(c.Namespace)
+	var lastState *sourcesv1beta1.KafkaSource
+	waitErr := wait.PollImmediate(interval, timeout, func() (bool, error) {
+		var err error
+		lastState, err = kSources.Get(name, metav1.GetOptions{})
+		if err != nil {
+			return true, err
+		}
+		return inState(lastState)
+	})
+	if waitErr != nil {
+		return fmt.Errorf("kafkasource %q is not in desired state, got: %+v: %w", name, lastState, waitErr)
+	}
+	return nil
+}
+
+//CheckRADeployment waits for desired state of receiver adapter
+//On timeout reports error
+func CheckRADeployment(c *testlib.Client, name string, inState func(deps *appsv1.DeploymentList) (bool, error)) error {
+	listOptions := metav1.ListOptions{
+		LabelSelector: fmt.Sprintf("%s=%s", "eventing.knative.dev/SourceName", name),
+	}
+	kDeps := c.Kube.Kube.AppsV1().Deployments(c.Namespace)
+	var lastState *appsv1.DeploymentList
+	waitErr := wait.PollImmediate(interval, timeout, func() (bool, error) {
+		var err error
+		lastState, err = kDeps.List(listOptions)
+		if err != nil {
+			return true, err
+		}
+		return inState(lastState)
+	})
+	if waitErr != nil {
+		return fmt.Errorf("receiver adapter deployments %q is not in desired state, got: %+v: %w", name, lastState, waitErr)
+	}
+	return nil
+}

test/e2e/kafka_source_reconciler_test.go

@@ -0,0 +1,131 @@
+//+build e2e
+
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package e2e
+
+import (
+	"testing"
+
+	appsv1 "k8s.io/api/apps/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/sets"
+
+	testlib "knative.dev/eventing/test/lib"
+	"knative.dev/eventing/test/lib/resources"
+	"knative.dev/pkg/apis"
+	pkgTest "knative.dev/pkg/test"
+
+	sourcesv1beta1 "knative.dev/eventing-contrib/kafka/source/pkg/apis/sources/v1beta1"
+	"knative.dev/eventing-contrib/test"
+	"knative.dev/eventing-contrib/test/e2e/helpers"
+	contribtestlib "knative.dev/eventing-contrib/test/lib"
+	contribresources "knative.dev/eventing-contrib/test/lib/resources"
+)
+
+const (
+	rtKafkaSourceName    = "e2e-rt-kafka-source"
+	rtChannelName        = "e2e-rt-channel"
+	rtKafkaConsumerGroup = "e2e-rt-cg"
+	rtKafkaTopicName     = "e2e-rt-topic"
+)
+
+//TestKafkaSourceReconciler tests various kafka source reconciler statuses
+//RT is short for reconciler test
+func TestKafkaSourceReconciler(t *testing.T) {
+	client := testlib.Setup(t, true)
+	defer testlib.TearDown(client)
+
+	for _, test := range []struct {
+		name             string
+		action           func(c *testlib.Client)
+		expectedStatuses sets.String
+		wantRADepCount   int
+	}{{
+		"create_kafka_source",
+		createKafkaSourceWithSinkMissing,
+		sets.NewString("NotFound"),
+		0,
+	}, {
+		"create_sink",
+		createChannel,
+		sets.NewString(""),
+		1,
+	}, {
+		"delete_sink",
+		deleteChannel,
+		sets.NewString("NotFound"),
+		0,
+	}, {
+		"create_sink_after_delete",
+		createChannel,
+		sets.NewString(""),
+		1,
+	}} {
+		t.Run(test.name, func(t *testing.T) {
+			testKafkaSourceReconciler(client, test.name, test.action, test.expectedStatuses, test.wantRADepCount)
+		})
+	}
+}
+
+func testKafkaSourceReconciler(c *testlib.Client, name string, doAction func(c *testlib.Client), expectedStatuses sets.String, wantRADepCount int) {
+	doAction(c)
+
+	if err := helpers.CheckKafkaSourceState(c, rtKafkaSourceName, func(ks *sourcesv1beta1.KafkaSource) (bool, error) {
+		ready := ks.Status.GetCondition(apis.ConditionReady)
+		if ready != nil {
+			if expectedStatuses.Has(ready.Reason) {
+				return true, nil
+			}
+		}
+		return false, nil
+	}); err != nil {
+		c.T.Fatalf("Failed to validate kafkasource state, expected status : %v, err : %v", expectedStatuses.UnsortedList(), err)
+	}
+
+	if err := helpers.CheckRADeployment(c, rtKafkaSourceName, func(deps *appsv1.DeploymentList) (bool, error) {
+		if len(deps.Items) == wantRADepCount {
+			return true, nil
+		}
+		return false, nil
+	}); err != nil {
+		c.T.Fatal("Failed to validate adapter deployment state:", err)
+	}
+}
+
+func createKafkaSourceWithSinkMissing(c *testlib.Client) {
+	helpers.MustCreateTopic(c, kafkaClusterName, kafkaClusterNamespace, rtKafkaTopicName)
+
+	contribtestlib.CreateKafkaSourceV1Beta1OrFail(c, contribresources.KafkaSourceV1Beta1(
+		kafkaBootstrapUrl,
+		rtKafkaTopicName,
+		pkgTest.CoreV1ObjectReference(test.KafkaChannelKind, resources.MessagingAPIVersion, rtChannelName),
+		contribresources.WithNameV1Beta1(rtKafkaSourceName),
+		contribresources.WithConsumerGroupV1Beta1(rtKafkaConsumerGroup),
+	))
+}
+
+func createChannel(c *testlib.Client) {
+	c.CreateChannelOrFail(rtChannelName, &metav1.TypeMeta{
+		APIVersion: resources.MessagingAPIVersion,
+		Kind:       test.KafkaChannelKind,
+	})
+}
+
+func deleteChannel(c *testlib.Client) {
+	contribtestlib.DeleteResourceOrFail(c, rtChannelName, helpers.KafkaChannelGVR)
+}

test/lib/deletion.go

@@ -0,0 +1,30 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package lib
+
+import (
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	testlib "knative.dev/eventing/test/lib"
+)
+
+func DeleteResourceOrFail(c *testlib.Client, name string, gvr schema.GroupVersionResource) {
+	unstructured := c.Dynamic.Resource(gvr).Namespace(c.Namespace)
+	if err := unstructured.Delete(name, nil); err != nil {
+		c.T.Fatalf("Failed to delete the resource %q : %v", name, err)
+	}
+}