Merge pull request GoogleContainerTools#1386 from dgageot/fix-1370

Don’t panic if image field is not of type string
beastpu · Dec 12, 2018 · 5ad5717 · 5ad5717
2 parents dd8ffa4 + a902e9d
commit 5ad5717
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/pkg/skaffold/deploy/kubectl/images.go b/pkg/skaffold/deploy/kubectl/images.go
@@ -67,7 +67,11 @@ func (r *imageReplacer) Matches(key string) bool {
 }
 
 func (r *imageReplacer) NewValue(old interface{}) (bool, interface{}) {
-	image := old.(string)
+	image, ok := old.(string)
+	if !ok {
+		return false, nil
+	}
+
 	found, tag := r.parseAndReplace(image)
 	if !found {
 		subbedImage := r.substituteRepoIntoImage(image)

diff --git a/pkg/skaffold/deploy/kubectl/images_test.go b/pkg/skaffold/deploy/kubectl/images_test.go
@@ -126,3 +126,16 @@ func TestReplaceInvalidManifest(t *testing.T) {
 
 	testutil.CheckError(t, true, err)
 }
+
+func TestReplaceNonStringImageField(t *testing.T) {
+	manifests := ManifestList{[]byte(`
+apiVersion: v1
+image:
+- value1
+- value2
+`)}
+
+	output, err := manifests.ReplaceImages(nil, "")
+
+	testutil.CheckErrorAndDeepEqual(t, false, err, manifests.String(), output.String())
+}