Remove Istio dependency from Eventing (Part - 5) - final cleanup

config/100-namespace.yaml

@@ -15,5 +15,3 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: knative-eventing
-  labels:
-    istio-injection: enabled

config/provisioners/in-memory-channel/in-memory-channel.yaml

@@ -188,8 +188,6 @@ spec:
       role: dispatcher
   template:
     metadata:
-      annotations:
-        sidecar.istio.io/inject: "true"
       labels: *labels
     spec:
       serviceAccountName: in-memory-channel-dispatcher

contrib/gcppubsub/config/gcppubsub.yaml

@@ -195,8 +195,6 @@ spec:
       role: dispatcher
   template:
     metadata:
-      annotations:
-        sidecar.istio.io/inject: "true"
       labels: *labels
     spec:
       serviceAccountName: gcp-pubsub-channel-dispatcher
@@ -233,20 +231,21 @@ spec:
     - protocol: TCP
       port: 80
       targetPort: 8080
-
 ---
-# Needed by the GCP PubSub Channel to communicate with GCP PubSub.	
-apiVersion: networking.istio.io/v1alpha3
-kind: ServiceEntry
-metadata:
-  name: gcppubsub-bus-ext
-  namespace: knative-eventing
-spec:
-  hosts:
-  - "*.googleapis.com"
-  - "accounts.google.com"
-  ports:
-  - number: 443
-    name: https
-    protocol: HTTPS
-  location: MESH_EXTERNAL
+# Needed by the GCP PubSub Channel to communicate with GCP PubSub.
+# Please uncomment if ISTIO automatic sidecar injector is enabled on the cluster, and 
+# the GCP dispatcher pod in knative-eventing namespace runs with a ISTIO sidecar.
+# apiVersion: networking.istio.io/v1alpha3
+# kind: ServiceEntry
+# metadata:
+#   name: gcppubsub-bus-ext
+#   namespace: knative-eventing
+# spec:
+#   hosts:
+#   - "*.googleapis.com"
+#   - "accounts.google.com"
+#   ports:
+#   - number: 443
+#     name: https
+#     protocol: HTTPS
+#   location: MESH_EXTERNAL

contrib/kafka/config/kafka.yaml

@@ -199,8 +199,6 @@ spec:
       role: dispatcher
   template:
     metadata:
-      annotations:
-        sidecar.istio.io/inject: "true"
       labels: *labels
     spec:
       serviceAccountName: kafka-channel-dispatcher

contrib/natss/config/broker/README.md

@@ -4,7 +4,6 @@
 
    ```sbtshell
    kubectl create namespace natss
-   kubectl label namespace natss istio-injection=enabled
    kubectl apply -n natss -f contrib/natss/config/broker/natss.yaml
    ```
 

contrib/natss/config/provisioner.yaml

@@ -162,8 +162,6 @@ spec:
       role: dispatcher
   template:
     metadata:
-      annotations:
-        sidecar.istio.io/inject: "true"
       labels: *labels
     spec:
       serviceAccountName: natss-dispatcher

docs/broker/README.md

@@ -235,7 +235,7 @@ The `Broker`'s address is well known, it will always be
 `<name>-broker.<namespace>.svc.<ending>`. In our case, it is
 `default-broker.default.svc.cluster.local`.
 
