switch to use patch

Signed-off-by: sopida-chotwanwirach <[email protected]>

Author: sopida-chotwanwirach

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"
@@ -311,12 +313,17 @@ func (gr *GlooRouter) syncUpstreamSpec(curUpstream *gloov1.Upstream, canary *fla
 	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
+		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).Update(context.TODO(), cloneUpstream, metav1.UpdateOptions{})
+		_, 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 update error: %w", curUpstream.Name, canary.Namespace, err)
+			return fmt.Errorf("upstream %s.%s spec patch error: %w", curUpstream.Name, canary.Namespace, err)
 		}
 	}
 

test/gloo/test-canary.sh

@@ -120,26 +120,7 @@ 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
-cat <<EOF | kubectl apply -f -
-apiVersion: gloo.solo.io/v1
-kind: Upstream
-metadata:
-  name: config-upstream
-  namespace: gloo-system
-spec:
-  static:
-    hosts:
-    - addr: "example.com"
-      port: 80
-  connectionConfig:
-    connectTimeout: 2s
-    maxRequestsPerConnection: 51
-  loadBalancerConfig:
-    roundRobin:
-      slowStartConfig:
-        slowStartWindow: 2m
-        minWeightPercent: 20
-EOF
+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