kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Skip updating empty containers in image tranformer

Browse Source
This commit is contained in:
Haiyan Meng
2019-11-21 11:53:21 -08:00
parent 964a5082b1
commit 752ca4b37c
5 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/builtins/ImageTagTransformer.go
View File

@@ -82,7 +82,7 @@ func (p *ImageTagTransformerPlugin) findAndReplaceImage(obj map[string]interface
updated := false updated := false
for _, path := range paths { for _, path := range paths {
containers, found := obj[path] containers, found := obj[path]
if found { if found && containers != nil {
if _, err := p.updateContainers(containers); err != nil { if _, err := p.updateContainers(containers); err != nil {
return err return err
} }

2
api/builtins/PatchJson6902Transformer.go
View File

@@ -6,7 +6,7 @@ package builtins
import ( import (
"fmt" "fmt"
jsonpatch "github.com/evanphx/json-patch" "github.com/evanphx/json-patch"
"github.com/pkg/errors" "github.com/pkg/errors"
"sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/ifc"
"sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resid"

2
api/builtins/PatchTransformer.go
View File

@@ -6,7 +6,7 @@ package builtins
import ( import (
"fmt" "fmt"
jsonpatch "github.com/evanphx/json-patch" "github.com/evanphx/json-patch"
"github.com/pkg/errors" "github.com/pkg/errors"
"sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resmap"
"sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/resource"

2
plugin/builtin/imagetagtransformer/ImageTagTransformer.go
View File

@@ -86,7 +86,7 @@ func (p *plugin) findAndReplaceImage(obj map[string]interface{}) error {
updated := false updated := false
for _, path := range paths { for _, path := range paths {
containers, found := obj[path] containers, found := obj[path]
if found { if found && containers != nil {
if _, err := p.updateContainers(containers); err != nil { if _, err := p.updateContainers(containers); err != nil {
return err return err
} }

24
plugin/builtin/imagetagtransformer/ImageTagTransformer_test.go
View File

@@ -4,7 +4,6 @@
package main_test package main_test
import ( import (
"strings"
"testing" "testing"
"sigs.k8s.io/kustomize/api/testutils/kusttest" "sigs.k8s.io/kustomize/api/testutils/kusttest"
@@ -379,7 +378,7 @@ func TestImageTagTransformerEmptyContainers(t *testing.T) {
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
err := th.ErrorFromLoadAndRunTransformer(` rm := th.LoadAndRunTransformer(`
apiVersion: builtin apiVersion: builtin
kind: ImageTagTransformer kind: ImageTagTransformer
metadata: metadata:
@@ -399,13 +398,16 @@ spec:
containers: containers:
initContainers: initContainers:
`) `)
th.AssertActualEqualsExpected(rm, `
expectedErrMsg := "containers path is not of type []interface{} but <nil>" apiVersion: v1
if err == nil { group: apps
t.Fatalf("expected error: %s; got nothing", expectedErrMsg) kind: Deployment
} metadata:
name: deploy1
if !strings.Contains(err.Error(), expectedErrMsg) { spec:
t.Fatalf("expected error: %s; got error: %s", expectedErrMsg, err.Error()) template:
} spec:
containers: null
initContainers: null
`)
} }