Merge pull request #1617 from sopida-chotwanwirach/gloo-reconcile-upstream-spec-change

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

pkg/router/gloo.go

@@ -18,6 +18,7 @@ package router
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 
 	corev1 "k8s.io/api/core/v1"
@@ -30,6 +31,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	types "k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
 
 	flaggerv1 "github.com/fluxcd/flagger/pkg/apis/flagger/v1beta1"
@@ -275,7 +277,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 +291,45 @@ 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)
+
+		patchUpstream := gloov1.Upstream{}
+		patchUpstream.Spec = gloov1.UpstreamSpec{}
+		patchUpstream.Spec.LoadBalancerConfig = glooUpstreamLB
+		patchBytes, err := json.Marshal(patchUpstream)
+		if err != nil {
+			return fmt.Errorf("unable to marshal patch upstream from %s.%s with error: %w", glooUpstreamWithConfig.Name, glooUpstreamWithConfig.Namespace, err)
+		}
+
+		_, err = gr.glooClient.GlooV1().Upstreams(canary.Namespace).Patch(context.TODO(), curUpstream.Name, types.MergePatchType, patchBytes, metav1.PatchOptions{})
+		if err != nil {
+			return fmt.Errorf("upstream %s.%s spec patch 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{}

test/gloo/test-canary.sh

@@ -117,6 +117,28 @@ done
 
 echo '✔ Canary initialization test passed'
 
+echo '>>> Waiting for primary spec to be updated'
+
+# Update gloo upstream on slow start config which will trigger update on flagger upstreams
+kubectl -n gloo-system patch upstream config-upstream --type json --patch='[ { "op": "replace", "path": "/spec/loadBalancerConfig/roundRobin/slowStartConfig/minWeightPercent", "value": 20 } ]'
+
+retries=50
+count=0
+ok=false
+until ${ok}; do
+    kubectl -n test get upstream/test-podinfo-canaryupstream-80 -ojson | jq '.spec.loadBalancerConfig.roundRobin.slowStartConfig.minWeightPercent' | grep '20' && ok=true || ok=false
+    
+    sleep 5
+    count=$(($count + 1))
+    if [[ ${count} -eq ${retries} ]]; then
+        kubectl -n gloo-system logs deployment/flagger
+        echo "No more retries left"
+        exit 1
+    fi
+done
+
+echo '✔ Canary reconcilation test passed'
+
 echo '>>> Triggering canary deployment'
 kubectl -n test set image deployment/podinfo podinfod=ghcr.io/stefanprodan/podinfo:6.0.1