Merge pull request #225 from vmware-tanzu/kp-image-trigger-patch

use patch operation for kp image trigger

Author: tomkennedy513

pkg/commands/image/trigger.go

@@ -12,6 +12,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
 
 	"github.com/vmware-tanzu/kpack-cli/pkg/build"
 	"github.com/vmware-tanzu/kpack-cli/pkg/commands"
@@ -53,9 +54,16 @@ The namespace defaults to the kubernetes current-context namespace.`,
 			} else {
 				sort.Slice(buildList.Items, build.Sort(buildList.Items))
 
-				build := buildList.Items[len(buildList.Items)-1].DeepCopy()
-				build.Annotations[BuildNeededAnnotation] = time.Now().String()
-				_, err := cs.KpackClient.KpackV1alpha1().Builds(cs.Namespace).Update(ctx, build, metav1.UpdateOptions{})
+				original := buildList.Items[len(buildList.Items)-1].DeepCopy()
+				patched := original.DeepCopy()
+				patched.Annotations[BuildNeededAnnotation] = time.Now().String()
+
+				patch, err := k8s.CreatePatch(original, patched)
+				if err != nil {
+					return err
+				}
+
+				_, err = cs.KpackClient.KpackV1alpha1().Builds(cs.Namespace).Patch(ctx, original.Name, types.MergePatchType, patch, metav1.PatchOptions{})
 				if err != nil {
 					return err
 				}

pkg/commands/image/trigger_test.go

@@ -5,9 +5,9 @@ package image_test
 
 import (
 	"bytes"
+	"encoding/json"
 	"testing"
 
-	"github.com/pivotal/kpack/pkg/apis/build/v1alpha1"
 	"github.com/pivotal/kpack/pkg/client/clientset/versioned/fake"
 	"github.com/sclevine/spec"
 	"github.com/stretchr/testify/require"
@@ -47,10 +47,14 @@ func testImageTrigger(t *testing.T, when spec.G, it spec.S) {
 				actions, err := testhelpers.ActionRecorderList{clientSet}.ActionsByVerb()
 				require.NoError(t, err)
 
-				require.Len(t, actions.Updates, 1)
-				build := actions.Updates[0].GetObject().(*v1alpha1.Build)
-				require.Equal(t, build.Name, "build-three")
-				require.NotEmpty(t, build.Annotations[image.BuildNeededAnnotation])
+				require.Len(t, actions.Patches, 1)
+
+				var patch buildNeededPatch
+				err = json.Unmarshal(actions.Patches[0].GetPatch(), &patch)
+				require.NoError(t, err)
+
+				require.Equal(t, actions.Patches[0].GetName(), "build-three")
+				require.NotEmpty(t, patch.Metadata.Annotations.BuildNeededAnnotation)
 			})
 		})
 
@@ -88,10 +92,14 @@ func testImageTrigger(t *testing.T, when spec.G, it spec.S) {
 				actions, err := testhelpers.ActionRecorderList{clientSet}.ActionsByVerb()
 				require.NoError(t, err)
 
-				require.Len(t, actions.Updates, 1)
-				build := actions.Updates[0].GetObject().(*v1alpha1.Build)
-				require.Equal(t, build.Name, "build-three")
-				require.NotEmpty(t, build.Annotations[image.BuildNeededAnnotation])
+				require.Len(t, actions.Patches, 1)
+
+				var patch buildNeededPatch
+				err = json.Unmarshal(actions.Patches[0].GetPatch(), &patch)
+				require.NoError(t, err)
+
+				require.Equal(t, actions.Patches[0].GetName(), "build-three")
+				require.NotEmpty(t, patch.Metadata.Annotations.BuildNeededAnnotation)
 			})
 		})
 
@@ -111,3 +119,11 @@ func testImageTrigger(t *testing.T, when spec.G, it spec.S) {
 		})
 	})
 }
+
+type buildNeededPatch struct {
+	Metadata struct {
+		Annotations struct {
+			BuildNeededAnnotation string `json:"image.kpack.io/additionalBuildNeeded"`
+		} `json:"annotations"`
+	} `json:"metadata"`
+}