Added ShareNetwork Controller for Manila

Implements ShareNetwork controller to manage Manila share networks.
- E2E tests included
- API configured
- Manila enabled in CI

Signed-off-by: Daniel Lawton <[email protected]>

Co-Authored-By: Claude Sonnet 4.5 <[email protected]>

Author: dlaw4608

.github/workflows/e2e.yaml

@@ -36,7 +36,9 @@ jobs:
       with:
         enable_workaround_docker_io: 'false'
         branch: ${{ matrix.openstack_version }}
-        enabled_services: "openstack-cli-server,neutron-trunk"
+        enabled_services: "openstack-cli-server,neutron-trunk,manila,m-api,m-sch,m-shr,m-dat"
+        conf_overrides: |
+            enable_plugin manila https://github.com/openstack/manila ${{ matrix.openstack_version }}
 
     - name: Deploy a Kind Cluster
       uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc

PROJECT

@@ -144,6 +144,14 @@ resources:
   kind: Service
   path: github.com/k-orc/openstack-resource-controller/api/v1alpha1
   version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: k-orc.cloud
+  group: openstack
+  kind: ShareNetwork
+  path: github.com/k-orc/openstack-resource-controller/api/v1alpha1
+  version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true

README.md

@@ -83,6 +83,7 @@ kubectl delete -f $ORC_RELEASE
 | role                        |         |    ✔    |     ✔    |
 | router                      |         |    ◐    |     ◐    |
 | security group (incl. rule) |         |    ✔    |     ✔    |
+| share network               |         |    ✔    |     ✔    |
 | server                      |         |    ◐    |     ◐    |
 | server group                |         |    ✔    |     ✔    |
 | service                     |         |    ✔    |     ✔    |

api/v1alpha1/sharenetwork_types.go

@@ -16,7 +16,10 @@ limitations under the License.
 
 package v1alpha1
 
+import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 // ShareNetworkResourceSpec contains the desired state of the resource.
+// +kubebuilder:validation:XValidation:rule="has(self.networkRef) == has(self.subnetRef)",message="networkRef and subnetRef must be specified together"
 type ShareNetworkResourceSpec struct {
 	// name will be the name of the created resource. If not specified, the
 	// name of the ORC object will be used.
@@ -31,21 +34,11 @@ type ShareNetworkResourceSpec struct {
 
 	// networkRef is a reference to the ORC Network which this resource is associated with.
 	// +optional
-	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="networkRef is immutable"
 	NetworkRef *KubernetesNameRef `json:"networkRef,omitempty"`
 
 	// subnetRef is a reference to the ORC Subnet which this resource is associated with.
 	// +optional
-	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="subnetRef is immutable"
 	SubnetRef *KubernetesNameRef `json:"subnetRef,omitempty"`
-
-	// TODO(scaffolding): Add more types.
-	// To see what is supported, you can take inspiration from the CreateOpts structure from
-	// github.com/gophercloud/gophercloud/v2/openstack/sharedfilesystems/v2/sharenetworks
-	//
-	// Until you have implemented mutability for the field, you must add a CEL validation
-	// preventing the field being modified:
-	// `// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="<fieldname> is immutable"`
 }
 
 // ShareNetworkFilter defines an existing resource by its properties
@@ -60,15 +53,11 @@ type ShareNetworkFilter struct {
 	// +kubebuilder:validation:MaxLength:=255
 	// +optional
 	Description *string `json:"description,omitempty"`
-
-	// TODO(scaffolding): Add more types.
-	// To see what is supported, you can take inspiration from the ListOpts structure from
-	// github.com/gophercloud/gophercloud/v2/openstack/sharedfilesystems/v2/sharenetworks
 }
 
 // ShareNetworkResourceStatus represents the observed state of the resource.
 type ShareNetworkResourceStatus struct {
-	// name is a Human-readable name for the resource. Might not be unique.
+	// name is a Human-readable name for the resource.
 	// +kubebuilder:validation:MaxLength=1024
 	// +optional
 	Name string `json:"name,omitempty"`
@@ -78,17 +67,44 @@ type ShareNetworkResourceStatus struct {
 	// +optional
 	Description string `json:"description,omitempty"`
 
-	// networkID is the ID of the Network to which the resource is associated.
+	// neutronNetID is the Neutron network ID.
+	// +kubebuilder:validation:MaxLength=1024
+	// +optional
+	NeutronNetID string `json:"neutronNetID,omitempty"`
+
+	// neutronSubnetID is the Neutron subnet ID.
 	// +kubebuilder:validation:MaxLength=1024
 	// +optional
-	NetworkID string `json:"networkID,omitempty"`
+	NeutronSubnetID string `json:"neutronSubnetID,omitempty"`
 
-	// subnetID is the ID of the Subnet to which the resource is associated.
+	// networkType is the network type (e.g., vlan, vxlan, flat).
 	// +kubebuilder:validation:MaxLength=1024
 	// +optional
-	SubnetID string `json:"subnetID,omitempty"`
+	NetworkType string `json:"networkType,omitempty"`
+
+	// segmentationID is the segmentation ID.
+	// +optional
+	SegmentationID *int32 `json:"segmentationID,omitempty"`
 
-	// TODO(scaffolding): Add more types.
-	// To see what is supported, you can take inspiration from the ShareNetwork structure from
-	// github.com/gophercloud/gophercloud/v2/openstack/sharedfilesystems/v2/sharenetworks
+	// cidr is the CIDR of the subnet.
+	// +kubebuilder:validation:MaxLength=1024
+	// +optional
+	CIDR string `json:"cidr,omitempty"`
+
+	// ipVersion is the IP version (4 or 6).
+	// +optional
+	IPVersion *int32 `json:"ipVersion,omitempty"`
+
+	// projectID is the ID of the project that owns the share network.
+	// +kubebuilder:validation:MaxLength=1024
+	// +optional
+	ProjectID string `json:"projectID,omitempty"`
+
+	// createdAt shows the date and time when the resource was created.
+	// +optional
+	CreatedAt *metav1.Time `json:"createdAt,omitempty"`
+
+	// updatedAt shows the date and time when the resource was updated.
+	// +optional
+	UpdatedAt *metav1.Time `json:"updatedAt,omitempty"`
 }