feat(): Hub-and-Spoke partial mesh topology

Makefile

@@ -83,6 +83,10 @@ test: manifests generate fmt vet envtest ## Run tests.
 test-local: envtest ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./controllers/controller/... -coverprofile cover.out
 
+.PHONY: test-e2e-hns
+test-e2e-hns: ## Run the Hub-and-Spoke (partial mesh) control-plane e2e suite against a real, disposable Kind cluster.
+	go test -tags e2e -v -timeout 20m ./test/e2e/...
+
 .PHONY: int-test
 int-test: envtest
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./controllers/controller/... -coverprofile cover.out

apis/controller/v1alpha1/sliceconfig_types.go

@@ -74,6 +74,31 @@ type SliceConfigSpec struct {
 	// RenewBefore is used for renew now!
 	RenewBefore *metav1.Time      `json:"renewBefore,omitempty"`
 	VPNConfig   *VPNConfiguration `json:"vpnConfig,omitempty"`
+	// Topology configures the inter-cluster connection topology for the slice.
+	// When absent, the slice uses full-mesh connectivity (existing behavior).
+	//+optional
+	Topology *TopologySpec `json:"topology,omitempty"`
+}
+
+// +kubebuilder:validation:Enum=FullMesh;HubAndSpoke
+type TopologyMode string
+
+const (
+	TopologyModeFullMesh    TopologyMode = "FullMesh"
+	TopologyModeHubAndSpoke TopologyMode = "HubAndSpoke"
+)
+
+// TopologySpec defines the inter-cluster connection topology of the slice
+type TopologySpec struct {
+	// Mode selects the connection topology. Absent defaults to FullMesh.
+	//+optional
+	Mode TopologyMode `json:"mode,omitempty"`
+	// Hubs lists the clusters acting as hubs when Mode is HubAndSpoke.
+	// Each entry must be a member of spec.clusters. All non-hub members
+	// become spokes. Exactly one hub is supported in this release.
+	//+optional
+	//+kubebuilder:validation:MaxItems=1
+	Hubs []string `json:"hubs,omitempty"`
 }
 
 // ExternalGatewayConfig is the configuration for external gateways like 'istio', etc/
@@ -195,8 +220,28 @@ type KubesliceEvent struct {
 }
 
 // SliceConfigStatus defines the observed state of SliceConfig
