Merge pull request #196 from kon-angelo/fix-missing-auth-url-hotfix

[release-v1.14] get missing auth_aul from cloudprofile

Author: dkistner

pkg/controller/worker/actuator.go

@@ -76,7 +76,17 @@ func (d *delegateFactory) WorkerDelegate(ctx context.Context, worker *extensions
 		return nil, err
 	}
 
-	openstackClient, err := client.NewOpenStackClientFromSecretRef(ctx, d.Client(), worker.Spec.SecretRef)
+	cloudProfileConfig, err := helper.CloudProfileConfigFromCluster(cluster)
+	if err != nil {
+		return nil, err
+	}
+
+	keyStoneURL, err := helper.FindKeyStoneURL(cloudProfileConfig.KeyStoneURLs, cloudProfileConfig.KeyStoneURL, worker.Spec.Region)
+	if err != nil {
+		return nil, err
+	}
+
+	openstackClient, err := client.NewOpenStackClientFromSecretRef(ctx, d.Client(), worker.Spec.SecretRef, &keyStoneURL)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create openstack client")
 	}

pkg/openstack/client/client.go

@@ -18,6 +18,7 @@ package client
 
 import (
 	"context"
+	"strings"
 
 	os "github.com/gardener/gardener-extension-provider-openstack/pkg/openstack"
 	"github.com/gophercloud/gophercloud"
@@ -61,12 +62,15 @@ func NewOpenstackClientFromCredentials(credentials *os.Credentials) (Factory, er
 
 // NewOpenStackClientFromSecretRef returns a Factory implementation that can be used to create clients for OpenStack services.
 // The credentials are fetched from the Kubernetes secret referenced by <secretRef>.
-func NewOpenStackClientFromSecretRef(ctx context.Context, c client.Client, secretRef corev1.SecretReference) (Factory, error) {
+func NewOpenStackClientFromSecretRef(ctx context.Context, c client.Client, secretRef corev1.SecretReference, keyStoneUrl *string) (Factory, error) {
 	creds, err := os.GetCredentials(ctx, c, secretRef)
 	if err != nil {
 		return nil, err
 	}
 
+	if len(strings.TrimSpace(creds.AuthURL)) == 0 && keyStoneUrl != nil {
+		creds.AuthURL = *keyStoneUrl
+	}
 	return NewOpenstackClientFromCredentials(creds)
 }
 

pkg/openstack/client/swift.go

@@ -27,7 +27,7 @@ import (
 
 // NewStorageClientFromSecretRef retrieves the openstack client from specified by the secret reference.
 func NewStorageClientFromSecretRef(ctx context.Context, c client.Client, secretRef corev1.SecretReference, region string) (Storage, error) {
-	base, err := NewOpenStackClientFromSecretRef(ctx, c, secretRef)
+	base, err := NewOpenStackClientFromSecretRef(ctx, c, secretRef, nil)
 	if err != nil {
 		return nil, err
 	}