Create istio exclusion for CSI Driver in case of codeModules or public registry

pkg/controllers/dynakube/controller_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/Dynatrace/dynatrace-operator/pkg/controllers"
 	"github.com/Dynatrace/dynatrace-operator/pkg/controllers/dynakube/activegate"
 	"github.com/Dynatrace/dynatrace-operator/pkg/controllers/dynakube/connectioninfo"
-	"github.com/Dynatrace/dynatrace-operator/pkg/controllers/dynakube/connectioninfo/oneagent"
+	oaconnectioninfo "github.com/Dynatrace/dynatrace-operator/pkg/controllers/dynakube/connectioninfo/oneagent"
 	"github.com/Dynatrace/dynatrace-operator/pkg/controllers/dynakube/injection"
 	"github.com/Dynatrace/dynatrace-operator/pkg/controllers/dynakube/istio"
 	"github.com/Dynatrace/dynatrace-operator/pkg/controllers/dynakube/oneagent"
@@ -595,6 +595,19 @@ func TestSetupIstio(t *testing.T) {
 		virtualService, err := fakeIstio.NetworkingV1beta1().VirtualServices(dynakube.GetNamespace()).Get(ctx, expectedName, metav1.GetOptions{})
 		require.NoError(t, err)
 		assert.NotNil(t, virtualService)
+
+		err = istioReconciler.ReconcileCSIDriver(ctx, dynakube)
+
+		require.NoError(t, err)
+
+		expectedName = istio.BuildNameForFQDNServiceEntry(dynakube.GetName(), istio.CSIDiverComponent)
+		serviceEntry, err = fakeIstio.NetworkingV1beta1().ServiceEntries(dynakube.GetNamespace()).Get(ctx, expectedName, metav1.GetOptions{})
+		require.NoError(t, err)
+		assert.NotNil(t, serviceEntry)
+
+		virtualService, err = fakeIstio.NetworkingV1beta1().VirtualServices(dynakube.GetNamespace()).Get(ctx, expectedName, metav1.GetOptions{})
+		require.NoError(t, err)
+		assert.NotNil(t, virtualService)
 	})
 }
 

pkg/controllers/dynakube/injection/reconciler.go

