fix: Update subpath from DeepCopy instead of pointer

Signed-off-by: Diego Alfonso <[email protected]>

Author: Diego Alfonso

pkg/apis/cartographer/v1alpha1/workload_helpers.go

@@ -222,7 +222,8 @@ func (w *WorkloadSpec) Merge(updates *WorkloadSpec) {
 	if updates.Image != "" {
 		w.MergeImage(updates.Image)
 	}
-	if s := updates.Source; s != nil {
+	if updates.Source != nil {
+		s := updates.Source.DeepCopy()
 		if s.Git != nil {
 			w.MergeGit(*s.Git)
 		}
@@ -326,7 +327,7 @@ func (w *WorkloadSpec) ResetSource() {
 }
 
 func (w *WorkloadSpec) MergeGit(git GitSource) {
-	stash := w.Source
+	stash := w.Source.DeepCopy()
 	image := w.Image
 	w.ResetSource()
 
@@ -348,13 +349,13 @@ func (w *WorkloadSpec) MergeGit(git GitSource) {
 }
 
 func (w *WorkloadSpec) MergeSourceImage(image string) {
-	stash := w.Source
+	stash := w.Source.DeepCopy()
 	w.ResetSource()
 
 	w.Source = &Source{
 		Image: image,
 	}
-	if stash != nil && stash.Image != "" {
+	if stash != nil && stash.Subpath != "" {
 		w.Source.Subpath = stash.Subpath
 	}
 }

pkg/apis/cartographer/v1alpha1/workload_test.go

@@ -1884,25 +1884,6 @@ func TestWorkloadSpec_MergeSourceImage(t *testing.T) {
 				Subpath: "my-subpath",
 			},
 		},
-	}, {
-		name: "update deleting subpath",
-		seed: &WorkloadSpec{
-			Source: &Source{
-				Git: &GitSource{
-					URL: "[email protected]:example/repo.git",
-					Ref: GitRef{
-						Branch: "main",
-					},
-				},
-				Subpath: "my-subpath",
-			},
-		},
-		sourceImage: "my-registry.nip.io/my-folder/my-image:latest@sha:my-sha1234567890",
-		want: &WorkloadSpec{
-			Source: &Source{
-				Image: "my-registry.nip.io/my-folder/my-image:latest@sha:my-sha1234567890",
-			},
-		},
 	}}
 
 	for _, test := range tests {