Enable DNS intents support by default (#217)

Author: NetanelBollag

helm-charts

@@ -22,6 +22,7 @@ import (
 	"github.com/otterize/network-mapper/src/mapper/pkg/pod_webhook"
 	"github.com/otterize/network-mapper/src/shared/echologrus"
 	"golang.org/x/sync/errgroup"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"net/http"
@@ -61,6 +62,7 @@ var (
 )
 
 func init() {
+	utilruntime.Must(apiextensionsv1.AddToScheme(scheme))
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 	utilruntime.Must(otterizev1alpha2.AddToScheme(scheme))
 	utilruntime.Must(otterizev1alpha3.AddToScheme(scheme))

src/go.mod

@@ -33,7 +33,7 @@ const (
 	DNSClientIntentsUpdateIntervalKey     = "dns-client-intents-update-interval"
 	DNSClientIntentsUpdateIntervalDefault = 1 * time.Second
 	DNSClientIntentsUpdateEnabledKey      = "dns-client-intents-update-enabled"
-	DNSClientIntentsUpdateEnabledDefault  = false
+	DNSClientIntentsUpdateEnabledDefault  = true
 
 	EnableIstioCollectionKey           = "enable-istio-collection"
 	EnableIstioCollectionDefault       = false

src/mapper/cmd/main.go

@@ -7,30 +7,57 @@ import (
 	"github.com/otterize/network-mapper/src/mapper/pkg/dnscache"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
-	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 )
 
+const (
+	clientIntentsCRDName = "clientintents.k8s.otterize.com"
+)
+
 func InitWithManager(ctx context.Context, mgr manager.Manager, dnsCache *dnscache.DNSCache) (*Publisher, bool, error) {
 	if !viper.GetBool(config.DNSClientIntentsUpdateEnabledKey) {
 		return nil, false, nil
 	}
 
+	installed, err := IsClientIntentsInstalled(ctx, mgr)
+	if err != nil {
+		return nil, false, errors.Wrap(err)
+	}
+
+	if !installed {
+		logrus.Debugf("DNS client intents publishing is not enabled due to missing CRD %s", clientIntentsCRDName)
+		return nil, false, nil
+	}
+
 	dnsPublisher := NewPublisher(mgr.GetClient(), dnsCache)
-	err := dnsPublisher.InitIndices(ctx, mgr)
+	err = dnsPublisher.InitIndices(ctx, mgr)
 	if err != nil {
-		discoveryErr := (&apiutil.ErrResourceDiscoveryFailed{})
-		if errors.As(err, &discoveryErr) {
-			for gvk := range *discoveryErr {
-				if gvk.Group == "k8s.otterize.com" {
-					// This can happen if the network mapper is deployed without the intents operator, which is normal.
-					logrus.Debugf("DNS client intents publishing is not enabled due to missing CRD %v", gvk)
-					return nil, false, nil
-				}
-			}
-		}
 		return nil, false, errors.Wrap(err)
 	}
 
 	return dnsPublisher, true, nil
 }
+
+func IsClientIntentsInstalled(ctx context.Context, mgr manager.Manager) (bool, error) {
+	directClient, err := client.New(mgr.GetConfig(), client.Options{Scheme: mgr.GetScheme()})
+	if err != nil {
+		logrus.WithError(err).Error("unable to create kubernetes API client")
+		return false, errors.Wrap(err)
+	}
+
+	crd := apiextensionsv1.CustomResourceDefinition{}
+	err = directClient.Get(ctx, types.NamespacedName{Name: clientIntentsCRDName}, &crd)
+	if err != nil && !k8serrors.IsNotFound(err) {
+		return false, errors.Wrap(err)
+	}
+
+	if k8serrors.IsNotFound(err) {
+		return false, nil
+	}
+
+	return true, nil
+}