@@ -84,6 +84,11 @@ func (r *reconciler) Reconcile(ctx context.Context) error {
 		if err != nil {
 			log.Error(err, "error reconciling istio configuration for codemodules")
 		}
+
+		err = r.reconcileIstioForCSIDriver(ctx)
+		if err != nil {
+			return err
+		}
 	}
 
 	if !r.dynakube.NeedAppInjection() {
@@ -120,6 +125,15 @@ func (r *reconciler) Reconcile(ctx context.Context) error {
 	return nil
 }
 
+func (r *reconciler) reconcileIstioForCSIDriver(ctx context.Context) error {
+	err := r.istioReconciler.ReconcileCSIDriver(ctx, r.dynakube)
+	if err != nil {
+		return errors.WithMessage(err, "failed to reconcile istio objects for CSI Driver")
+	}
+
+	return nil
+}
+
 func (r *reconciler) removeAppInjection(ctx context.Context) (err error) {
 	namespaces, err := mapper.GetNamespacesForDynakube(ctx, r.apiReader, r.dynakube.Name)
 	if err != nil {

pkg/controllers/dynakube/istio/config.go

@@ -11,6 +11,7 @@ var (
 )
 
 const (
+	CSIDiverComponent   = "csi-driver"
 	OperatorComponent   = "operator"
 	OneAgentComponent   = "oneagent"
 	CodeModuleComponent = "CodeModule"

pkg/controllers/dynakube/istio/reconciler.go

@@ -4,12 +4,13 @@ import (
 	"context"
 	goerrors "errors"
 	"net"
+	"net/url"
 	"strings"
 
 	dynatracev1beta2 "github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta2/dynakube"
 	dtclient "github.com/Dynatrace/dynatrace-operator/pkg/clients/dynatrace"
 	"github.com/Dynatrace/dynatrace-operator/pkg/controllers/dynakube/connectioninfo/activegate"
-	"github.com/Dynatrace/dynatrace-operator/pkg/controllers/dynakube/connectioninfo/oneagent"
+	oaconnectioninfo "github.com/Dynatrace/dynatrace-operator/pkg/controllers/dynakube/connectioninfo/oneagent"
 	"github.com/Dynatrace/dynatrace-operator/pkg/util/conditions"
 	"github.com/Dynatrace/dynatrace-operator/pkg/util/kubeobjects/labels"
 	"github.com/Dynatrace/dynatrace-operator/pkg/util/timeprovider"
@@ -22,6 +23,7 @@ type Reconciler interface {
 	ReconcileAPIUrl(ctx context.Context, dynakube *dynatracev1beta2.DynaKube) error
 	ReconcileCodeModuleCommunicationHosts(ctx context.Context, dynakube *dynatracev1beta2.DynaKube) error
 	ReconcileActiveGateCommunicationHosts(ctx context.Context, dynakube *dynatracev1beta2.DynaKube) error
+	ReconcileCSIDriver(ctx context.Context, dynakube *dynatracev1beta2.DynaKube) error
 }
 
 type reconciler struct {
@@ -38,6 +40,58 @@ func NewReconciler(istio *Client) Reconciler {
 	}
 }
 
+func (r *reconciler) ReconcileCSIDriver(ctx context.Context, dynakube *dynatracev1beta2.DynaKube) error {
+	log.Info("reconciling istio components for the CSI driver")
+
+	if dynakube == nil {
+		return errors.New("can't reconcile csi driver of nil dynakube")
+	}
+
+	codeModulesURL := dynakube.CodeModulesImage()
+
+	parsedCodeModulesURL, err := parseCodeModulesImageURL(codeModulesURL)
+	if err != nil {
+		return err
+	}
+
+	codeModulesHost, err := dtclient.ParseEndpoint(parsedCodeModulesURL)
+	if err != nil {
+		return err
+	}
+
+	err = r.reconcileCommunicationHosts(ctx, []dtclient.CommunicationHost{codeModulesHost}, CSIDiverComponent)
+	if err != nil {
+		return errors.WithMessage(err, "error reconciling config for codeModulesImage")
+	}
+
+	log.Info("reconciled istio objects for CSI driver")
+
+	return nil
+}
+
+func parseCodeModulesImageURL(rawUrl string) (string, error) {
+	parsedURL, err := url.Parse(rawUrl)
+	if err != nil {
+		return "", errors.New("can't parse the codeModules image URL")
+	}
+
+	if parsedURL.Scheme == "" {
+		parsedURL.Scheme = "https"
+
+		if !strings.HasPrefix(rawUrl, "//") {
+			// if no scheme at all is set we want to add this prefix
+			rawUrl = "//" + rawUrl
+		}
+
+		parsedURL, err = url.Parse(parsedURL.Scheme + ":" + rawUrl)
+		if err != nil {
+			return "", errors.New("can't parse the codeModules image URL")
+		}
+	}
+
+	return parsedURL.String(), nil
+}
+
 func (r *reconciler) ReconcileAPIUrl(ctx context.Context, dynakube *dynatracev1beta2.DynaKube) error {
 	log.Info("reconciling istio components for the Dynatrace API url")
 

pkg/controllers/dynakube/istio/reconciler_test.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/Dynatrace/dynatrace-operator/pkg/api/status"
 	dynatracev1beta2 "github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta2/dynakube"
 	dtclient "github.com/Dynatrace/dynatrace-operator/pkg/clients/dynatrace"
 	"github.com/stretchr/testify/assert"
@@ -212,6 +213,62 @@ func TestReconcileAPIUrl(t *testing.T) {
 	})
 }
 
+func TestReconcileCSIDriver(t *testing.T) {
+	ctx := context.Background()
+	dynakube := createTestDynaKube()
+
+	t.Run("nil => error", func(t *testing.T) {
+		istioClient := newTestingClient(nil, dynakube.GetNamespace())
+		reconciler := NewReconciler(istioClient)
+
+		err := reconciler.ReconcileCSIDriver(ctx, nil)
+		require.Error(t, err)
+	})
+	t.Run("malformed image uri (no protocol prefix) => still no error", func(t *testing.T) {
+		dynakube := createTestDynaKube()
+		dynakube.Status = dynatracev1beta2.DynaKubeStatus{
+			CodeModules: dynatracev1beta2.CodeModulesStatus{
+				VersionStatus: status.VersionStatus{
+					ImageID: "something-random",
+				},
+			},
+		}
+		fakeClient := fakeistio.NewSimpleClientset()
+		istioClient := newTestingClient(fakeClient, dynakube.GetNamespace())
+		reconciler := NewReconciler(istioClient)
+
+		err := reconciler.ReconcileCSIDriver(ctx, dynakube)
+		require.NoError(t, err)
+	})
+	t.Run("success", func(t *testing.T) {
+		fakeClient := fakeistio.NewSimpleClientset()
+		istioClient := newTestingClient(fakeClient, dynakube.GetNamespace())
+		reconciler := NewReconciler(istioClient)
+
+		err := reconciler.ReconcileCSIDriver(ctx, dynakube)
+		require.NoError(t, err)
+
+		expectedName := BuildNameForFQDNServiceEntry(dynakube.GetName(), CSIDiverComponent)
+		serviceEntry, err := fakeClient.NetworkingV1beta1().ServiceEntries(dynakube.GetNamespace()).Get(ctx, expectedName, metav1.GetOptions{})
+		require.NoError(t, err)
+		assert.NotNil(t, serviceEntry)
+
+		virtualService, err := fakeClient.NetworkingV1beta1().VirtualServices(dynakube.GetNamespace()).Get(ctx, expectedName, metav1.GetOptions{})
+		require.NoError(t, err)
+		assert.NotNil(t, virtualService)
+	})
+	t.Run("unknown k8s client error => error", func(t *testing.T) {
+		fakeClient := fakeistio.NewSimpleClientset()
+		fakeClient.PrependReactor("*", "*", boomReaction)
+
+		istioClient := newTestingClient(fakeClient, dynakube.GetNamespace())
+		reconciler := NewReconciler(istioClient)
+
+		err := reconciler.ReconcileCSIDriver(ctx, dynakube)
+		require.Error(t, err)
+	})
+}
+
 func TestReconcileOneAgentCommunicationHosts(t *testing.T) {
 	ctx := context.Background()
 
@@ -301,6 +358,7 @@ func TestReconcileOneAgentCommunicationHosts(t *testing.T) {
 
 		err = r.ReconcileCodeModuleCommunicationHosts(ctx, dynakube)
 		require.NoError(t, err)
+
 		statusCondition = meta.FindStatusCondition(*dynakube.Conditions(), "IstioForCodeModule")
 		require.Nil(t, statusCondition)
 
@@ -450,6 +508,57 @@ func TestReconcileActiveGateCommunicationHosts(t *testing.T) {
 	})
 }
 
+func TestParseCodeModulesImageURL(t *testing.T) {
+	tests := []struct {
+		input           string
+		output          string
+		parsedCorreclty bool
+	}{
+		{
+			input:           "some.url.com/test",
+			output:          "https://some.url.com/test",
+			parsedCorreclty: true,
+		},
+		{
+			input:           "http://some.url.com/test",
+			output:          "http://some.url.com/test",
+			parsedCorreclty: true,
+		},
+		{
+			input:           "https://some.url.com/test",
+			output:          "https://some.url.com/test",
+			parsedCorreclty: true,
+		},
+		{
+			input:           ":example.com/test",
+			output:          "",
+			parsedCorreclty: false,
+		},
+		{
+			input:           "//some.url.com/test",
+			output:          "https://some.url.com/test",
+			parsedCorreclty: true,
+		},
+	}
+
+	for _, test := range tests {
+		output, err := parseCodeModulesImageURL(test.input)
+		if !test.parsedCorreclty {
+			if err == nil {
+				t.Errorf("Expected error for input %s, but did not get any", test.input)
+			}
+		} else {
+			if err != nil {
+				t.Errorf("Did not expect error for input %s, but got one: %v", test.input, err)
+			}
+
+			if output != test.output {
+				t.Errorf("For input %s, expected output %s, but got this %s", test.input, test.output, output)
+			}
+		}
+	}
+}
+
 func createTestIPCommunicationHost() dtclient.CommunicationHost {
 	return dtclient.CommunicationHost{
 		Protocol: "http",