Update LastAppliedTopology to TopologyRef interface

This patch updates the SpecCore webhook interface to accept the
Namespace as parameter. This change ensures that we properly validate
the referenced topology from openstack-operator, rejecting requests with
a different namespace. It also aligns "LastAppliedTopology" to
"TopologyRef" interface. While TopologyRef is able to reference Name and
namespace, we currently only save TopologyRef.Name to
.Status.LastAppliedTopology. This patch aligns both interfaces to use
the same type in the same form. In addition, some logic is moved to
infra-operator because is common to all operators, and this patch also
adopts this new form.

Signed-off-by: Francesco Pantano <[email protected]>

Author: fmount

api/bases/ovn.openstack.org_ovncontrollers.yaml

@@ -247,7 +247,19 @@ spec:
                 type: object
               lastAppliedTopology:
                 description: LastAppliedTopology - the last applied Topology
-                type: string
+                properties:
+                  name:
+                    description: Name - The Topology CR name that the Service references
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace - The Namespace to fetch the Topology CR referenced
+                      NOTE: Namespace currently points by default to the same namespace where
+                      the Service is deployed. Customizing the namespace is not supported and
+                      webhooks prevent editing this field to a value different from the
+                      current project
+                    type: string
+                type: object
               networkAttachments:
                 additionalProperties:
                   items:

api/bases/ovn.openstack.org_ovndbclusters.yaml

@@ -405,7 +405,19 @@ spec:
                 type: string
               lastAppliedTopology:
                 description: LastAppliedTopology - the last applied Topology
-                type: string
+                properties:
+                  name:
+                    description: Name - The Topology CR name that the Service references
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace - The Namespace to fetch the Topology CR referenced
+                      NOTE: Namespace currently points by default to the same namespace where
+                      the Service is deployed. Customizing the namespace is not supported and
+                      webhooks prevent editing this field to a value different from the
+                      current project
+                    type: string
+                type: object
               networkAttachments:
                 additionalProperties:
                   items:

api/bases/ovn.openstack.org_ovnnorthds.yaml

@@ -210,7 +210,19 @@ spec:
                 type: array
               lastAppliedTopology:
                 description: LastAppliedTopology - the last applied Topology
-                type: string
+                properties:
+                  name:
+                    description: Name - The Topology CR name that the Service references
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace - The Namespace to fetch the Topology CR referenced
+                      NOTE: Namespace currently points by default to the same namespace where
+                      the Service is deployed. Customizing the namespace is not supported and
+                      webhooks prevent editing this field to a value different from the
+                      current project
+                    type: string
+                type: object
               observedGeneration:
                 description: ObservedGeneration - the most recent generation observed
                   for this service. If the observed generation is less than the spec

api/go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/go-logr/logr v1.4.2
 	github.com/google/uuid v1.6.0
 	github.com/onsi/gomega v1.34.1
-	github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250211161037-7dfd80c0fa16
+	github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250218115938-ae95bdfefded
 	github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250205143454-43504d7ad19a
 	k8s.io/api v0.29.13
 	k8s.io/apimachinery v0.29.13

api/go.sum

@@ -78,8 +78,8 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
 github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
 github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 h1:J1wuGhVxpsHykZBa6Beb1gQ96Ptej9AE/BvwCBiRj1E=
 github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
-github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250211161037-7dfd80c0fa16 h1:dPHy7nEP7EbMip1jPqDhqsOyP4bWHq+UN31NrHNMN1E=
-github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250211161037-7dfd80c0fa16/go.mod h1:kkjcOSZ7jkHbVzxJd0nDQzjB+vqafuAMgSf7AnEXydw=
+github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250218115938-ae95bdfefded h1:09SyMAXgnohPLQGKuvBeR72nxZWXLXI7309RjmYYBUU=
+github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250218115938-ae95bdfefded/go.mod h1:kkjcOSZ7jkHbVzxJd0nDQzjB+vqafuAMgSf7AnEXydw=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250205143454-43504d7ad19a h1:3LuUgB85VxGD6lmVOeZelYEASmytkrzaudU014PN7xw=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250205143454-43504d7ad19a/go.mod h1:KxnNSUk15llkKTSq/bQEE7pnc0IMk44fxhoBRpimMa8=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

api/v1beta1/ovncontroller_types.go

