chore: Ignore subpath when image is used

Signed-off-by: Diego Alfonso <[email protected]>
vmware-tanzu · May 27, 2023 · 7f53ada · 7f53ada
1 parent 081a2d7
commit 7f53ada
Show file tree

Hide file tree

Showing 4 changed files with 432 additions and 11 deletions.
diff --git a/pkg/apis/cartographer/v1alpha1/workload_helpers.go b/pkg/apis/cartographer/v1alpha1/workload_helpers.go
@@ -219,6 +219,19 @@ func (w *WorkloadSpec) Merge(updates *WorkloadSpec) {
 	for _, p := range updates.Params {
 		w.MergeParams(p.Name, p.Value)
 	}
+	sp := ""
+	if w.Source != nil {
+		sp = w.Source.Subpath
+	}
+	if updates.Image != "" {
+		w.MergeImage(updates.Image)
+	}
+	if updates.Source != nil && (updates.Source.Git != nil || updates.Source.Image != "") && sp != "" {
+		if w.Source == nil {
+			w.Source = &Source{}
+		}
+		w.Source.Subpath = sp
+	}
 	if updates.Source != nil {
 		s := updates.Source.DeepCopy()
 		if s.Git != nil {
@@ -227,13 +240,10 @@ func (w *WorkloadSpec) Merge(updates *WorkloadSpec) {
 		if s.Image != "" {
 			w.MergeSourceImage(s.Image)
 		}
-		if s.Subpath != "" {
+		if s.Subpath != "" && w.Source != nil && (w.Source.Git != nil || w.Source.Image != "") {
 			w.MergeSubPath(s.Subpath)
 		}
 	}
-	if updates.Image != "" {
-		w.MergeImage(updates.Image)
-	}
 	for _, e := range updates.Env {
 		w.MergeEnv(e)
 	}

diff --git a/pkg/apis/cartographer/v1alpha1/workload_test.go b/pkg/apis/cartographer/v1alpha1/workload_test.go
@@ -1034,6 +1034,101 @@ func TestWorkload_Merge(t *testing.T) {
 				Image: "ubuntu:bionic",
 			},
 		},
+	}, {
+		name: "image with sources nill",
+		seed: &Workload{
+			Spec: WorkloadSpec{
+				Image: "alpine:latest",
+			},
+		},
+		update: &Workload{
+			Spec: WorkloadSpec{
+				Image:  "ubuntu:bionic",
+				Source: &Source{Subpath: "my-subpath"},
+			},
+		},
+		want: &Workload{
+			Spec: WorkloadSpec{
+				Image: "ubuntu:bionic",
+			},
+		},
+	}, {
+		name: "image with sources source image and subpath",
+		seed: &Workload{
+			Spec: WorkloadSpec{
+				Image: "alpine:latest",
+			},
+		},
+		update: &Workload{
+			Spec: WorkloadSpec{
+				Image: "ubuntu:bionic",
+				Source: &Source{
+					Image:   "ubuntu:bionic",
+					Subpath: "my-subpath",
+				},
+			},
+		},
+		want: &Workload{
+			Spec: WorkloadSpec{
+				Source: &Source{
+					Image:   "ubuntu:bionic",
+					Subpath: "my-subpath",
+				},
+			},
+		},
+	}, {
+		name: "image update sources source image and subpath",
+		seed: &Workload{
+			Spec: WorkloadSpec{
+				Image: "alpine:latest",
+				Source: &Source{
+					Subpath: "new-subpath",
+				},
+			},
+		},
+		update: &Workload{
+			Spec: WorkloadSpec{
+				Image: "ubuntu:bionic",
+				Source: &Source{
+					Image:   "ubuntu:bionic",
+					Subpath: "my-subpath",
+				},
+			},
+		},
+		want: &Workload{
+			Spec: WorkloadSpec{
+				Source: &Source{
+					Image:   "ubuntu:bionic",
+					Subpath: "my-subpath",
+				},
+			},
+		},
+	}, {
+		name: "local source image with subpath update source image and subpath",
+		seed: &Workload{
+			Spec: WorkloadSpec{
+				Source: &Source{
+					Image:   "ubuntu:bionic",
+					Subpath: "/opt",
+				},
+			},
+		},
+		update: &Workload{
+			Spec: WorkloadSpec{
+				Source: &Source{
+					Image:   "ubuntu:bionic",
+					Subpath: "/sys",
+				},
+			},
+		},
+		want: &Workload{
+			Spec: WorkloadSpec{
+				Source: &Source{
+					Image:   "ubuntu:bionic",
+					Subpath: "/sys",
+				},
+			},
+		},
 	}, {
 		name: "git",
 		seed: &Workload{
@@ -1092,13 +1187,7 @@ func TestWorkload_Merge(t *testing.T) {
 				},
 			},
 		},
-		want: &Workload{
-			Spec: WorkloadSpec{
-				Source: &Source{
-					Subpath: "test-path",
-				},
-			},
-		},
+		want: &Workload{},
 	}, {
 		name: "env",
 		seed: &Workload{

diff --git a/pkg/commands/testdata/workload-lsp-image-non-subPath.yaml b/pkg/commands/testdata/workload-lsp-image-non-subPath.yaml
@@ -0,0 +1,31 @@
+# Copyright 2023 VMware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: carto.run/v1alpha1
+kind: Workload
+metadata:
+  annotations:
+    local-source-proxy.apps.tanzu.vmware.com: :default-my-workload@sha256:978be33a7f0cbe89bf48fbb438846047a28e1298d6d10d0de2d64bdc102a9e69
+  labels:
+    apps.tanzu.vmware.com/workload-type: web
+  name: my-workload
+  namespace: default
+spec:
+  params:
+    - name: annotations
+      value:
+        autoscaling.knative.dev/minScale: "2"
+  image: my-registry/default-my-workload@sha256:978be33a7f0cbe89bf48fbb438846047a28e1298d6d10d0de2d64bdc102a9e69
+  source:
+    image: :default-my-workload@sha256:978be33a7f0cbe89bf48fbb438846047a28e1298d6d10d0de2d64bdc102a9e69