github/flagger
1
0
Fork 0
mirror of https://github.com/fluxcd/flagger.git synced 2026-04-15 06:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(gloo): Update reconciler to detect change in gloo upstream spec

Browse Source 
Signed-off-by: sopida-chotwanwirach <sopida.chotwanwirach@offerup.com>
This commit is contained in:
sopida-chotwanwirach
2024-03-13 17:22:05 -07:00
parent 9a0f01079f
commit e153b8a3df
2 changed files with 73 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/router/gloo.go
View File

@@ -275,7 +275,8 @@ func (gr *GlooRouter) createFlaggerUpstream(canary *flaggerv1.Canary, upstreamNa
if err != nil {
return fmt.Errorf("service %s.%s get query error: %w", svcName, canary.Namespace, err)
}
_, err = upstreamClient.Get(context.TODO(), upstreamName, metav1.GetOptions{})
curUpstream, err := upstreamClient.Get(context.TODO(), upstreamName, metav1.GetOptions{})
if errors.IsNotFound(err) {
glooUpstreamWithConfig, err := gr.getGlooConfigUpstream(canary)
if err != nil {
@@ -288,10 +289,40 @@ func (gr *GlooRouter) createFlaggerUpstream(canary *flaggerv1.Canary, upstreamNa
}
} else if err != nil {
return fmt.Errorf("upstream %s.%s get query error: %w", upstreamName, canary.Namespace, err)
} else {
return gr.syncUpstreamSpec(curUpstream, canary)
}
return nil
}
func (gr *GlooRouter) syncUpstreamSpec(curUpstream *gloov1.Upstream, canary *flaggerv1.Canary) error {
glooUpstreamWithConfig, err := gr.getGlooConfigUpstream(canary)
if err != nil {
return err
}
if glooUpstreamWithConfig == nil {
return nil
}
glooUpstreamLB := glooUpstreamWithConfig.Spec.LoadBalancerConfig
loadBalancerDiff := cmp.Diff(glooUpstreamLB, curUpstream.Spec.LoadBalancerConfig)
if loadBalancerDiff != "" {
gr.logger.Debugf("detect diff in upstream spec %s.%s %s", curUpstream.Name, canary.Namespace, loadBalancerDiff)
cloneUpstream := curUpstream.DeepCopy()
cloneUpstream.Spec.LoadBalancerConfig = glooUpstreamLB
_, err = gr.glooClient.GlooV1().Upstreams(canary.Namespace).Update(context.TODO(), cloneUpstream, metav1.UpdateOptions{})
if err != nil {
return fmt.Errorf("upstream %s.%s spec update error: %w", curUpstream.Name, canary.Namespace, err)
}
}
return nil
}
func (gr *GlooRouter) getGlooUpstreamKubeService(canary *flaggerv1.Canary, svc *corev1.Service, upstreamName string, glooUpstreamWithConfig *gloov1.Upstream) *gloov1.Upstream {
upstreamSpec := gloov1.UpstreamSpec{}