@@ -117,7 +117,7 @@ type OVNControllerStatus struct {
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 
 	// LastAppliedTopology - the last applied Topology
-	LastAppliedTopology string `json:"lastAppliedTopology,omitempty"`
+	LastAppliedTopology *topologyv1.TopoRef `json:"lastAppliedTopology,omitempty"`
 }
 
 //+kubebuilder:object:root=true
@@ -193,3 +193,18 @@ func (instance OVNController) RbacNamespace() string {
 func (instance OVNController) RbacResourceName() string {
 	return "ovncontroller-" + instance.Name
 }
+
+// GetSpecTopologyRef - Returns the LastAppliedTopology Set in the Status
+func (instance *OVNController) GetSpecTopologyRef() *topologyv1.TopoRef {
+	return instance.Spec.TopologyRef
+}
+
+// GetLastAppliedTopology - Returns the LastAppliedTopology Set in the Status
+func (instance *OVNController) GetLastAppliedTopology() *topologyv1.TopoRef {
+	return instance.Status.LastAppliedTopology
+}
+
+// SetLastAppliedTopology - Sets the LastAppliedTopology value in the Status
+func (instance *OVNController) SetLastAppliedTopology(topologyRef *topologyv1.TopoRef) {
+	instance.Status.LastAppliedTopology = topologyRef
+}

api/v1beta1/ovncontroller_webhook.go

@@ -85,24 +85,33 @@ var _ webhook.Validator = &OVNController{}
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
 func (r *OVNController) ValidateCreate() (admission.Warnings, error) {
 	ovncontrollerlog.Info("validate create", "name", r.Name)
+	errors := field.ErrorList{}
+
+	errors = r.Spec.ValidateCreate(field.NewPath("spec"), r.Namespace)
+	if len(errors) != 0 {
+		ovncontrollerlog.Info("validation failed", "name", r.Name)
+		return nil, apierrors.NewInvalid(
+			schema.GroupKind{Group: "ovn.openstack.org", Kind: "OVNController"},
+			r.Name, errors)
+	}
+	return nil, nil
+}
 
+func (r OVNControllerSpec) ValidateCreate(basePath *field.Path, namespace string) field.ErrorList {
+	return r.OVNControllerSpecCore.ValidateCreate(basePath, namespace)
+}
+
+func (r *OVNControllerSpecCore) ValidateCreate(basePath *field.Path, namespace string) field.ErrorList {
 	errors := field.ErrorList{}
-	basePath := field.NewPath("spec")
 
 	// When a TopologyRef CR is referenced, fail if a different Namespace is
 	// referenced because is not supported
-	if r.Spec.TopologyRef != nil {
-		if err := topologyv1.ValidateTopologyNamespace(r.Spec.TopologyRef.Namespace, *basePath, r.Namespace); err != nil {
+	if r.TopologyRef != nil {
+		if err := topologyv1.ValidateTopologyNamespace(r.TopologyRef.Namespace, *basePath, namespace); err != nil {
 			errors = append(errors, err)
 		}
 	}
-	if len(errors) != 0 {
-		return nil, apierrors.NewInvalid(
-			schema.GroupKind{Group: "manila.openstack.org", Kind: "Manila"},
-			r.Name, errors)
-	}
-
-	return nil, nil
+	return errors
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
@@ -121,12 +130,29 @@ func (r *OVNController) ValidateUpdate(old runtime.Object) (admission.Warnings,
 	}
 	if len(errors) != 0 {
 		return nil, apierrors.NewInvalid(
-			schema.GroupKind{Group: "manila.openstack.org", Kind: "Manila"},
+			schema.GroupKind{Group: "ovn.openstack.org", Kind: "OVNController"},
 			r.Name, errors)
 	}
 	return nil, nil
 }
 
+func (r OVNControllerSpec) ValidateUpdate(old OVNControllerSpec, basePath *field.Path, namespace string) field.ErrorList {
+	return r.OVNControllerSpecCore.ValidateCreate(basePath, namespace)
+}
+
+func (r *OVNControllerSpecCore) ValidateUpdate(old OVNControllerSpec, basePath *field.Path, namespace string) field.ErrorList {
+	errors := field.ErrorList{}
+
+	// When a TopologyRef CR is referenced, fail if a different Namespace is
+	// referenced because is not supported
+	if r.TopologyRef != nil {
+		if err := topologyv1.ValidateTopologyNamespace(r.TopologyRef.Namespace, *basePath, namespace); err != nil {
+			errors = append(errors, err)
+		}
+	}
+	return errors
+}
+
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
 func (r *OVNController) ValidateDelete() (admission.Warnings, error) {
 	ovncontrollerlog.Info("validate delete", "name", r.Name)

api/v1beta1/ovndbcluster_types.go

@@ -161,7 +161,7 @@ type OVNDBClusterStatus struct {
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 
 	// LastAppliedTopology - the last applied Topology
-	LastAppliedTopology string `json:"lastAppliedTopology,omitempty"`
+	LastAppliedTopology *topologyv1.TopoRef `json:"lastAppliedTopology,omitempty"`
 }
 
 //+kubebuilder:object:root=true
@@ -229,3 +229,18 @@ func (instance OVNDBCluster) GetExternalEndpoint() (string, error) {
 	}
 	return instance.Status.DBAddress, nil
 }
+
+// GetSpecTopologyRef - Returns the LastAppliedTopology Set in the Status
+func (instance *OVNDBCluster) GetSpecTopologyRef() *topologyv1.TopoRef {
+	return instance.Spec.TopologyRef
+}
+
+// GetLastAppliedTopology - Returns the LastAppliedTopology Set in the Status
+func (instance *OVNDBCluster) GetLastAppliedTopology() *topologyv1.TopoRef {
+	return instance.Status.LastAppliedTopology
+}
+
+// SetLastAppliedTopology - Sets the LastAppliedTopology value in the Status
+func (instance *OVNDBCluster) SetLastAppliedTopology(topologyRef *topologyv1.TopoRef) {
+	instance.Status.LastAppliedTopology = topologyRef
+}

api/v1beta1/ovndbcluster_webhook.go

@@ -107,7 +107,7 @@ func (r *OVNDBCluster) ValidateCreate() (admission.Warnings, error) {
 	}
 	if len(errors) != 0 {
 		return nil, apierrors.NewInvalid(
-			schema.GroupKind{Group: "manila.openstack.org", Kind: "Manila"},
+			schema.GroupKind{Group: "ovn.openstack.org", Kind: "OVNDBCluster"},
 			r.Name, errors)
 	}
 	return nil, nil
@@ -129,7 +129,7 @@ func (r *OVNDBCluster) ValidateUpdate(old runtime.Object) (admission.Warnings, e
 	}
 	if len(errors) != 0 {
 		return nil, apierrors.NewInvalid(
-			schema.GroupKind{Group: "manila.openstack.org", Kind: "Manila"},
+			schema.GroupKind{Group: "ovn.openstack.org", Kind: "OVNDBCluster"},
 			r.Name, errors)
 	}
 	return nil, nil

api/v1beta1/ovnnorthd_types.go

@@ -97,7 +97,7 @@ type OVNNorthdStatus struct {
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 
 	// LastAppliedTopology - the last applied Topology
-	LastAppliedTopology string `json:"lastAppliedTopology,omitempty"`
+	LastAppliedTopology *topologyv1.TopoRef `json:"lastAppliedTopology,omitempty"`
 }
 
 //+kubebuilder:object:root=true
@@ -148,3 +148,18 @@ func (instance OVNNorthd) RbacNamespace() string {
 func (instance OVNNorthd) RbacResourceName() string {
 	return "ovnnorthd-" + instance.Name
 }
+
+// GetSpecTopologyRef - Returns the LastAppliedTopology Set in the Status
+func (instance *OVNNorthd) GetSpecTopologyRef() *topologyv1.TopoRef {
+	return instance.Spec.TopologyRef
+}
+
+// GetLastAppliedTopology - Returns the LastAppliedTopology Set in the Status
+func (instance *OVNNorthd) GetLastAppliedTopology() *topologyv1.TopoRef {
+	return instance.Status.LastAppliedTopology
+}
+
+// SetLastAppliedTopology - Sets the LastAppliedTopology value in the Status
+func (instance *OVNNorthd) SetLastAppliedTopology(topologyRef *topologyv1.TopoRef) {
+	instance.Status.LastAppliedTopology = topologyRef
+}