Merge pull request #1610 from spjmurray/system_ca_pool

k8s-ci-robot · web-flow · commit 88a3a1d413ae · 2023-07-18T20:38:02.000-07:00
✨ Allow Use of Public CAs
diff --git a/pkg/scope/provider.go b/pkg/scope/provider.go
@@ -153,13 +153,13 @@ func NewProviderClient(cloud clientconfig.Cloud, caCert []byte, logger logr.Logg
 	}
 
 	config := &tls.Config{
-		RootCAs:    x509.NewCertPool(),
 		MinVersion: tls.VersionTLS12,
 	}
 	if cloud.Verify != nil {
 		config.InsecureSkipVerify = !*cloud.Verify
 	}
 	if caCert != nil {
+		config.RootCAs = x509.NewCertPool()
 		config.RootCAs.AppendCertsFromPEM(caCert)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -153,13 +153,13 @@ func NewProviderClient(cloud clientconfig.Cloud, caCert []byte, logger logr.Logg`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`config := &tls.Config{`
`156`		`- RootCAs: x509.NewCertPool(),`
`157`	`156`	`MinVersion: tls.VersionTLS12,`
`158`	`157`	`}`
`159`	`158`	`if cloud.Verify != nil {`
`160`	`159`	`config.InsecureSkipVerify = !*cloud.Verify`
`161`	`160`	`}`
`162`	`161`	`if caCert != nil {`
	`162`	`+ config.RootCAs = x509.NewCertPool()`
`163`	`163`	`config.RootCAs.AppendCertsFromPEM(caCert)`
`164`	`164`	`}`
`165`	`165`