Merge pull request #1316 from fmount/toporef

Consume a top-level TopologyRef

Author: openshift-merge-bot[bot]

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

@@ -17418,6 +17418,13 @@ spec:
                         type: object
                     type: object
                 type: object
+              topologyRef:
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                type: object
             required:
             - secret
             - storageClass

apis/core/v1beta1/openstackcontrolplane_types.go

@@ -46,7 +46,7 @@ import (
 	swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
 	telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1"
 	rabbitmqv2 "github.com/rabbitmq/cluster-operator/v2/api/v1beta1"
-
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -211,6 +211,11 @@ type OpenStackControlPlaneSpec struct {
 	// template Section, the globally defined ExtraMounts are ignored and
 	// overridden for the operator which has this section already.
 	ExtraMounts []OpenStackExtraVolMounts `json:"extraMounts,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// TopologyRef to apply the Topology defined by the associated CR referenced
+	// by name
+	TopologyRef *topologyv1.TopoRef `json:"topologyRef,omitempty"`
 }
 
 // TLSSection defines the desired state of TLS configuration
@@ -927,6 +932,11 @@ func (instance *OpenStackControlPlane) InitConditions() {
 		// Also add the overall status condition as Unknown
 		condition.UnknownCondition(condition.ReadyCondition, condition.InitReason, condition.ReadyInitMessage),
 	)
+	// Init Topology condition if there's a reference
+	if instance.Spec.TopologyRef != nil {
+		c := condition.UnknownCondition(condition.TopologyReadyCondition, condition.InitReason, condition.TopologyReadyInitMessage)
+		cl.Set(c)
+	}
 	// initialize conditions used later as Status=Unknown
 	instance.Status.Conditions.Init(&cl)
 }

apis/core/v1beta1/openstackcontrolplane_webhook.go

@@ -55,6 +55,7 @@ import (
 	octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1"
 	swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
 	telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1"
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 )
 
 var ctlplaneWebhookClient client.Client
@@ -117,6 +118,11 @@ func (r *OpenStackControlPlane) ValidateCreate() (admission.Warnings, error) {
 	}
 
 	allWarn, allErrs = r.ValidateCreateServices(basePath)
+
+	if err := r.ValidateTopology(basePath); err != nil {
+		allErrs = append(allErrs, err)
+	}
+
 	if len(allErrs) != 0 {
 		return allWarn, apierrors.NewInvalid(
 			schema.GroupKind{Group: "core.openstack.org", Kind: "OpenStackControlPlane"},
@@ -141,6 +147,10 @@ func (r *OpenStackControlPlane) ValidateUpdate(old runtime.Object) (admission.Wa
 		allErrs = append(allErrs, err...)
 	}
 
+	if err := r.ValidateTopology(basePath); err != nil {
+		allErrs = append(allErrs, err)
+	}
+
 	if len(allErrs) != 0 {
 		return nil, apierrors.NewInvalid(
 			schema.GroupKind{Group: "core.openstack.org", Kind: "OpenStackControlPlane"},
@@ -971,3 +981,14 @@ func validateTLSOverrideSpec(override **route.OverrideSpec, basePath *field.Path
 
 	return allErrs
 }
+
+func (r *OpenStackControlPlane) ValidateTopology(basePath *field.Path) *field.Error {
+	// 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 {
+			return err
+		}
+	}
+	return nil
+}

apis/core/v1beta1/zz_generated.deepcopy.go

@@ -17582,6 +17582,13 @@ spec:
                         type: object
                     type: object
                 type: object
+              topologyRef:
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                type: object
             required:
             - secret
             - storageClass

bindata/crds/crds.yaml

@@ -871,6 +871,15 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - topology.openstack.org
+  resources:
+  - topologies
+  verbs:
+  - get
+  - list
+  - update
+  - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

bindata/rbac/rbac.yaml

@@ -17418,6 +17418,13 @@ spec:
                         type: object
                     type: object
                 type: object
+              topologyRef:
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                type: object
             required:
             - secret
             - storageClass

config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml

@@ -828,3 +828,12 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - topology.openstack.org
+  resources:
+  - topologies
+  verbs:
+  - get
+  - list
+  - update
+  - watch

config/rbac/role.yaml

@@ -32,10 +32,12 @@ import (
 	ironicv1 "github.com/openstack-k8s-operators/ironic-operator/api/v1beta1"
 	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
+	"github.com/openstack-k8s-operators/lib-common/modules/common/helper"
 	common_helper "github.com/openstack-k8s-operators/lib-common/modules/common/helper"
 	corev1 "k8s.io/api/core/v1"
 
 	designatev1 "github.com/openstack-k8s-operators/designate-operator/api/v1beta1"
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1"
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
 	neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1"
@@ -115,6 +117,7 @@ func (r *OpenStackControlPlaneReconciler) GetLogger(ctx context.Context) logr.Lo
 // +kubebuilder:rbac:groups=cert-manager.io,resources=issuers,verbs=get;list;watch;create;update;patch;delete;
 // +kubebuilder:rbac:groups=cert-manager.io,resources=certificates,verbs=get;list;watch;create;update;patch;delete;
 // +kubebuilder:rbac:groups=config.openshift.io,resources=networks,verbs=get;list;watch;
+// +kubebuilder:rbac:groups=topology.openstack.org,resources=topologies,verbs=get;list;watch;update
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
@@ -285,6 +288,21 @@ func (r *OpenStackControlPlaneReconciler) reconcileOVNControllers(ctx context.Co
 }
 
 func (r *OpenStackControlPlaneReconciler) reconcileNormal(ctx context.Context, instance *corev1beta1.OpenStackControlPlane, version *corev1beta1.OpenStackVersion, helper *common_helper.Helper) (ctrl.Result, error) {
+	if instance.Spec.TopologyRef != nil {
+		if err := r.checkTopologyRef(ctx, helper,
+			instance.Spec.TopologyRef, instance.Namespace); err != nil {
+			instance.Status.Conditions.Set(condition.FalseCondition(
+				condition.TopologyReadyCondition,
+				condition.ErrorReason,
+				condition.SeverityWarning,
+				condition.TopologyReadyErrorMessage,
+				err.Error()))
+			return ctrl.Result{}, fmt.Errorf("waiting for Topology requirements: %w", err)
+		}
+		// TopologyRef != nil and exists and we're able to get it
+		instance.Status.Conditions.MarkTrue(condition.TopologyReadyCondition, condition.TopologyReadyMessage)
+	}
+
 	ctrlResult, err := openstack.ReconcileCAs(ctx, instance, helper)
 	if err != nil {
 		return ctrl.Result{}, err
@@ -637,3 +655,25 @@ func (r *OpenStackControlPlaneReconciler) findObjectsForSrc(ctx context.Context,
 
 	return requests
 }
+
+// Verify the referenced topology exists
+func (r *OpenStackControlPlaneReconciler) checkTopologyRef(
+	ctx context.Context,
+	h *helper.Helper,
+	topologyRef *topologyv1.TopoRef,
+	namespace string,
+) error {
+	if topologyRef.Namespace == "" {
+		topologyRef.Namespace = namespace
+	}
+	_, _, err := topologyv1.GetTopologyByName(
+		ctx,
+		h,
+		topologyRef.Name,
+		topologyRef.Namespace,
+	)
+	if err != nil {
+		return err
+	}
+	return nil
+}

controllers/core/openstackcontrolplane_controller.go

@@ -41,6 +41,7 @@ import (
 	networkv1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1"
 	rabbitmqv1 "github.com/openstack-k8s-operators/infra-operator/apis/rabbitmq/v1beta1"
 	redisv1 "github.com/openstack-k8s-operators/infra-operator/apis/redis/v1beta1"
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	ironicv1 "github.com/openstack-k8s-operators/ironic-operator/api/v1beta1"
 	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
 	manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1"
@@ -129,6 +130,7 @@ func init() {
 	utilruntime.Must(machineconfig.AddToScheme(scheme))
 	utilruntime.Must(k8s_networkv1.AddToScheme(scheme))
 	utilruntime.Must(operatorv1beta1.AddToScheme(scheme))
+	utilruntime.Must(topologyv1.AddToScheme(scheme))
 	// +kubebuilder:scaffold:scheme
 }