-While SSHed into a `Pod` with the Istio sidecar, run:
+While SSHed into a `Pod` and run:
 
 ```shell
 curl -v "http://default-broker.default.svc.cluster.local/" \
@@ -278,7 +278,7 @@ implmentation**.
 ### Namespace
 
 Namespaces are reconciled by the
-[Namespace Reconciler](../../pkg/reconciler/v1alpha1/namespace). The
+[Namespace Reconciler](../../pkg/reconciler/namespace). The
 `Namespace Reconciler` looks for all `namespace`s that have the label
 `knative-eventing-injection: enabled`. If that label is present, then the
 `Namespace Reconciler` reconciles:

pkg/apis/eventing/v1alpha1/subscription_types.go

@@ -104,8 +104,7 @@ type SubscriptionSpec struct {
 // provide the resolved target of the action.
 // Currently we inspect the objects Status and see if there's a predefined
 // Status field that we will then use to dispatch events to be processed by
-// the target. Currently must resolve to a k8s service or Istio virtual
-// service.
+// the target. Currently must resolve to a k8s service.
 // Note that in the future we should try to utilize subresources (/resolve ?) to
 // make this cleaner, but CRDs do not support subresources yet, so we need
 // to rely on a specified Status field today. By relying on this behaviour

pkg/provisioners/channel_util.go

@@ -7,7 +7,6 @@ import (
 
 	"k8s.io/apimachinery/pkg/labels"
 
-	istiov1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3"
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -157,61 +156,6 @@ func createK8sService(ctx context.Context, client runtimeClient.Client, getSvc g
 	return current, nil
 }
 
-func getVirtualService(ctx context.Context, client runtimeClient.Client, c *eventingv1alpha1.Channel) (*istiov1alpha3.VirtualService, error) {
-	list := &istiov1alpha3.VirtualServiceList{}
-	opts := &runtimeClient.ListOptions{
-		Namespace: c.Namespace,
-		// TODO After the full release start selecting on new set of labels by using virtualServiceLabels(c)
-		LabelSelector: labels.SelectorFromSet(virtualOldServiceLabels(c)),
-		// Set Raw because if we need to get more than one page, then we will put the continue token
-		// into opts.Raw.Continue.
-		Raw: &metav1.ListOptions{},
-	}
-
-	err := client.List(ctx, opts, list)
-	if err != nil {
-		return nil, err
-	}
-	for _, vs := range list.Items {
-		if metav1.IsControlledBy(&vs, c) {
-			return &vs, nil
-		}
-	}
-
-	return nil, k8serrors.NewNotFound(schema.GroupResource{}, "")
-}
-
-func CreateVirtualService(ctx context.Context, client runtimeClient.Client, channel *eventingv1alpha1.Channel, svc *corev1.Service) (*istiov1alpha3.VirtualService, error) {
-	virtualService, err := getVirtualService(ctx, client, channel)
-
-	// If the resource doesn't exist, we'll create it
-	if k8serrors.IsNotFound(err) {
-		virtualService = newVirtualService(channel, svc)
-		err = client.Create(ctx, virtualService)
-		if err != nil {
-			return nil, err
-		}
-		return virtualService, nil
-	} else if err != nil {
-		return nil, err
-	}
-
-	// Update VirtualService if it has changed. This is possible since in version 0.2.0, the destinationHost in
-	// spec.HTTP.Route for the dispatcher was changed from *-clusterbus to *-dispatcher. Even otherwise, this
-	// reconciliation is useful for the future mutations to the object.
-	expected := newVirtualService(channel, svc)
-	if !equality.Semantic.DeepDerivative(expected.Spec, virtualService.Spec) ||
-		!expectedLabelsPresent(virtualService.ObjectMeta.Labels, expected.ObjectMeta.Labels) {
-		virtualService.Spec = expected.Spec
-		virtualService.ObjectMeta.Labels = addExpectedLabels(virtualService.ObjectMeta.Labels, expected.ObjectMeta.Labels)
-		err := client.Update(ctx, virtualService)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return virtualService, nil
-}
-
 // checkExpectedLabels checks the presence of expected labels and its values and return true
 // if all labels are found.
 func expectedLabelsPresent(actual, expected map[string]string) bool {
@@ -333,60 +277,6 @@ func k8sServiceLabels(c *eventingv1alpha1.Channel) map[string]string {
 	}
 }
 
-func virtualServiceLabels(c *eventingv1alpha1.Channel) map[string]string {
-	// Use the same labels as the K8s service.
-	return k8sServiceLabels(c)
-}
-
-func virtualOldServiceLabels(c *eventingv1alpha1.Channel) map[string]string {
-	// Use the same labels as the K8s service.
-	return k8sOldServiceLabels(c)
-}
-
-// newVirtualService creates a new VirtualService for a Channel resource. It also sets the
-// appropriate OwnerReferences on the resource so handleObject can discover the Channel resource
-// that 'owns' it. As well as being garbage collected when the Channel is deleted.
-func newVirtualService(channel *eventingv1alpha1.Channel, svc *corev1.Service) *istiov1alpha3.VirtualService {
-	destinationHost := names.ServiceHostName(channelDispatcherServiceName(channel.Spec.Provisioner.Name), system.Namespace())
-	return &istiov1alpha3.VirtualService{
-		ObjectMeta: metav1.ObjectMeta{
-			GenerateName: channelVirtualServiceName(channel.Name),
-			Namespace:    channel.Namespace,
-			Labels:       virtualServiceLabels(channel),
-			OwnerReferences: []metav1.OwnerReference{
-				*metav1.NewControllerRef(channel, schema.GroupVersionKind{
-					Group:   eventingv1alpha1.SchemeGroupVersion.Group,
-					Version: eventingv1alpha1.SchemeGroupVersion.Version,
-					Kind:    "Channel",
-				}),
-			},
-		},
-		Spec: istiov1alpha3.VirtualServiceSpec{
-			Hosts: []string{
-				names.ServiceHostName(svc.Name, channel.Namespace),
-				channelHostName(channel.Name, channel.Namespace),
-			},
-			HTTP: []istiov1alpha3.HTTPRoute{{
-				Rewrite: &istiov1alpha3.HTTPRewrite{
-					Authority: channelHostName(channel.Name, channel.Namespace),
-				},
-				Route: []istiov1alpha3.HTTPRouteDestination{{
-					Destination: istiov1alpha3.Destination{
-						Host: destinationHost,
-						Port: istiov1alpha3.PortSelector{
-							Number: PortNumber,
-						},
-					}},
-				}},
-			},
-		},
-	}
-}
-
-func channelVirtualServiceName(channelName string) string {
-	return fmt.Sprintf("%s-channel-", channelName)
-}
-
 func channelServiceName(channelName string) string {
 	return fmt.Sprintf("%s-channel-", channelName)
 }