feat(AM-11526,AM-11741): Slice Gateway External LoadBalancer (#180)

* added slicegatewayServiceType field Signed-off-by: Mridul <[email protected]> * added slice config validation Signed-off-by: Mridul <[email protected]> * workerslicegw change: adding gw connectivity type Signed-off-by: Mridul <[email protected]> * feat(AM-11526): reconcile logic for LB IPs Signed-off-by: Mridul <[email protected]> * feat(AM-11526): updating gwConnType is not allowed Signed-off-by: Mridul <[email protected]> * set gwSvcType during workersliceconfig creation Signed-off-by: Mridul <[email protected]> * feat(AM-11526): set gwSvcType during workerSliceGw creation Signed-off-by: Mridul <[email protected]> * feat(AM-11526): webhook validation not needed in wsc & wsg Signed-off-by: Mridul <[email protected]> * feat(AM-11741): protocol specification for slice gateway load balancer (#190) * feat(AM-11741): define protocol for gw svc type * feat(AM-11741): reconcilation logic for gateway service protocol * feat(AM-11741): provide gw protocol during cert generation * fix(AM-11741): webhook validation, env var & wsc reconciler * fix(): gwsvctype mistatch --------- Signed-off-by: Mridul Gain <[email protected]> * fix: edge case Signed-off-by: Mridul <[email protected]> * feat(AM-12018): unit test for getSliceGwSvcTypes() Signed-off-by: Mridul <[email protected]> * fix(AM-12018): prevent protocol update Signed-off-by: Mridul <[email protected]> * fix(AM-12018): unit tests for validateSlicegatewayServiceType Signed-off-by: Mridul <[email protected]> --------- Signed-off-by: Mridul <[email protected]> Signed-off-by: Mridul Gain <[email protected]>
kubeslice · Nov 23, 2023 · 87c96ac · 87c96ac
1 parent dd1d65c
commit 87c96ac
Show file tree

Hide file tree

Showing 28 changed files with 587 additions and 100 deletions.
diff --git a/apis/controller/v1alpha1/sliceconfig_types.go b/apis/controller/v1alpha1/sliceconfig_types.go
@@ -74,6 +74,21 @@ type WorkerSliceGatewayProvider struct {
 	//+kubebuilder:default:=Local
 	// +kubebuilder:validation:Required
 	SliceCaType string `json:"sliceCaType"`
+
+	SliceGatewayServiceType []SliceGatewayServiceType `json:"sliceGatewayServiceType,omitempty"`
+}
+
+type SliceGatewayServiceType struct {
+	// +kubebuilder:validation:Required
+	Cluster string `json:"cluster"`
+	// +kubebuilder:validation:Required
+	//+kubebuilder:default:=NodePort
+	//+kubebuilder:validation:Enum:=NodePort;LoadBalancer
+	Type string `json:"type"`
+	// +kubebuilder:validation:Required
+	//+kubebuilder:default:=UDP
+	//+kubebuilder:validation:Enum:=TCP;UDP
+	Protocol string `json:"protocol"`
 }
 
 // QOSProfile is the QOS Profile configuration from backend

diff --git a/apis/controller/v1alpha1/zz_generated.deepcopy.go b/apis/controller/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/worker/v1alpha1/workersliceconfig_types.go b/apis/worker/v1alpha1/workersliceconfig_types.go
@@ -59,6 +59,12 @@ type WorkerSliceGatewayProvider struct {
 	SliceGatewayType string `json:"sliceGatewayType,omitempty"`
 	//+kubebuilder:default:=Local
 	SliceCaType string `json:"sliceCaType,omitempty"`
+	//+kubebuilder:default:=NodePort
+	//+kubebuilder:validation:Enum:=NodePort;LoadBalancer
+	SliceGatewayServiceType string `json:"sliceGatewayServiceType,omitempty"`
+	//+kubebuilder:default:=UDP
+	//+kubebuilder:validation:Enum:=TCP;UDP
+	SliceGatewayProtocol string `json:"sliceGatewayProtocol,omitempty"`
 }
 
 // QOSProfile is the QOS Profile configuration from backend

diff --git a/apis/worker/v1alpha1/workerslicegateway_types.go b/apis/worker/v1alpha1/workerslicegateway_types.go
@@ -29,7 +29,13 @@ type WorkerSliceGatewaySpec struct {
 	//+kubebuilder:default:=OpenVPN
 	GatewayType string `json:"gatewayType,omitempty"`
 	//+kubebuilder:validation:Enum:=Client;Server
-	GatewayHostType     string             `json:"gatewayHostType,omitempty"`
+	GatewayHostType string `json:"gatewayHostType,omitempty"`
+	//+kubebuilder:default:=NodePort
+	//+kubebuilder:validation:Enum:=NodePort;LoadBalancer
+	GatewayConnectivityType string `json:"gatewayConnectivityType,omitempty"`
+	//+kubebuilder:default:=UDP
+	//+kubebuilder:validation:Enum:=TCP;UDP
+	GatewayProtocol     string             `json:"gatewayProtocol,omitempty"`
 	GatewayCredentials  GatewayCredentials `json:"gatewayCredentials,omitempty"`
 	LocalGatewayConfig  SliceGatewayConfig `json:"localGatewayConfig,omitempty"`
 	RemoteGatewayConfig SliceGatewayConfig `json:"remoteGatewayConfig,omitempty"`
@@ -38,14 +44,15 @@ type WorkerSliceGatewaySpec struct {
 
 type SliceGatewayConfig struct {
 	//+kubebuilder:deprecatedversion:warning="worker/v1alpha1 NodeIp is deprecated...use NodeIps"
-	NodeIp        string   `json:"nodeIp,omitempty"`
-	NodeIps       []string `json:"nodeIps,omitempty"`
-	NodePort      int      `json:"nodePort,omitempty"`
-	NodePorts     []int    `json:"nodePorts,omitempty"`
-	GatewayName   string   `json:"gatewayName,omitempty"`
-	ClusterName   string   `json:"clusterName,omitempty"`
-	VpnIp         string   `json:"vpnIp,omitempty"`
-	GatewaySubnet string   `json:"gatewaySubnet,omitempty"`
+	NodeIp          string   `json:"nodeIp,omitempty"`
+	NodeIps         []string `json:"nodeIps,omitempty"`
+	LoadBalancerIps []string `json:"loadBalancerIps,omitempty"`
+	NodePort        int      `json:"nodePort,omitempty"`
+	NodePorts       []int    `json:"nodePorts,omitempty"`
+	GatewayName     string   `json:"gatewayName,omitempty"`
+	ClusterName     string   `json:"clusterName,omitempty"`
+	VpnIp           string   `json:"vpnIp,omitempty"`
+	GatewaySubnet   string   `json:"gatewaySubnet,omitempty"`
 }
 
 type GatewayCredentials struct {

diff --git a/apis/worker/v1alpha1/zz_generated.deepcopy.go b/apis/worker/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/controller.kubeslice.io_sliceconfigs.yaml b/config/crd/bases/controller.kubeslice.io_sliceconfigs.yaml
@@ -159,6 +159,29 @@ spec:
                   sliceCaType:
                     default: Local
                     type: string
+                  sliceGatewayServiceType:
+                    items:
+                      properties:
+                        cluster:
+                          type: string
+                        protocol:
+                          default: UDP
+                          enum:
+                          - TCP
+                          - UDP
+                          type: string
+                        type:
+                          default: NodePort
+                          enum:
+                          - NodePort
+                          - LoadBalancer
+                          type: string
+                      required:
+                      - cluster
+                      - protocol
+                      - type
+                      type: object
+                    type: array
                   sliceGatewayType:
                     default: OpenVPN
                     type: string

diff --git a/config/crd/bases/worker.kubeslice.io_workersliceconfigs.yaml b/config/crd/bases/worker.kubeslice.io_workersliceconfigs.yaml
@@ -117,6 +117,18 @@ spec:
                   sliceCaType:
                     default: Local
                     type: string
+                  sliceGatewayProtocol:
+                    default: UDP
+                    enum:
+                    - TCP
+                    - UDP
+                    type: string
+                  sliceGatewayServiceType:
+                    default: NodePort
+                    enum:
+                    - NodePort
+                    - LoadBalancer
+                    type: string
                   sliceGatewayType:
                     default: OpenVPN
                     type: string

diff --git a/config/crd/bases/worker.kubeslice.io_workerslicegateways.yaml b/config/crd/bases/worker.kubeslice.io_workerslicegateways.yaml
@@ -35,6 +35,12 @@ spec:
           spec:
             description: WorkerSliceGatewaySpec defines the desired state of WorkerSliceGateway
             properties:
+              gatewayConnectivityType:
+                default: NodePort
+                enum:
+                - NodePort
+                - LoadBalancer
+                type: string
               gatewayCredentials:
                 properties:
                   secretName:
@@ -47,6 +53,12 @@ spec:
                 type: string
               gatewayNumber:
                 type: integer
+              gatewayProtocol:
+                default: UDP
+                enum:
+                - TCP
+                - UDP
+                type: string
               gatewayType:
                 default: OpenVPN
                 type: string
@@ -58,6 +70,10 @@ spec:
                     type: string
                   gatewaySubnet:
                     type: string
+                  loadBalancerIps:
+                    items:
+                      type: string
+                    type: array
                   nodeIp:
                     type: string
                   nodeIps:
@@ -81,6 +97,10 @@ spec:
                     type: string
                   gatewaySubnet:
                     type: string
+                  loadBalancerIps:
+                    items:
+                      type: string
+                    type: array
                   nodeIp:
                     type: string
                   nodeIps:

diff --git a/service/kube_slice_resource_names.go b/service/kube_slice_resource_names.go
@@ -151,9 +151,11 @@ var (
 )
 
 const (
-	serverGateway          = "Server"
-	clientGateway          = "Client"
-	workerSliceGatewayType = "OpenVPN"
+	serverGateway                      = "Server"
+	clientGateway                      = "Client"
+	workerSliceGatewayType             = "OpenVPN"
+	defaultSliceGatewayServiceType     = "NodePort"
+	defaultSliceGatewayServiceProtocol = "UDP"
 )
 
 var (

diff --git a/service/mocks/IVpnKeyRotationService.go b/service/mocks/IVpnKeyRotationService.go
diff --git a/service/mocks/IWorkerSliceConfigService.go b/service/mocks/IWorkerSliceConfigService.go