Merge pull request #285 from cschwede/fix-storage-network

Use storagemgmt network by default if defined
openstack-k8s-operators · Oct 16, 2024 · 603ea71 · 603ea71
2 parents 914fdd3 + 5a34107
commit 603ea71
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/controllers/swiftstorage_controller.go b/controllers/swiftstorage_controller.go
@@ -343,9 +343,15 @@ func (r *SwiftStorageReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		for _, swiftPod := range podList.Items {
 			dnsIP := ""
 			if len(instance.Spec.NetworkAttachments) > 0 {
-				dnsIP, err = getPodIPInNetwork(swiftPod, instance.Namespace, "storage")
+				dnsIP, err = getPodIPInNetwork(swiftPod, instance.Namespace, "storagemgmt")
+
 				if err != nil {
-					return ctrl.Result{}, err
+					previousErr := err
+					dnsIP, err = getPodIPInNetwork(swiftPod, instance.Namespace, "storage")
+					if err != nil {
+						err = errors.Join(previousErr, err)
+						return ctrl.Result{}, err
+					}
 				}
 			}