Return error id OpenStackNet misses OpenStackNetConfig owner ref

In case of backup restore the owner ref needs to get updated by the OpenStackNetConfig controller. If some other reconcile using the OpenStackNet happens first, this reference is missing and e.g. the OpenStackIPSet gets stuck waiting for IPs to be processed. Signed-off-by: Martin Schuppert <[email protected]>
openstack-k8s-operators · Oct 24, 2024 · 99fddee · 99fddee
1 parent 0435510
commit 99fddee
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/api/v1beta1/common_openstacknet.go b/api/v1beta1/common_openstacknet.go
@@ -124,6 +124,10 @@ func AddOSNetConfigRefLabel(
 		}
 	}
 
+	if _, ok := labels[shared.OpenStackNetConfigReconcileLabel]; !ok {
+		return labels, fmt.Errorf("OpenStackNet %s misses OpenStackNetConfig owner reference", subnetName)
+	}
+
 	return labels, nil
 }
 

diff --git a/api/v1beta1/openstackipset_webhook.go b/api/v1beta1/openstackipset_webhook.go
@@ -76,7 +76,17 @@ var _ webhook.Validator = &OpenStackIPSet{}
 func (r *OpenStackIPSet) ValidateCreate() error {
 	openstackipsetlog.Info("validate create", "name", r.Name)
 
-	// TODO(user): fill in your validation logic upon object creation.
+	//
+	// Fail early on create if osnetcfg ist not found
+	//
+	_, err := GetOsNetCfg(webhookClient, r.GetNamespace(), r.GetLabels()[shared.OpenStackNetConfigReconcileLabel])
+	if err != nil {
+		return fmt.Errorf("error getting OpenStackNetConfig %s - %s: %w",
+			r.GetLabels()[shared.OpenStackNetConfigReconcileLabel],
+			r.Name,
+			err)
+	}
+
 	return nil
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -124,6 +124,10 @@ func AddOSNetConfigRefLabel( @@
     		}
     	}
+    	if _, ok := labels[shared.OpenStackNetConfigReconcileLabel]; !ok {
+    		return labels, fmt.Errorf("OpenStackNet %s misses OpenStackNetConfig owner reference", subnetName)
+    	}
     	return labels, nil
     }
@@ Expand Down @@