Add no-proxy to iamge library (#2352)

Dynatrace · Nov 14, 2023 · d21aa48 · d21aa48
1 parent b8bca65
commit d21aa48
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/controllers/dynakube/version/image_hash.go b/src/controllers/dynakube/version/image_hash.go
@@ -12,6 +12,7 @@ import (
 	"github.com/Dynatrace/dynatrace-operator/src/registry"
 	containerv1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/pkg/errors"
+	"golang.org/x/net/http/httpproxy"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -87,10 +88,13 @@ func PrepareTransport(ctx context.Context, apiReader client.Reader, transport *h
 			log.Info("invalid proxy spec", "proxy", proxy)
 			return nil, errors.WithStack(err)
 		}
-
-		transport.Proxy = func(req *http.Request) (*url.URL, error) {
-			return proxyUrl, nil
+		proxyConfig := httpproxy.Config{
+			HTTPProxy:  proxyUrl.String(),
+			HTTPSProxy: proxyUrl.String(),
+			NoProxy:    dynakube.FeatureNoProxy(),
 		}
+
+		transport.Proxy = proxyWrapper(proxyConfig)
 	}
 
 	if dynakube.Spec.TrustedCAs != "" {
@@ -102,6 +106,12 @@ func PrepareTransport(ctx context.Context, apiReader client.Reader, transport *h
 	return transport, nil
 }
 
+func proxyWrapper(proxyConfig httpproxy.Config) func(req *http.Request) (*url.URL, error) {
+	return func(req *http.Request) (*url.URL, error) {
+		return proxyConfig.ProxyFunc()(req.URL)
+	}
+}
+
 func AddCertificates(ctx context.Context, apiReader client.Reader, transport *http.Transport, dynakube *dynatracev1beta1.DynaKube) (*http.Transport, error) {
 	trustedCAs, err := dynakube.TrustedCAs(ctx, apiReader)
 	if err != nil {