add support for custom network providers

Signed-off-by: Kuromesi <[email protected]>
openkruise · Aug 31, 2023 · 1726d03 · 1726d03
1 parent 76d33b8
commit 1726d03
Show file tree

Hide file tree

Showing 9 changed files with 729 additions and 2 deletions.
diff --git a/api/v1alpha1/trafficrouting_types.go b/api/v1alpha1/trafficrouting_types.go
@@ -36,6 +36,8 @@ type TrafficRoutingRef struct {
 	// Gateway holds Gateway specific configuration to route traffic
 	// Gateway configuration only supports >= v0.4.0 (v1alpha2).
 	Gateway *GatewayTrafficRouting `json:"gateway,omitempty"`
+	// CustomNetworkRefs hold a list of custom providers to route traffic
+	CustomNetworkRefs *[]CustomNetworkRef `json:"networkRefs,omitempty"`
 }
 
 // IngressTrafficRouting configuration for ingress controller to control traffic routing
@@ -149,6 +151,12 @@ type TrafficRoutingList struct {
 	Items           []TrafficRouting `json:"items"`
 }
 
+type CustomNetworkRef struct {
+	APIVersion string `json:"apiVersion,omitempty"`
+	Kind       string `json:"kind,omitempty"`
+	Name       string `json:"name,omitempty"`
+}
+
 func init() {
 	SchemeBuilder.Register(&TrafficRouting{}, &TrafficRoutingList{})
 }
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/rollouts.kruise.io_rollouts.yaml b/config/crd/bases/rollouts.kruise.io_rollouts.yaml
@@ -373,6 +373,19 @@ spec:
                               required:
                               - name
                               type: object
+                            networkRefs:
+                              description: CustomNetworkRefs hold a list of custom
+                                providers to route traffic
+                              items:
+                                properties:
+                                  apiVersion:
+                                    type: string
+                                  kind:
+                                    type: string
+                                  name:
+                                    type: string
+                                type: object
+                              type: array
                             service:
                               description: Service holds the name of a service which
                                 selects pods with stable version and don't select

diff --git a/config/crd/bases/rollouts.kruise.io_trafficroutings.yaml b/config/crd/bases/rollouts.kruise.io_trafficroutings.yaml
@@ -85,6 +85,19 @@ spec:
                       required:
                       - name
                       type: object
+                    networkRefs:
+                      description: CustomNetworkRefs hold a list of custom providers
+                        to route traffic
+                      items:
+                        properties:
+                          apiVersion:
+                            type: string
+                          kind:
+                            type: string
+                          name:
+                            type: string
+                        type: object
+                      type: array
                     service:
                       description: Service holds the name of a service which selects
                         pods with stable version and don't select any pods with canary

diff --git a/pkg/trafficrouting/manager.go b/pkg/trafficrouting/manager.go
@@ -23,6 +23,7 @@ import (
 
 	"github.com/openkruise/rollouts/api/v1alpha1"
 	"github.com/openkruise/rollouts/pkg/trafficrouting/network"
+	"github.com/openkruise/rollouts/pkg/trafficrouting/network/custom"
 	"github.com/openkruise/rollouts/pkg/trafficrouting/network/gateway"
 	"github.com/openkruise/rollouts/pkg/trafficrouting/network/ingress"
 	"github.com/openkruise/rollouts/pkg/util"
@@ -263,6 +264,16 @@ func (m *Manager) FinalisingTrafficRouting(c *TrafficRoutingContext, onlyRestore
 
 func newNetworkProvider(c client.Client, con *TrafficRoutingContext, sService, cService string) (network.NetworkProvider, error) {
 	trafficRouting := con.ObjectRef[0]
+	if trafficRouting.CustomNetworkRefs != nil {
+		return custom.NewCustomController(c, custom.Config{
+			RolloutName:   con.Key,
+			RolloutNs:     con.Namespace,
+			CanaryService: cService,
+			StableService: sService,
+			TrafficConf:   *trafficRouting.CustomNetworkRefs,
+			OwnerRef:      con.OwnerRef,
+		})
+	}
 	if trafficRouting.Ingress != nil {
 		return ingress.NewIngressTrafficRouting(c, ingress.Config{
 			Key:           con.Key,