Skip to content

fix: get backendrouting from fed #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zoumo merged 1 commit into from
Jul 23, 2025
+42 −37
Merged

fix: get backendrouting from fed #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions pkg/controllers/rolloutrun/executor/canary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"fmt"
"time"

"github.com/go-logr/logr"
rolloutapi "kusionstack.io/kube-api/rollout"
rolloutv1alpha1 "kusionstack.io/kube-api/rollout/v1alpha1"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -71,7 +72,7 @@ func (e *canaryExecutor) init(ctx *ExecutorContext) (done bool) {
ctx.SkipCurrentRelease()
return true
}
ctx.TrafficManager.With(logger, ctx.RolloutRun.Spec.Canary.Targets, ctx.RolloutRun.Spec.Canary.Traffic)
ctx.TrafficManager.With(ctx.RolloutRun.Spec.Canary.Targets, ctx.RolloutRun.Spec.Canary.Traffic)
return false
}

Expand Down Expand Up @@ -133,25 +134,26 @@ func (e *canaryExecutor) modifyTraffic(ctx *ExecutorContext, op string) (bool, t
opResult := controllerutil.OperationResultNone

if rolloutRun.Spec.Canary.Traffic == nil {
logger.Info("traffic is nil, skip modify traffic")
logger.V(3).Info("traffic is nil, skip modify traffic")
return true, retryImmediately
}

goctx := logr.NewContext(ctx.Context, logger)
// 1.a. do traffic initialization
var err error
switch op {
case "forkBackends":
opResult, err = ctx.TrafficManager.ForkBackends()
opResult, err = ctx.TrafficManager.ForkBackends(goctx)
case "initializeRoute":
opResult, err = ctx.TrafficManager.InitializeRoute()
opResult, err = ctx.TrafficManager.InitializeRoute(goctx)
case "addCanaryRoute":
opResult, err = ctx.TrafficManager.AddCanaryRoute()
opResult, err = ctx.TrafficManager.AddCanaryRoute(goctx)
case "deleteCanaryRoute":
opResult, err = ctx.TrafficManager.DeleteCanaryRoute()
opResult, err = ctx.TrafficManager.DeleteCanaryRoute(goctx)
case "resetRoute":
opResult, err = ctx.TrafficManager.ResetRoute()
opResult, err = ctx.TrafficManager.ResetRoute(goctx)
case "deleteForkedBackends":
opResult, err = ctx.TrafficManager.DeleteForkedBackends()
opResult, err = ctx.TrafficManager.DeleteForkedBackends(goctx)
}
if err != nil {
logger.Error(err, "failed to modify traffic", "operation", op)
Expand All @@ -165,9 +167,8 @@ func (e *canaryExecutor) modifyTraffic(ctx *ExecutorContext, op string) (bool, t
}

// 1.b. waiting for traffic
ready := ctx.TrafficManager.CheckReady()
ready := ctx.TrafficManager.CheckReady(ctx)
if !ready {
logger.Info("waiting for BackendRouting ready")
return false, retryDefault
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/rolloutrun/rolloutrun_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ func (r *RolloutRunReconciler) syncRolloutRun(
result ctrl.Result
)

trafficManager, err := trafficcontrol.NewManager(r.Client, r.Logger, topologies)
trafficManager, err := trafficcontrol.NewManager(ctx, r.Client, topologies)
if err != nil {
return ctrl.Result{}, err
}
Expand Down
56 changes: 30 additions & 26 deletions pkg/trafficrouting/control/traffic_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,32 @@ import (

type Manager struct {
client client.Client
logger logr.Logger

topoligies map[rolloutv1alpha1.CrossClusterObjectNameReference]*topology

targets []rolloutv1alpha1.RolloutRunStepTarget
strategy *rolloutv1alpha1.TrafficStrategy
}

func NewManager(c client.Client, logger logr.Logger, topologies []rolloutv1alpha1.TrafficTopology) (*Manager, error) {
func NewManager(ctx context.Context, c client.Client, topologies []rolloutv1alpha1.TrafficTopology) (*Manager, error) {
m := &Manager{
client: c,
logger: logger.WithName("trafficrouting"),
topoligies: make(map[rolloutv1alpha1.CrossClusterObjectNameReference]*topology),
}

logger := logr.FromContextOrDiscard(ctx)
ctx = clusterinfo.WithCluster(ctx, clusterinfo.Fed)

for _, obj := range topologies {
for _, info := range obj.Status.Topologies {
ref := info.WorkloadRef
var routing rolloutv1alpha1.BackendRouting
routing := &rolloutv1alpha1.BackendRouting{}
key := client.ObjectKey{Namespace: obj.Namespace, Name: info.BackendRoutingName}
err := m.client.Get(context.TODO(), key, &routing)
err := m.client.Get(ctx, key, routing)
if err != nil {
logger.Error(err, "failed to get backend routing", "backendrouting", info.BackendRoutingName)
return nil, err
}

topo, ok := m.topoligies[ref]
if !ok {
topo = &topology{
Expand All @@ -62,21 +64,20 @@ func NewManager(c client.Client, logger logr.Logger, topologies []rolloutv1alpha
}
m.topoligies[ref] = topo
}
topo.routings = append(topo.routings, &routing)
topo.routings = append(topo.routings, routing)
}
}

return m, nil
}

func (m *Manager) With(logger logr.Logger, workloads []rolloutv1alpha1.RolloutRunStepTarget, strategy *rolloutv1alpha1.TrafficStrategy) {
m.logger = logger.WithName("trafficrouting")
func (m *Manager) With(workloads []rolloutv1alpha1.RolloutRunStepTarget, strategy *rolloutv1alpha1.TrafficStrategy) {
m.targets = workloads
m.strategy = strategy
}

func (m *Manager) ForkBackends() (controllerutil.OperationResult, error) {
return m.mutateRouting(func(routing *rolloutv1alpha1.BackendRouting) error {
func (m *Manager) ForkBackends(ctx context.Context) (controllerutil.OperationResult, error) {
return m.mutateRouting(ctx, func(routing *rolloutv1alpha1.BackendRouting) error {
if routing.Spec.ForkedBackends == nil {
routing.Spec.ForkedBackends = &rolloutv1alpha1.ForkedBackends{}
}
Expand All @@ -92,15 +93,15 @@ func (m *Manager) ForkBackends() (controllerutil.OperationResult, error) {
})
}

func (m *Manager) DeleteForkedBackends() (controllerutil.OperationResult, error) {
return m.mutateRouting(func(routing *rolloutv1alpha1.BackendRouting) error {
func (m *Manager) DeleteForkedBackends(ctx context.Context) (controllerutil.OperationResult, error) {
return m.mutateRouting(ctx, func(routing *rolloutv1alpha1.BackendRouting) error {
routing.Spec.ForkedBackends = nil
return nil
})
}

func (m *Manager) InitializeRoute() (controllerutil.OperationResult, error) {
return m.mutateRouting(func(routing *rolloutv1alpha1.BackendRouting) error {
func (m *Manager) InitializeRoute(ctx context.Context) (controllerutil.OperationResult, error) {
return m.mutateRouting(ctx, func(routing *rolloutv1alpha1.BackendRouting) error {
if routing.Spec.Forwarding == nil {
routing.Spec.Forwarding = &rolloutv1alpha1.BackendForwarding{
HTTP: &rolloutv1alpha1.HTTPForwarding{},
Expand All @@ -120,15 +121,15 @@ func (m *Manager) InitializeRoute() (controllerutil.OperationResult, error) {
})
}

func (m *Manager) ResetRoute() (controllerutil.OperationResult, error) {
return m.mutateRouting(func(routing *rolloutv1alpha1.BackendRouting) error {
func (m *Manager) ResetRoute(ctx context.Context) (controllerutil.OperationResult, error) {
return m.mutateRouting(ctx, func(routing *rolloutv1alpha1.BackendRouting) error {
routing.Spec.Forwarding = nil
return nil
})
}

func (m *Manager) AddCanaryRoute() (controllerutil.OperationResult, error) {
return m.mutateRouting(func(routing *rolloutv1alpha1.BackendRouting) error {
func (m *Manager) AddCanaryRoute(ctx context.Context) (controllerutil.OperationResult, error) {
return m.mutateRouting(ctx, func(routing *rolloutv1alpha1.BackendRouting) error {
if routing.Spec.Forwarding == nil {
routing.Spec.Forwarding = &rolloutv1alpha1.BackendForwarding{
HTTP: &rolloutv1alpha1.HTTPForwarding{},
Expand All @@ -142,8 +143,8 @@ func (m *Manager) AddCanaryRoute() (controllerutil.OperationResult, error) {
})
}

func (m *Manager) DeleteCanaryRoute() (controllerutil.OperationResult, error) {
return m.mutateRouting(func(routing *rolloutv1alpha1.BackendRouting) error {
func (m *Manager) DeleteCanaryRoute(ctx context.Context) (controllerutil.OperationResult, error) {
return m.mutateRouting(ctx, func(routing *rolloutv1alpha1.BackendRouting) error {
if routing.Spec.Forwarding != nil &&
routing.Spec.Forwarding.HTTP != nil &&
routing.Spec.Forwarding.HTTP.Canary != nil {
Expand All @@ -153,18 +154,19 @@ func (m *Manager) DeleteCanaryRoute() (controllerutil.OperationResult, error) {
})
}

func (m *Manager) mutateRouting(mutateFn func(routing *rolloutv1alpha1.BackendRouting) error) (controllerutil.OperationResult, error) {
func (m *Manager) mutateRouting(ctx context.Context, mutateFn func(routing *rolloutv1alpha1.BackendRouting) error) (controllerutil.OperationResult, error) {
ctx = clusterinfo.WithCluster(ctx, clusterinfo.Fed)
logger := logr.FromContextOrDiscard(ctx)
operation := controllerutil.OperationResultNone
if m.strategy == nil {
m.logger.Info("no trafficrouting strategy found, skip it")
logger.Info("no trafficrouting strategy found, skip it")
return operation, nil
}
ctx := clusterinfo.WithCluster(context.Background(), clusterinfo.Fed)

for _, workload := range m.targets {
topo, ok := m.topoligies[workload.CrossClusterObjectNameReference]
if !ok {
m.logger.Info("no trafficrouting topology found for workload", "workload", workload.CrossClusterObjectNameReference)
logger.Info("no trafficrouting topology found for workload", "workload", workload.CrossClusterObjectNameReference)
continue
}
for i := range topo.routings {
Expand All @@ -184,7 +186,7 @@ func (m *Manager) mutateRouting(mutateFn func(routing *rolloutv1alpha1.BackendRo
return operation, nil
}

func (m *Manager) CheckReady() bool {
func (m *Manager) CheckReady(ctx context.Context) bool {
for _, workload := range m.targets {
topo, ok := m.topoligies[workload.CrossClusterObjectNameReference]
if !ok {
Expand All @@ -195,6 +197,8 @@ func (m *Manager) CheckReady() bool {
meta.IsStatusConditionTrue(routing.Status.Conditions, rolloutv1alpha1.BackendRoutingReady) {
continue
}
logger := logr.FromContextOrDiscard(ctx)
logger.Info("backendRouting is not ready", "backendrouting", routing.Name)
return false
}
}
Expand Down