kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-14 10:30:59 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

remove error from NewContainer

Browse Source
This commit is contained in:
Donny Xia
2020-09-24 11:37:34 -07:00
parent 52016b22dd
commit acdfd9a920
4 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kyaml/fn/runtime/container/container.go
View File

@@ -185,8 +185,8 @@ func (c *Filter) getCommand() (string, []string) {
} }
// NewContainer returns a new container filter // NewContainer returns a new container filter
func NewContainer(spec runtimeutil.ContainerSpec, uidgid string) (Filter, error) { func NewContainer(spec runtimeutil.ContainerSpec, uidgid string) Filter {
f := Filter{ContainerSpec: spec, UIDGID: uidgid} f := Filter{ContainerSpec: spec, UIDGID: uidgid}
return f, nil return f
} }

5
kyaml/fn/runtime/container/container_test.go
View File

@@ -125,10 +125,7 @@ metadata:
t.FailNow() t.FailNow()
} }
instance, err := NewContainer(tt.containerSpec, tt.UIDGID) instance := NewContainer(tt.containerSpec, tt.UIDGID)
if err != nil {
t.Fatal(err)
}
instance.Exec.FunctionConfig = cfg instance.Exec.FunctionConfig = cfg
instance.Env = append(instance.Env, "KYAML_TEST=FOO") instance.Env = append(instance.Env, "KYAML_TEST=FOO")
instance.setupExec() instance.setupExec()

5
kyaml/runfn/runfn.go
View File

@@ -426,7 +426,7 @@ func (r *RunFns) ffp(spec runtimeutil.FunctionSpec, api *yaml.RNode, currentUser
if err != nil { if err != nil {
return nil, err return nil, err
} }
c, err := container.NewContainer( c := container.NewContainer(
runtimeutil.ContainerSpec{ runtimeutil.ContainerSpec{
Image: spec.Container.Image, Image: spec.Container.Image,
Network: spec.Container.Network, Network: spec.Container.Network,
@@ -435,9 +435,6 @@ func (r *RunFns) ffp(spec runtimeutil.FunctionSpec, api *yaml.RNode, currentUser
}, },
uidgid, uidgid,
) )
if err != nil {
return nil, err
}
cf := &c cf := &c
cf.Exec.FunctionConfig = api cf.Exec.FunctionConfig = api
cf.Exec.GlobalScope = r.GlobalScope cf.Exec.GlobalScope = r.GlobalScope

15
kyaml/runfn/runfn_test.go
View File

@@ -68,10 +68,7 @@ kind:
return return
} }
filter, _ := instance.functionFilterProvider(spec, api, currentUser) filter, _ := instance.functionFilterProvider(spec, api, currentUser)
c, err := container.NewContainer(runtimeutil.ContainerSpec{Image: "example.com:version"}, "nobody") c := container.NewContainer(runtimeutil.ContainerSpec{Image: "example.com:version"}, "nobody")
if err != nil {
t.Fatal(err)
}
cf := &c cf := &c
cf.Exec.FunctionConfig = api cf.Exec.FunctionConfig = api
assert.Equal(t, cf, filter) assert.Equal(t, cf, filter)
@@ -101,10 +98,7 @@ kind:
return return
} }
filter, _ := instance.functionFilterProvider(spec, api, currentUser) filter, _ := instance.functionFilterProvider(spec, api, currentUser)
c, err := container.NewContainer(runtimeutil.ContainerSpec{Image: "example.com:version"}, "1:2") c := container.NewContainer(runtimeutil.ContainerSpec{Image: "example.com:version"}, "1:2")
if err != nil {
t.Fatal(err)
}
cf := &c cf := &c
cf.Exec.FunctionConfig = api cf.Exec.FunctionConfig = api
assert.Equal(t, cf, filter) assert.Equal(t, cf, filter)
@@ -135,10 +129,7 @@ kind:
return return
} }
filter, _ := instance.functionFilterProvider(spec, api, currentUser) filter, _ := instance.functionFilterProvider(spec, api, currentUser)
c, err := container.NewContainer(runtimeutil.ContainerSpec{Image: "example.com:version"}, "nobody") c := container.NewContainer(runtimeutil.ContainerSpec{Image: "example.com:version"}, "nobody")
if err != nil {
t.Fatal(err)
}
cf := &c cf := &c
cf.Exec.FunctionConfig = api cf.Exec.FunctionConfig = api
cf.Exec.GlobalScope = true cf.Exec.GlobalScope = true