Skip to content
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

Jump to bottom

fix: incorrect update annotation of FLB svc #173

Merged
merged 2 commits into from
Jan 19, 2024
Merged

fix: incorrect update annotation of FLB svc #173

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
638a491
fix: incorrect update annotation of svc
reaver-flomesh Jan 19, 2024
69ff23e
fix: golang lint
reaver-flomesh Jan 19, 2024
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
82 changes: 39 additions & 43 deletions pkg/controllers/flb/service_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
"fmt"
"net"
"net/http"
"reflect"
"sort"
"strings"
"time"
Expand Down Expand Up @@ -408,48 +407,13 @@ func (r *reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
}

log.Debug().Msgf("Annotations of service %s/%s is %v", svc.Namespace, svc.Name, svc.Annotations)
if newAnnotations := r.computeServiceAnnotations(svc); newAnnotations != nil {
svc.Annotations = newAnnotations
if err := r.fctx.Update(ctx, svc); err != nil {
log.Error().Msgf("Failed update annotations of service %s/%s: %s", svc.Namespace, svc.Name, err)
return ctrl.Result{}, err
}

log.Debug().Msgf("After updating, annotations of service %s/%s is %v", svc.Namespace, svc.Name, svc.Annotations)
}

return r.createOrUpdateFLBEntry(ctx, svc)
}

return ctrl.Result{}, nil
}

func (r *reconciler) computeServiceAnnotations(svc *corev1.Service) map[string]string {
setting := r.settings[svc.Namespace]
log.Debug().Msgf("Setting for Namespace %q: %v", svc.Namespace, setting)

svcCopy := svc.DeepCopy()
if svcCopy.Annotations == nil {
svcCopy.Annotations = make(map[string]string)
}

for key, value := range map[string]string{
constants.FLBAddressPoolAnnotation: setting.flbDefaultAddressPool,
constants.FLBAlgoAnnotation: getValidAlgo(setting.flbDefaultAlgo),
} {
v, ok := svcCopy.Annotations[key]
if !ok || v != value {
svcCopy.Annotations[key] = value
}
}

if !reflect.DeepEqual(svc.GetAnnotations(), svcCopy.GetAnnotations()) {
return svcCopy.Annotations
}

return nil
}

func isSettingChanged(secret *corev1.Secret, setting, defaultSetting *setting, mc configurator.Configurator) bool {
if mc.IsFLBStrictModeEnabled() {
hash := fmt.Sprintf("%d", utils.GetSecretDataHash(secret))
Expand Down Expand Up @@ -720,22 +684,54 @@ func isSupportedProtocol(protocol corev1.Protocol) bool {
}

func (r *reconciler) getFLBParameters(svc *corev1.Service) map[string]string {
if svc.Annotations == nil {
return map[string]string{}
setting := r.settings[svc.Namespace]
if len(svc.Annotations) == 0 {
return map[string]string{
flbAddressPoolHeaderName: setting.flbDefaultAddressPool,
flbAlgoHeaderName: getValidAlgo(setting.flbDefaultAlgo),
}
}

return map[string]string{
flbAddressPoolHeaderName: svc.Annotations[constants.FLBAddressPoolAnnotation],
flbAddressPoolHeaderName: r.getAddressPool(svc),
flbDesiredIPHeaderName: svc.Annotations[constants.FLBDesiredIPAnnotation],
flbMaxConnectionsHeaderName: svc.Annotations[constants.FLBMaxConnectionsAnnotation],
flbReadTimeoutHeaderName: svc.Annotations[constants.FLBReadTimeoutAnnotation],
flbWriteTimeoutHeaderName: svc.Annotations[constants.FLBWriteTimeoutAnnotation],
flbIdleTimeoutHeaderName: svc.Annotations[constants.FLBIdleTimeoutAnnotation],
flbAlgoHeaderName: getValidAlgo(svc.Annotations[constants.FLBAlgoAnnotation]),
flbAlgoHeaderName: r.getAlgorithm(svc),
flbTagsHeaderName: r.getTags(svc),
}
}

func (r *reconciler) getAddressPool(svc *corev1.Service) string {
setting := r.settings[svc.Namespace]
if len(svc.Annotations) == 0 {
return setting.flbDefaultAddressPool
}

pool, ok := svc.Annotations[constants.FLBAddressPoolAnnotation]
if !ok || len(pool) == 0 {
return setting.flbDefaultAddressPool
}

return pool
}

func (r *reconciler) getAlgorithm(svc *corev1.Service) string {
setting := r.settings[svc.Namespace]
if len(svc.Annotations) == 0 {
return getValidAlgo(setting.flbDefaultAlgo)
}

algo, ok := svc.Annotations[constants.FLBAlgoAnnotation]
if !ok || len(algo) == 0 {
return getValidAlgo(setting.flbDefaultAlgo)
}

return getValidAlgo(algo)
}

func (r *reconciler) getTags(svc *corev1.Service) string {
rawTags, ok := svc.Annotations[constants.FLBTagsAnnotation]

Expand Down Expand Up @@ -1060,7 +1056,7 @@ func (r *reconciler) podToService(pod client.Object) []reconcile.Request {
allServices,
client.InNamespace(pod.GetNamespace()),
); err != nil {
log.Error().Msgf("failed to list services in ns %s: %s", pod.GetNamespace(), err)
log.Warn().Msgf("failed to list services in ns %s: %s", pod.GetNamespace(), err)
return nil
}

Expand Down Expand Up @@ -1106,7 +1102,7 @@ func (r *reconciler) endpointsToService(ep client.Object) []reconcile.Request {
client.ObjectKeyFromObject(ep),
svc,
); err != nil {
log.Error().Msgf("failed to get service %s/%s: %s", ep.GetNamespace(), ep.GetName(), err)
log.Warn().Msgf("failed to get service %s/%s: %s", ep.GetNamespace(), ep.GetName(), err)
return nil
}

Expand All @@ -1131,7 +1127,7 @@ func (r *reconciler) servicesByNamespace(ns client.Object) []reconcile.Request {
List(context.TODO(), metav1.ListOptions{})

if err != nil {
log.Error().Msgf("failed to list services in ns %s: %s", ns.GetName(), err)
log.Warn().Msgf("failed to list services in ns %s: %s", ns.GetName(), err)
return nil
}

Expand Down
Loading