allow users to specify multiple URLs for external controllers

When a user has a HA LINSTOR Controller managed by drbd-reactor, they generally
do not have a single service IP. Instead, the user usually specified all
possible controller IPs.

golinstor already supports this when using the "Controllers()" option, so make
use of this here. LINSTOR CSI does not need to be updated, as this already
works there.

Signed-off-by: Moritz Wanzenböck <[email protected]>

Author: WanzenBug

docs/CHANGELOG.md

@@ -12,7 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Automatically set the LINSTOR Satellite image version when using an external LINSTOR Controller.
 
 ### Changed
+
 - Disable debug logging by default for the Operator.
+- Allow specifying multiple controller URLs for external LINSTOR clusters.
 
 ## [v2.7.1] - 2024-11-25
 

pkg/linstorhelper/client.go

@@ -67,14 +67,8 @@ func NewClientForCluster(ctx context.Context, cl client.Client, namespace string
 	// of other goroutines.
 	options = slices.Clone(options)
 
-	var clientUrl *url.URL
 	if ref.ExternalController != nil {
-		u, err := url.Parse(ref.ExternalController.URL)
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse external controller URL: %w", err)
-		}
-
-		clientUrl = u
+		options = append(options, lapi.Controllers(strings.Split(ref.ExternalController.URL, ",")))
 	} else {
 		services := corev1.ServiceList{}
 		err := cl.List(ctx, &services, client.InNamespace(namespace), client.MatchingLabels{
@@ -96,10 +90,10 @@ func NewClientForCluster(ctx context.Context, cl client.Client, namespace string
 			return nil, nil
 		}
 
-		clientUrl = &url.URL{
+		options = append(options, lapi.BaseURL(&url.URL{
 			Scheme: scheme,
 			Host:   fmt.Sprintf("%s.%s.svc:%d", s.Name, s.Namespace, port),
-		}
+		}))
 	}
 
 	if ref.ClientSecretName != "" {
@@ -127,7 +121,6 @@ func NewClientForCluster(ctx context.Context, cl client.Client, namespace string
 	}
 
 	options = append(options,
-		lapi.BaseURL(clientUrl),
 		lapi.UserAgent(vars.OperatorName+"/"+vars.Version),
 		lapi.Log(&logrAdapter{log.FromContext(ctx)}),
 	)

pkg/linstorhelper/client_test.go

@@ -81,7 +81,7 @@ func TestNewClientForCluster(t *testing.T) {
 				URL: "http://other-cluster.example.com:3370",
 			},
 			expectedOptions: []lapi.Option{
-				lapi.BaseURL(&url.URL{Scheme: "http", Host: "other-cluster.example.com:3370"}),
+				lapi.Controllers([]string{"http://other-cluster.example.com:3370"}),
 				lapi.UserAgent(vars.OperatorName + "/" + vars.Version),
 			},
 		},
@@ -99,13 +99,26 @@ func TestNewClientForCluster(t *testing.T) {
 			},
 			existingSecret: "client-secret",
 			expectedOptions: []lapi.Option{
-				lapi.BaseURL(&url.URL{Scheme: "https", Host: "other-cluster.example.com:3371"}),
+				lapi.Controllers([]string{"https://other-cluster.example.com:3371"}),
 				lapi.HTTPClient(&http.Client{Transport: &http.Transport{
 					TLSClientConfig: tlsConfig,
 				}}),
 				lapi.UserAgent(vars.OperatorName + "/" + vars.Version),
 			},
 		},
+		{
+			name: "cluster-external-controller-with-multiple-urls",
+			externalRef: &piraeusv1.LinstorExternalControllerRef{
+				URL: "http://other-cluster.example.com:3370,http://another-cluster.example.com:3370",
+			},
+			expectedOptions: []lapi.Option{
+				lapi.Controllers([]string{
+					"http://other-cluster.example.com:3370",
+					"http://another-cluster.example.com:3370",
+				}),
+				lapi.UserAgent(vars.OperatorName + "/" + vars.Version),
+			},
+		},
 		{
 			name: "cluster-with-service-without-port-client-nil",
 			existingObjs: []client.Object{