fix: argocd fails to connect clusters with IAM authentication configu…

…ration (#3325)
argoproj · Apr 1, 2020 · a12b7bd · a12b7bd
1 parent 9b21c25
commit a12b7bd
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/pkg/apis/application/v1alpha1/types.go b/pkg/apis/application/v1alpha1/types.go
@@ -2183,8 +2183,7 @@ func SetK8SConfigDefaults(config *rest.Config) error {
 	if err != nil {
 		return err
 	}
-	// set default tls config since we use it in a custom transport
-	config.TLSClientConfig = rest.TLSClientConfig{}
+
 	dial := (&net.Dialer{
 		Timeout:   30 * time.Second,
 		KeepAlive: 30 * time.Second,
@@ -2203,6 +2202,12 @@ func SetK8SConfigDefaults(config *rest.Config) error {
 	if err != nil {
 		return err
 	}
+
+	// set default tls config and remove auth/exec provides since we use it in a custom transport
+	config.TLSClientConfig = rest.TLSClientConfig{}
+	config.AuthProvider = nil
+	config.ExecProvider = nil
+
 	config.Transport = tr
 	return nil
 }