Skip to content

🐛 Don't ignore 'identityRef.spec' #1884

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

Closed
wants to merge 1 commit into from
Closed

🐛 Don't ignore 'identityRef.spec' #1884

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
22 changes: 16 additions & 6 deletions pkg/scope/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,14 @@ func (f *providerScopeFactory) NewClientScopeFromMachine(ctx context.Context, ct

if openStackMachine.Spec.IdentityRef != nil {
var err error
cloud, caCert, err = getCloudFromSecret(ctx, ctrlClient, openStackMachine.Namespace, openStackMachine.Spec.IdentityRef.Name, openStackMachine.Spec.CloudName)
if err != nil {
return nil, err
switch openStackMachine.Spec.IdentityRef.Kind {
case "Secret", "":
cloud, caCert, err = getCloudFromSecret(ctx, ctrlClient, openStackMachine.Namespace, openStackMachine.Spec.IdentityRef.Name, openStackMachine.Spec.CloudName)
if err != nil {
return nil, err
}
default:
return nil, fmt.Errorf("unsupported type for identityRef: %s", openStackMachine.Spec.IdentityRef.Kind)
}
} else if openStackCluster.Spec.IdentityRef != nil {
var err error
Expand All @@ -88,9 +93,14 @@ func (f *providerScopeFactory) NewClientScopeFromCluster(ctx context.Context, ct

if openStackCluster.Spec.IdentityRef != nil {
var err error
cloud, caCert, err = getCloudFromSecret(ctx, ctrlClient, openStackCluster.Namespace, openStackCluster.Spec.IdentityRef.Name, openStackCluster.Spec.CloudName)
if err != nil {
return nil, err
switch openStackCluster.Spec.IdentityRef.Kind {
case "Secret", "":
cloud, caCert, err = getCloudFromSecret(ctx, ctrlClient, openStackCluster.Namespace, openStackCluster.Spec.IdentityRef.Name, openStackCluster.Spec.CloudName)
if err != nil {
return nil, err
}
default:
return nil, fmt.Errorf("unsupported type for identityRef: %s", openStackCluster.Spec.IdentityRef.Kind)
}
}

Expand Down