+// Slice status condition types and reasons for topology convergence.
+const (
+	// SliceConditionTypeTopologyConverged reports whether every desired gateway
+	// link of the slice is Connected.
+	SliceConditionTypeTopologyConverged = "TopologyConverged"
+	// SliceReasonAllEdgesReady is set when all gateway links are Connected.
+	SliceReasonAllEdgesReady = "AllEdgesReady"
+	// SliceReasonEdgesNotReady is set when one or more gateway links are not Connected.
+	SliceReasonEdgesNotReady = "EdgesNotReady"
+	// SliceReasonNoGatewaysRequired is set when the slice needs no gateway links
+	// (single cluster or no-network mode) and is therefore trivially converged.
+	SliceReasonNoGatewaysRequired = "NoGatewaysRequired"
+)
+
 type SliceConfigStatus struct {
 	KubesliceEvents []KubesliceEvent `json:"kubesliceEvents,omitempty"`
+	// Conditions represent the latest available observations of the slice's
+	// topology state (e.g. TopologyConverged).
+	//+optional
+	//+listType=map
+	//+listMapKey=type
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 //+kubebuilder:object:root=true

apis/worker/v1alpha1/workerslicegateway_types.go

@@ -41,6 +41,12 @@ type WorkerSliceGatewaySpec struct {
 	LocalGatewayConfig  SliceGatewayConfig `json:"localGatewayConfig,omitempty"`
 	RemoteGatewayConfig SliceGatewayConfig `json:"remoteGatewayConfig,omitempty"`
 	GatewayNumber       int                `json:"gatewayNumber,omitempty"`
+	// RouteEntireSliceSubnet, when true, tells the worker to route the whole
+	// slice subnet (not just the peer gateway's subnet) via this gateway. The
+	// controller sets it on a spoke's gateway to the hub in HubAndSpoke topology,
+	// so a spoke forwards all slice-internal traffic (including traffic destined
+	// for other spokes) to the hub, which relays it.
+	RouteEntireSliceSubnet bool `json:"routeEntireSliceSubnet,omitempty"`
 }
 
 type SliceGatewayConfig struct {
@@ -61,9 +67,32 @@ type GatewayCredentials struct {
 }
 
 // WorkerSliceGatewayStatus defines the observed state of WorkerSliceGateway
+// Gateway connection states reported by the worker on WorkerSliceGatewayStatus.
+const (
+	// GatewayConnectionStateConnected means the gateway tunnel is up (at least
+	// one HA gateway pod reports its tunnel established).
+	GatewayConnectionStateConnected = "Connected"
+	// GatewayConnectionStateNotConnected means the tunnel is down (all gateway
+	// pods report their tunnel not established).
+	GatewayConnectionStateNotConnected = "NotConnected"
+	// GatewayConnectionStatePending means no connectivity has been reported yet
+	// (e.g. the gateway was just created). An empty ConnectionState is treated
+	// as Pending by the controller-side aggregation.
+	GatewayConnectionStatePending = "Pending"
+)
+
 type WorkerSliceGatewayStatus struct {
 	GatewayNumber         int `json:"gatewayNumber,omitempty"`
 	ClusterInsertionIndex int `json:"clusterInsertionIndex,omitempty"`
+	// ConnectionState is the connectivity state of this gateway link as reported
+	// by the worker: Connected, NotConnected or Pending. Empty means Pending.
+	ConnectionState string `json:"connectionState,omitempty"`
+	// LastTransitionTime is the time ConnectionState last changed.
+	LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"`
+	// Reason is a short, machine-readable reason for the current ConnectionState.
+	Reason string `json:"reason,omitempty"`
+	// Message is a human-readable description of the current ConnectionState.
+	Message string `json:"message,omitempty"`
 }
 
 //+kubebuilder:object:root=true

config/crd/bases/controller.kubeslice.io_sliceconfigs.yaml

@@ -227,6 +227,28 @@ spec:
                 type: string
               standardQosProfileName:
                 type: string
+              topology:
+                description: |-
+                  Topology configures the inter-cluster connection topology for the slice.
+                  When absent, the slice uses full-mesh connectivity (existing behavior).
+                properties:
+                  hubs:
+                    description: |-
+                      Hubs lists the clusters acting as hubs when Mode is HubAndSpoke.
+                      Each entry must be a member of spec.clusters. All non-hub members
+                      become spokes. Exactly one hub is supported in this release.
+                    items:
+                      type: string
+                    maxItems: 1
+                    type: array
+                  mode:
+                    description: Mode selects the connection topology. Absent defaults
+                      to FullMesh.
+                    enum:
+                    - FullMesh
+                    - HubAndSpoke
+                    type: string
+                type: object
               vpnConfig:
                 description: VPNConfiguration defines the additional (optional) VPN
                   Configuration to customise
@@ -244,8 +266,69 @@ spec:
             - maxClusters
             type: object
           status:
-            description: SliceConfigStatus defines the observed state of SliceConfig
             properties:
+              conditions:
+                description: |-
+                  Conditions represent the latest available observations of the slice's
+                  topology state (e.g. TopologyConverged).
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
               kubesliceEvents:
                 items:
                   properties:

config/crd/bases/worker.kubeslice.io_workerslicegateways.yaml

@@ -123,16 +123,40 @@ spec:
                   vpnIp:
                     type: string
                 type: object
+              routeEntireSliceSubnet:
+                description: |-
+                  RouteEntireSliceSubnet, when true, tells the worker to route the whole
+                  slice subnet (not just the peer gateway's subnet) via this gateway. The
+                  controller sets it on a spoke's gateway to the hub in HubAndSpoke topology,
+                  so a spoke forwards all slice-internal traffic (including traffic destined
+                  for other spokes) to the hub, which relays it.
+                type: boolean
               sliceName:
                 type: string
             type: object
           status:
-            description: WorkerSliceGatewayStatus defines the observed state of WorkerSliceGateway
             properties:
               clusterInsertionIndex:
                 type: integer
+              connectionState:
+                description: 'ConnectionState is the connectivity state of this gateway
+                  link as reported by the worker: Connected, NotConnected or Pending.
+                  Empty means Pending.'
+                type: string
               gatewayNumber:
                 type: integer
+              lastTransitionTime:
+                description: LastTransitionTime is the time ConnectionState last changed.
+                format: date-time
+                type: string
+              message:
+                description: Message is a human-readable description of the current
+                  ConnectionState.
+                type: string
+              reason:
+                description: Reason is a short, machine-readable reason for the current
+                  ConnectionState.
+                type: string
             type: object
         type: object
     served: true

config/samples/controller_v1alpha1_sliceconfig_hub_and_spoke.yaml

@@ -0,0 +1,37 @@
+# Sample SliceConfig using the HubAndSpoke topology.
+#
+# worker-1 acts as the hub; worker-2 and worker-3 become spokes (all
+# non-hub members are spokes).
+#
+# The controller consumes spec.topology for this sample and creates
+# hub<->spoke links only: worker-1<->worker-2 and worker-1<->worker-3.
+# No spoke<->spoke link is created.
+#
+# Omitting spec.topology entirely (or setting mode: FullMesh with no
+# hubs) keeps the existing full-mesh behavior.
+apiVersion: controller.kubeslice.io/v1alpha1
+kind: SliceConfig
+metadata:
+  name: hub-and-spoke-slice
+spec:
+  sliceType: Application
+  sliceSubnet: 10.1.0.0/16
+  sliceGatewayProvider:
+    sliceGatewayType: OpenVPN
+    sliceCaType: Local
+  sliceIpamType: Local
+  clusters:
+    - worker-1
+    - worker-2
+    - worker-3
+  topology:
+    mode: HubAndSpoke
+    hubs:
+      - worker-1
+  qosProfileDetails:
+    queueType: HTB
+    priority: 1
+    tcType: BANDWIDTH_CONTROL
+    bandwidthCeilingKbps: 5120
+    bandwidthGuaranteedKbps: 2560
+    dscpClass: AF11