kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-13 01:50:55 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

WIP residPackage

Browse Source
This commit is contained in:
Jeffrey Regan
2018-10-04 20:24:22 -07:00
parent 239db504ff
commit c9887e8c15
40 changed files with 242 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/patch/transformer/factory.go
View File

@@ -18,23 +18,23 @@ package transformer
import (
"fmt"
"sigs.k8s.io/kustomize/pkg/ifc"
"sigs.k8s.io/kustomize/pkg/resid"
"github.com/evanphx/json-patch"
"github.com/krishicks/yaml-patch"
"sigs.k8s.io/kustomize/pkg/gvk"
"sigs.k8s.io/kustomize/pkg/loader"
"sigs.k8s.io/kustomize/pkg/patch"
"sigs.k8s.io/kustomize/pkg/resource"
"sigs.k8s.io/kustomize/pkg/transformers"
)
// PatchJson6902Factory makes Json6902 transformers
type PatchJson6902Factory struct {
loader loader.Loader
loader ifc.Loader
}
// NewPatchJson6902Factory returns a new PatchJson6902Factory.
func NewPatchJson6902Factory(l loader.Loader) PatchJson6902Factory {
func NewPatchJson6902Factory(l ifc.Loader) PatchJson6902Factory {
return PatchJson6902Factory{loader: l}
}
@@ -61,7 +61,7 @@ func (f PatchJson6902Factory) makeOnePatchJson6902Transformer(p patch.Json6902)
return nil, fmt.Errorf("must specify the path for a json patch file")
}
targetId := resource.NewResIdWithPrefixNamespace(
targetId := resid.NewResIdWithPrefixNamespace(
gvk.Gvk{
Group: p.Target.Group,
Version: p.Target.Version,

5
pkg/patch/transformer/factory_test.go
View File

@@ -25,6 +25,7 @@ import (
"sigs.k8s.io/kustomize/pkg/gvk"
"sigs.k8s.io/kustomize/pkg/internal/loadertest"
"sigs.k8s.io/kustomize/pkg/patch"
"sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/resource"
)
@@ -179,7 +180,7 @@ func TestNewPatchJson6902FactoryMulti(t *testing.T) {
t.Fatal("the returned transformer should not be nil")
}
id := resource.NewResId(gvk.FromKind("foo"), "some-name")
id := resid.NewResId(gvk.FromKind("foo"), "some-name")
base := resmap.ResMap{
id: resource.NewResourceFromMap(
map[string]interface{}{
@@ -293,7 +294,7 @@ func TestNewPatchJson6902FactoryMultiConflict(t *testing.T) {
t.Fatal("the returned transformer should not be nil")
}
id := resource.NewResId(gvk.FromKind("foo"), "some-name")
id := resid.NewResId(gvk.FromKind("foo"), "some-name")
base := resmap.ResMap{
id: resource.NewResourceFromMap(
map[string]interface{}{

6
pkg/patch/transformer/patchjson6902json.go
View File

@@ -18,21 +18,21 @@ package transformer
import (
"github.com/evanphx/json-patch"
"sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/resource"
"sigs.k8s.io/kustomize/pkg/transformers"
)
// patchJson6902JSONTransformer applies patches.
type patchJson6902JSONTransformer struct {
target resource.ResId
target resid.ResId
patch jsonpatch.Patch
}
var _ transformers.Transformer = &patchJson6902JSONTransformer{}
// newPatchJson6902JSONTransformer constructs a PatchJson6902 transformer.
func newPatchJson6902JSONTransformer(t resource.ResId, p jsonpatch.Patch) (transformers.Transformer, error) {
func newPatchJson6902JSONTransformer(t resid.ResId, p jsonpatch.Patch) (transformers.Transformer, error) {
if len(p) == 0 {
return transformers.NewNoOpTransformer(), nil
}

3
pkg/patch/transformer/patchjson6902json_test.go
View File

@@ -21,12 +21,13 @@ import (
"testing"
"github.com/evanphx/json-patch"
"sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/resource"
)
func TestJsonPatchJSONTransformer_Transform(t *testing.T) {
id := resource.NewResId(deploy, "deploy1")
id := resid.NewResId(deploy, "deploy1")
base := resmap.ResMap{
id: resource.NewResourceFromMap(
map[string]interface{}{

6
pkg/patch/transformer/patchjson6902yaml.go
View File

@@ -19,21 +19,21 @@ package transformer
import (
"github.com/ghodss/yaml"
"github.com/krishicks/yaml-patch"
"sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/resource"
"sigs.k8s.io/kustomize/pkg/transformers"
)
// patchJson6902YAMLTransformer applies patches.
type patchJson6902YAMLTransformer struct {
target resource.ResId
target resid.ResId
patch yamlpatch.Patch
}
var _ transformers.Transformer = &patchJson6902YAMLTransformer{}
// newPatchJson6902YAMLTransformer constructs a PatchJson6902 transformer.
func newPatchJson6902YAMLTransformer(t resource.ResId, p yamlpatch.Patch) (transformers.Transformer, error) {
func newPatchJson6902YAMLTransformer(t resid.ResId, p yamlpatch.Patch) (transformers.Transformer, error) {
if len(p) == 0 {
return transformers.NewNoOpTransformer(), nil
}

3
pkg/patch/transformer/patchjson6902yaml_test.go
View File

@@ -22,6 +22,7 @@ import (
"github.com/krishicks/yaml-patch"
"sigs.k8s.io/kustomize/pkg/gvk"
"sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/resource"
)
@@ -29,7 +30,7 @@ import (
var deploy = gvk.Gvk{Group: "apps", Version: "v1", Kind: "Deployment"}
func TestJsonPatchYAMLTransformer_Transform(t *testing.T) {
id := resource.NewResId(deploy, "deploy1")
id := resid.NewResId(deploy, "deploy1")
base := resmap.ResMap{
id: resource.NewResourceFromMap(
map[string]interface{}{

5
pkg/patch/transformer/util.go
View File

@@ -19,14 +19,15 @@ package transformer
import (
"fmt"
"sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/resource"
)
func findTargetObj(m resmap.ResMap, targetId resource.ResId) (*resource.Resource, error) {
func findTargetObj(m resmap.ResMap, targetId resid.ResId) (*resource.Resource, error) {
matchedIds := m.FindByGVKN(targetId)
if targetId.Namespace() != "" {
var ids []resource.ResId
var ids []resid.ResId
for _, id := range matchedIds {
if id.Namespace() == targetId.Namespace() {
ids = append(ids, id)