API changes for Vpc Service access (#209)

* api changes Signed-off-by: Mridul Gain <[email protected]>
kubeslice · Jun 20, 2024 · 8182492 · 8182492
1 parent 9e7b06f
commit 8182492
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 11 deletions.
diff --git a/apis/controller/v1alpha1/sliceconfig_types.go b/apis/controller/v1alpha1/sliceconfig_types.go
@@ -38,6 +38,15 @@ const (
 	NONET NetworkType = "no-network"
 )
 
+// +kubebuilder:validation:Enum:=none;istio;envoy
+type GatewayType string
+
+const (
+	NONE  GatewayType = "none"
+	ISTIO GatewayType = "istio"
+	ENVOY GatewayType = "envoy"
+)
+
 // SliceConfigSpec defines the desired state of SliceConfig
 type SliceConfigSpec struct {
 	//+kubebuilder:default:=single-network
@@ -69,12 +78,17 @@ type SliceConfigSpec struct {
 
 // ExternalGatewayConfig is the configuration for external gateways like 'istio', etc/
 type ExternalGatewayConfig struct {
-	Ingress   ExternalGatewayConfigOptions `json:"ingress,omitempty"`
-	Egress    ExternalGatewayConfigOptions `json:"egress,omitempty"`
-	NsIngress ExternalGatewayConfigOptions `json:"nsIngress,omitempty"`
-	//+kubebuilder:validation:Enum:=none;istio
-	GatewayType string   `json:"gatewayType,omitempty"`
-	Clusters    []string `json:"clusters,omitempty"`
+	Ingress          ExternalGatewayConfigOptions `json:"ingress,omitempty"`
+	Egress           ExternalGatewayConfigOptions `json:"egress,omitempty"`
+	NsIngress        ExternalGatewayConfigOptions `json:"nsIngress,omitempty"`
+	GatewayType      GatewayType                  `json:"gatewayType,omitempty"`
+	Clusters         []string                     `json:"clusters,omitempty"`
+	VPCServiceAccess ServiceAccess                `json:"vpcServiceAccess,omitempty"`
+}
+
+type ServiceAccess struct {
+	Ingress ExternalGatewayConfigOptions `json:"ingress,omitempty"`
+	Egress  ExternalGatewayConfigOptions `json:"egress,omitempty"`
 }
 
 type ExternalGatewayConfigOptions struct {

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
@@ -90,11 +90,11 @@ type NamespaceIsolationProfile struct {
 }
 
 type ExternalGatewayConfig struct {
-	Ingress   ExternalGatewayConfigOptions `json:"ingress,omitempty"`
-	Egress    ExternalGatewayConfigOptions `json:"egress,omitempty"`
-	NsIngress ExternalGatewayConfigOptions `json:"nsIngress,omitempty"`
-	//+kubebuilder:validation:Enum:=none;istio
-	GatewayType string `json:"gatewayType,omitempty"`
+	Ingress          ExternalGatewayConfigOptions     `json:"ingress,omitempty"`
+	Egress           ExternalGatewayConfigOptions     `json:"egress,omitempty"`
+	NsIngress        ExternalGatewayConfigOptions     `json:"nsIngress,omitempty"`
+	GatewayType      controllerv1alpha1.GatewayType   `json:"gatewayType,omitempty"`
+	VPCServiceAccess controllerv1alpha1.ServiceAccess `json:"vpcServiceAccess,omitempty"`
 }
 
 type ExternalGatewayConfigOptions 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
@@ -57,6 +57,7 @@ spec:
                       enum:
                       - none
                       - istio
+                      - envoy
                       type: string
                     ingress:
                       properties:
@@ -68,6 +69,19 @@ spec:
                         enabled:
                           type: boolean
                       type: object
+                    vpcServiceAccess:
+                      properties:
+                        egress:
+                          properties:
+                            enabled:
+                              type: boolean
+                          type: object
+                        ingress:
+                          properties:
+                            enabled:
+                              type: boolean
+                          type: object
+                      type: object
                   type: object
                 type: array
               maxClusters:

diff --git a/config/crd/bases/worker.kubeslice.io_workersliceconfigs.yaml b/config/crd/bases/worker.kubeslice.io_workersliceconfigs.yaml
@@ -48,6 +48,7 @@ spec:
                     enum:
                     - none
                     - istio
+                    - envoy
                     type: string
                   ingress:
                     properties:
@@ -59,6 +60,19 @@ spec:
                       enabled:
                         type: boolean
                     type: object
+                  vpcServiceAccess:
+                    properties:
+                      egress:
+                        properties:
+                          enabled:
+                            type: boolean
+                        type: object
+                      ingress:
+                        properties:
+                          enabled:
+                            type: boolean
+                        type: object
+                    type: object
                 type: object
               ipamClusterOctet:
                 type: integer