Elgato_dark/Olares
1
0
Fork 0
mirror of https://github.com/beclab/Olares synced 2026-04-21 13:37:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(bfl): check status before network activation reconcile

Browse source
This commit is contained in:
dkeven 2026-04-21 17:09:44 +08:00
parent f42ae460f1
commit 2c0b279ab4
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
framework/bfl/pkg/watchers/network_activation/network_activation.go
View file

@ -60,8 +60,7 @@ func (s *Subscriber) Handler() cache.ResourceEventHandler {
if u.Name != constants.Username {
return false
}
status := u.Annotations[constants.UserTerminusWizardStatus]
return status == string(constants.NetworkActivating)
return isNetworkActivating(u)
},
Handler: cache.ResourceEventHandlerFuncs{
AddFunc: handle,
@ -85,6 +84,9 @@ func (s *Subscriber) Do(ctx context.Context, obj interface{}, _ watchers.Action)
if err != nil {
return fmt.Errorf("get user failed: %w", err)
}
if !isNetworkActivating(current) {
return nil
}
terminusName := current.Annotations[constants.UserAnnotationTerminusNameKey]
// this should never happen
@ -139,6 +141,9 @@ func (s *Subscriber) markSuccess(ctx context.Context, user *iamV1alpha2.User, zo
}
return userOp.UpdateUser(user, []func(*iamV1alpha2.User){
func(u *iamV1alpha2.User) {
if !isNetworkActivating(u) {
return
}
if u.Annotations == nil {
u.Annotations = map[string]string{}
}
@ -152,6 +157,13 @@ func (s *Subscriber) markSuccess(ctx context.Context, user *iamV1alpha2.User, zo
})
}
func isNetworkActivating(user *iamV1alpha2.User) bool {
if user == nil {
return false
}
return user.Annotations[constants.UserTerminusWizardStatus] == string(constants.NetworkActivating)
}
func (s *Subscriber) markFailed(ctx context.Context, user *iamV1alpha2.User, errorMsg string) error {
userOp, err := operator.NewUserOperatorWithContext(ctx)
if err != nil {
@ -159,6 +171,9 @@ func (s *Subscriber) markFailed(ctx context.Context, user *iamV1alpha2.User, err
}
return userOp.UpdateUser(user, []func(*iamV1alpha2.User){
func(u *iamV1alpha2.User) {
if !isNetworkActivating(u) {
return
}
if u.Annotations == nil {
u.Annotations = map[string]string{}
}