Fix handling of docker case

pkg/controllers/dynakube/istio/reconciler.go

@@ -19,7 +19,13 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-const defaultRepositoryHost = "index.docker.io/"
+const (
+	defaultDockerRepositoryHost = "index.docker.io/"
+	authDockerHost              = "auth.docker.io/"
+	prodCloudFlareHost          = "production.cloudflare.docker.com/"
+)
+
+var necessarAdditionalDockerHosts = []string{authDockerHost, prodCloudFlareHost}
 
 type Reconciler interface {
 	ReconcileAPIUrl(ctx context.Context, dynakube *dynatracev1beta2.DynaKube) error
@@ -55,12 +61,12 @@ func (r *reconciler) reconcileCSIDriver(ctx context.Context, dynakube *dynatrace
 		return err
 	}
 
-	codeModulesHost, err := dtclient.ParseEndpoint(parsedCodeModulesURL)
+	commHosts, err := storeCommunicationHosts(parsedCodeModulesURL)
 	if err != nil {
 		return err
 	}
 
-	err = r.reconcileCommunicationHosts(ctx, []dtclient.CommunicationHost{codeModulesHost}, CSIDriverComponent)
+	err = r.reconcileCommunicationHosts(ctx, commHosts, CSIDriverComponent)
 	if err != nil {
 		return errors.WithMessage(err, "error reconciling config for codeModulesImage")
 	}
@@ -70,27 +76,86 @@ func (r *reconciler) reconcileCSIDriver(ctx context.Context, dynakube *dynatrace
 	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")
-	}
+func storeCommunicationHosts(parsedURLList []string) ([]dtclient.CommunicationHost, error) {
+	commHosts := []dtclient.CommunicationHost{}
 
-	tmpURL := strings.Split(rawUrl, "/")
-	if !strings.Contains(tmpURL[0], ".") {
-		rawUrl = defaultRepositoryHost + rawUrl
+	if len(parsedURLList) == 1 {
+		codeModulesHost, err := dtclient.ParseEndpoint(parsedURLList[0])
+		if err != nil {
+			return nil, err
+		}
+		commHosts = append(commHosts, codeModulesHost)
+
+		return commHosts, nil
+	} else {
+		commHosts, err := addNecessaryDockerHosts(parsedURLList)
+		if err != nil {
+			return nil, err
+		}
+
+		return commHosts, err
 	}
+}
 
-	if parsedURL.Scheme == "" {
-		parsedURL.Scheme = "https"
+func addNecessaryDockerHosts(urlList []string) ([]dtclient.CommunicationHost, error) {
+	commHosts := []dtclient.CommunicationHost{}
 
-		parsedURL, err = url.Parse(parsedURL.Scheme + "://" + rawUrl)
+	for _, host := range urlList {
+		dockerHost, err := dtclient.ParseEndpoint(host)
 		if err != nil {
-			return "", errors.New("can't parse the codeModules image URL")
+			return nil, err
 		}
+		commHosts = append(commHosts, dockerHost)
 	}
+	return commHosts, nil
+}
 
-	return parsedURL.String(), nil
+func parseCodeModulesImageURL(rawUrl string) ([]string, error) {
+	var urlList []string
+
+	tmpURL := strings.Split(rawUrl, "/")
+	if !strings.Contains(tmpURL[0], ".") && !strings.Contains(tmpURL[0], "http") {
+		urlList = append(urlList, defaultDockerRepositoryHost+rawUrl)
+		urlList = append(urlList, authDockerHost+rawUrl)
+		urlList = append(urlList, prodCloudFlareHost+rawUrl)
+	}
+
+	if len(urlList) == 0 {
+		parsedURL, err := url.Parse(rawUrl)
+		if err != nil {
+			return nil, errors.New("can't parse the codeModules image URL")
+		}
+
+		if parsedURL.Scheme == "" {
+			parsedURL.Scheme = "https"
+
+			parsedURL, err = url.Parse(parsedURL.Scheme + "://" + rawUrl)
+			if err != nil {
+				return nil, errors.New("can't parse the codeModules image URL")
+			}
+		}
+
+		return []string{parsedURL.String()}, nil
+	} else {
+		var parsedURLList []string
+		for _, currURL := range urlList {
+			currURL, err := url.Parse(currURL)
+			if err != nil {
+				return nil, errors.New("can't parse the codeModules image URL")
+			}
+
+			if currURL.Scheme == "" {
+				currURL.Scheme = "https"
+
+				currURL, err = url.Parse(currURL.String())
+				if err != nil {
+					return nil, errors.New("can't parse the codeModules image URL")
+				}
+			}
+			parsedURLList = append(parsedURLList, currURL.String())
+		}
+		return parsedURLList, nil
+	}
 }
 
 func (r *reconciler) ReconcileAPIUrl(ctx context.Context, dynakube *dynatracev1beta2.DynaKube) error {

pkg/controllers/dynakube/istio/reconciler_test.go

@@ -511,42 +511,42 @@ func TestReconcileActiveGateCommunicationHosts(t *testing.T) {
 func TestParseCodeModulesImageURL(t *testing.T) {
 	tests := []struct {
 		input           string
-		output          string
+		output          []string
 		parsedCorreclty bool
 	}{
 		{
 			input:           "some.url.com/test",
-			output:          "https://some.url.com/test",
+			output:          []string{"https://some.url.com/test"},
 			parsedCorreclty: true,
 		},
 		{
 			input:           "http://some.url.com/test",
-			output:          "http://some.url.com/test",
+			output:          []string{"http://some.url.com/test"},
 			parsedCorreclty: true,
 		},
 		{
 			input:           "https://some.url.com/test",
-			output:          "https://some.url.com/test",
+			output:          []string{"https://some.url.com/test"},
 			parsedCorreclty: true,
 		},
 		{
 			input:           ":example.com/test",
-			output:          "",
+			output:          []string{""},
 			parsedCorreclty: false,
 		},
 		{
 			input:           "some.url.com/test:some-tag",
-			output:          "https://some.url.com/test:some-tag",
+			output:          []string{"https://some.url.com/test:some-tag"},
 			parsedCorreclty: true,
 		},
 		{
 			input:           "some/url/test:some-tag",
-			output:          "https://index.docker.io/some/url/test:some-tag",
+			output:          []string{"https://index.docker.io/some/url/test:some-tag", "https://auth.docker.io/some/url/test:some-tag", "https://production.cloudflare.docker.com/some/url/test:some-tag"},
 			parsedCorreclty: true,
 		},
 		{
 			input:           ":example.com/test:some-tag",
-			output:          "",
+			output:          []string{""},
 			parsedCorreclty: false,
 		},
 	}