Skip to content

Commit 6740e1b

Browse files
sbueringerk8s-ci-robot
authored andcommitted
don't require cacert in cloud.yaml (#500)
1 parent 2579607 commit 6740e1b

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

pkg/cloud/services/provider/provider.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ func newClient(cloud clientconfig.Cloud, caCert []byte) (*gophercloud.ProviderCl
8484
if cloud.Verify != nil {
8585
config.InsecureSkipVerify = !*cloud.Verify
8686
}
87-
config.RootCAs.AppendCertsFromPEM(caCert)
87+
if caCert != nil {
88+
config.RootCAs.AppendCertsFromPEM(caCert)
89+
}
8890

8991
provider.HTTPClient.Transport = &http.Transport{Proxy: http.ProxyFromEnvironment, TLSClientConfig: config}
9092
err = openstack.Authenticate(provider, *opts)
@@ -130,7 +132,7 @@ func getCloudFromSecret(ctrlClient client.Client, secretNamespace string, secret
130132
// get caCert
131133
caCert, ok := secret.Data[CaSecretKey]
132134
if !ok {
133-
return emptyCloud, nil, err
135+
return clouds.Clouds[cloudName], nil, nil
134136
}
135137

136138
return clouds.Clouds[cloudName], caCert, nil

0 commit comments

Comments
 (0)