Nit fixes and proper RunFns integration

This commit is contained in:
Jonathan Wong
2019-12-03 00:17:12 -08:00
parent e46108ada0
commit dff30b926e
4 changed files with 19 additions and 18 deletions

View File

@@ -16,6 +16,8 @@ import (
// RunFns runs the set of configuration functions in a local directory against
// the Resources in that directory
type RunFns struct {
StorageMounts []filters.StorageMount
// Path is the path to the directory containing functions
Path string
@@ -90,7 +92,9 @@ func (r *RunFns) init() {
// if containerFilterProvider hasn't been set, use the default
if r.containerFilterProvider == nil {
r.containerFilterProvider = func(image, path string, api *yaml.RNode) kio.Filter {
cf := &filters.ContainerFilter{Image: image, Config: api}
defaultMount := filters.StorageMount{}
r.StorageMounts = append(r.StorageMounts, defaultMount)
cf := &filters.ContainerFilter{Image: image, Config: api, StorageMounts: r.StorageMounts}
return cf
}
}

View File

@@ -28,7 +28,10 @@ kind:
return
}
filter := instance.containerFilterProvider("example.com:version", "", api)
assert.Equal(t, &filters.ContainerFilter{Image: "example.com:version", Config: api}, filter)
defaultMount:= filters.StorageMount{}
mounts := []filters.StorageMount{}
mounts = append(mounts, defaultMount)
assert.Equal(t, &filters.ContainerFilter{Image: "example.com:version", Config: api, StorageMounts: mounts}, filter)
}
func TestCmd_Execute(t *testing.T) {