Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix default cloud usage when cloudsSecret is absent #197

Merged
merged 1 commit into from
Jan 23, 2019
Merged

Fix default cloud usage when cloudsSecret is absent #197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions pkg/cloud/openstack/clients/machineservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,16 @@ func NewInstanceServiceFromMachine(kubeClient kubernetes.Interface, machine *clu
if err != nil {
return nil, err
}
namespace := machineSpec.CloudsSecret.Namespace
if namespace == "" {
namespace = machine.Namespace
}
cloud, err := GetCloudFromSecret(kubeClient, namespace, machineSpec.CloudsSecret.Name, machineSpec.CloudName)
if err != nil {
return nil, err
cloud := clientconfig.Cloud{}
if machineSpec.CloudsSecret != nil && machineSpec.CloudsSecret.Name != "" {
namespace := machineSpec.CloudsSecret.Namespace
if namespace == "" {
namespace = machine.Namespace
}
cloud, err = GetCloudFromSecret(kubeClient, namespace, machineSpec.CloudsSecret.Name, machineSpec.CloudName)
if err != nil {
return nil, err
}
}
return NewInstanceServiceFromCloud(cloud)
}
Expand Down