Merge branch 'master' into inbuilt-proxy

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

# Conflicts:
#	Dockerfile
#	internal/outpost/ak/api.go
#	internal/outpost/ak/api_uag.go
#	internal/outpost/ak/global.go
#	internal/outpost/ldap/api_tls.go
#	internal/outpost/ldap/instance_bind.go
#	internal/outpost/ldap/utils.go
#	internal/outpost/proxy/api_bundle.go
#	outpost/go.mod
#	outpost/go.sum
#	outpost/pkg/ak/cert.go

internal/outpost/ldap/instance_bind.go

@@ -54,12 +54,12 @@ func (pi *ProviderInstance) Bind(username string, bindDN, bindPW string, conn ne
 	config := api.NewConfiguration()
 	config.Host = pi.s.ac.Client.GetConfig().Host
 	config.Scheme = pi.s.ac.Client.GetConfig().Scheme
+	config.UserAgent = constants.OutpostUserAgent()
 	config.HTTPClient = &http.Client{
-		Jar: jar,
-		Transport: newTransport(ak.SetUserAgent(ak.GetTLSTransport(), constants.OutpostUserAgent()), map[string]string{
-			"X-authentik-remote-ip": host,
-		}),
+		Jar:       jar,
+		Transport: ak.GetTLSTransport(),
 	}
+	config.AddDefaultHeader("X-authentik-remote-ip", host)
 	// create the API client, with the transport
 	apiClient := api.NewAPIClient(config)