diff --git a/api/builtins/PrefixSuffixTransformer.go b/api/builtins/PrefixSuffixTransformer.go index 20265d592..ec9e8f7dc 100644 --- a/api/builtins/PrefixSuffixTransformer.go +++ b/api/builtins/PrefixSuffixTransformer.go @@ -7,9 +7,9 @@ import ( "errors" "sigs.k8s.io/kustomize/api/filters/prefixsuffix" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" "sigs.k8s.io/yaml" ) diff --git a/api/builtins/ReplicaCountTransformer.go b/api/builtins/ReplicaCountTransformer.go index 03fbf6f1e..120fab340 100644 --- a/api/builtins/ReplicaCountTransformer.go +++ b/api/builtins/ReplicaCountTransformer.go @@ -7,9 +7,9 @@ import ( "fmt" "sigs.k8s.io/kustomize/api/filters/replicacount" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" "sigs.k8s.io/yaml" ) diff --git a/api/filters/fieldspec/gvk.go b/api/filters/fieldspec/gvk.go index 42e21a80d..badd8eb0b 100644 --- a/api/filters/fieldspec/gvk.go +++ b/api/filters/fieldspec/gvk.go @@ -5,7 +5,7 @@ package fieldspec import ( "strings" - "sigs.k8s.io/kustomize/api/resid" + "sigs.k8s.io/kustomize/kyaml/resid" "sigs.k8s.io/kustomize/kyaml/yaml" ) diff --git a/api/filters/fieldspec/gvk_test.go b/api/filters/fieldspec/gvk_test.go index 0f9d35117..cda85612b 100644 --- a/api/filters/fieldspec/gvk_test.go +++ b/api/filters/fieldspec/gvk_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "sigs.k8s.io/kustomize/api/resid" + "sigs.k8s.io/kustomize/kyaml/resid" "sigs.k8s.io/kustomize/kyaml/yaml" ) diff --git a/api/filters/labels/labels_test.go b/api/filters/labels/labels_test.go index 25b910c85..c84b5421a 100644 --- a/api/filters/labels/labels_test.go +++ b/api/filters/labels/labels_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "sigs.k8s.io/kustomize/api/resid" filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) func TestLabels_Filter(t *testing.T) { diff --git a/api/filters/nameref/nameref.go b/api/filters/nameref/nameref.go index a048d97f1..fa2372780 100644 --- a/api/filters/nameref/nameref.go +++ b/api/filters/nameref/nameref.go @@ -6,11 +6,11 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/filters/fieldspec" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/kyaml/kio" + "sigs.k8s.io/kustomize/kyaml/resid" "sigs.k8s.io/kustomize/kyaml/yaml" ) diff --git a/api/filters/nameref/nameref_test.go b/api/filters/nameref/nameref_test.go index cc7e5de84..75f8288c4 100644 --- a/api/filters/nameref/nameref_test.go +++ b/api/filters/nameref/nameref_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/assert" "sigs.k8s.io/kustomize/api/provider" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) func TestNamerefFilter(t *testing.T) { diff --git a/api/filters/replacement/replacement.go b/api/filters/replacement/replacement.go index 8983d47e3..16d0c979c 100644 --- a/api/filters/replacement/replacement.go +++ b/api/filters/replacement/replacement.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" "sigs.k8s.io/kustomize/kyaml/yaml" ) diff --git a/api/internal/accumulator/loadconfigfromcrds.go b/api/internal/accumulator/loadconfigfromcrds.go index 383899f68..87d3de73c 100644 --- a/api/internal/accumulator/loadconfigfromcrds.go +++ b/api/internal/accumulator/loadconfigfromcrds.go @@ -12,8 +12,8 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" "sigs.k8s.io/yaml" ) diff --git a/api/internal/accumulator/loadconfigfromcrds_test.go b/api/internal/accumulator/loadconfigfromcrds_test.go index cae18898d..1f489c50b 100644 --- a/api/internal/accumulator/loadconfigfromcrds_test.go +++ b/api/internal/accumulator/loadconfigfromcrds_test.go @@ -11,8 +11,8 @@ import ( . "sigs.k8s.io/kustomize/api/internal/accumulator" "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/loader" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) // This defines two CRD's: Bee and MyKind. diff --git a/api/internal/accumulator/namereferencetransformer_test.go b/api/internal/accumulator/namereferencetransformer_test.go index d413f96dc..707f602d2 100644 --- a/api/internal/accumulator/namereferencetransformer_test.go +++ b/api/internal/accumulator/namereferencetransformer_test.go @@ -9,9 +9,9 @@ import ( "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/provider" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" resmaptest_test "sigs.k8s.io/kustomize/api/testutils/resmaptest" + "sigs.k8s.io/kustomize/kyaml/resid" ) const notEqualErrFmt = "expected (self) doesn't match actual (other): %v" diff --git a/api/internal/accumulator/refvartransformer_test.go b/api/internal/accumulator/refvartransformer_test.go index 446d90fd6..3ec1ad536 100644 --- a/api/internal/accumulator/refvartransformer_test.go +++ b/api/internal/accumulator/refvartransformer_test.go @@ -7,10 +7,10 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" resmaptest_test "sigs.k8s.io/kustomize/api/testutils/resmaptest" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) func TestRefVarTransformer(t *testing.T) { diff --git a/api/internal/accumulator/resaccumulator.go b/api/internal/accumulator/resaccumulator.go index b49db9b12..bac5e1fee 100644 --- a/api/internal/accumulator/resaccumulator.go +++ b/api/internal/accumulator/resaccumulator.go @@ -9,9 +9,9 @@ import ( "strings" "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) // ResAccumulator accumulates resources and the rules diff --git a/api/internal/accumulator/resaccumulator_test.go b/api/internal/accumulator/resaccumulator_test.go index 0c7bf521a..04d7edd9c 100644 --- a/api/internal/accumulator/resaccumulator_test.go +++ b/api/internal/accumulator/resaccumulator_test.go @@ -13,11 +13,11 @@ import ( . "sigs.k8s.io/kustomize/api/internal/accumulator" "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/provider" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" resmaptest_test "sigs.k8s.io/kustomize/api/testutils/resmaptest" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) func makeResAccumulator(t *testing.T) *ResAccumulator { diff --git a/api/internal/plugins/builtinconfig/loaddefaultconfig_test.go b/api/internal/plugins/builtinconfig/loaddefaultconfig_test.go index 67491a1a0..863a1ad38 100644 --- a/api/internal/plugins/builtinconfig/loaddefaultconfig_test.go +++ b/api/internal/plugins/builtinconfig/loaddefaultconfig_test.go @@ -9,8 +9,8 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/loader" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) func TestLoadDefaultConfigsFromFiles(t *testing.T) { diff --git a/api/internal/plugins/builtinconfig/namebackreferences.go b/api/internal/plugins/builtinconfig/namebackreferences.go index e458786c4..354f70e51 100644 --- a/api/internal/plugins/builtinconfig/namebackreferences.go +++ b/api/internal/plugins/builtinconfig/namebackreferences.go @@ -6,8 +6,8 @@ package builtinconfig import ( "strings" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) // NameBackReferences is an association between a gvk.GVK (a ReferralTarget) diff --git a/api/internal/plugins/builtinconfig/namebackreferences_test.go b/api/internal/plugins/builtinconfig/namebackreferences_test.go index 7333f173b..b9b60369b 100644 --- a/api/internal/plugins/builtinconfig/namebackreferences_test.go +++ b/api/internal/plugins/builtinconfig/namebackreferences_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) func TestMergeAll(t *testing.T) { diff --git a/api/internal/plugins/builtinconfig/transformerconfig_test.go b/api/internal/plugins/builtinconfig/transformerconfig_test.go index cdd882960..112a2d8cd 100644 --- a/api/internal/plugins/builtinconfig/transformerconfig_test.go +++ b/api/internal/plugins/builtinconfig/transformerconfig_test.go @@ -8,8 +8,8 @@ import ( "testing" . "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) func TestMakeDefaultConfig(t *testing.T) { diff --git a/api/internal/plugins/loader/loader.go b/api/internal/plugins/loader/loader.go index 0cbdfbe21..a52271256 100644 --- a/api/internal/plugins/loader/loader.go +++ b/api/internal/plugins/loader/loader.go @@ -20,10 +20,10 @@ import ( "sigs.k8s.io/kustomize/api/internal/plugins/fnplugin" "sigs.k8s.io/kustomize/api/internal/plugins/utils" "sigs.k8s.io/kustomize/api/konfig" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) // Loader loads plugins using a file loader (a different loader). diff --git a/api/internal/target/vars_test.go b/api/internal/target/vars_test.go index 6519fd632..901dcde90 100644 --- a/api/internal/target/vars_test.go +++ b/api/internal/target/vars_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/api/resid" kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) // To simplify tests, these vars specified in alphabetical order. diff --git a/api/resmap/idslice.go b/api/resmap/idslice.go index f2e46d440..a13d9d3c9 100644 --- a/api/resmap/idslice.go +++ b/api/resmap/idslice.go @@ -19,7 +19,7 @@ package resmap import ( "sort" - "sigs.k8s.io/kustomize/api/resid" + "sigs.k8s.io/kustomize/kyaml/resid" ) // IdSlice implements the sort interface. diff --git a/api/resmap/idslice_test.go b/api/resmap/idslice_test.go index 5898397e5..6e4e0fe8e 100644 --- a/api/resmap/idslice_test.go +++ b/api/resmap/idslice_test.go @@ -21,7 +21,7 @@ import ( "sort" "testing" - "sigs.k8s.io/kustomize/api/resid" + "sigs.k8s.io/kustomize/kyaml/resid" ) func TestLess(t *testing.T) { diff --git a/api/resmap/resmap.go b/api/resmap/resmap.go index 2b62482aa..19879550d 100644 --- a/api/resmap/resmap.go +++ b/api/resmap/resmap.go @@ -7,9 +7,9 @@ package resmap import ( "sigs.k8s.io/kustomize/api/ifc" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" "sigs.k8s.io/kustomize/kyaml/yaml" ) diff --git a/api/resmap/reswrangler.go b/api/resmap/reswrangler.go index 2bcd3a186..7dbf92565 100644 --- a/api/resmap/reswrangler.go +++ b/api/resmap/reswrangler.go @@ -8,9 +8,9 @@ import ( "fmt" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" kyaml "sigs.k8s.io/kustomize/kyaml/yaml" ) diff --git a/api/resmap/reswrangler_test.go b/api/resmap/reswrangler_test.go index 111f3b1cf..41fc238be 100644 --- a/api/resmap/reswrangler_test.go +++ b/api/resmap/reswrangler_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/assert" "sigs.k8s.io/kustomize/api/provider" - "sigs.k8s.io/kustomize/api/resid" . "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" resmaptest_test "sigs.k8s.io/kustomize/api/testutils/resmaptest" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) var depProvider = provider.NewDefaultDepProvider() diff --git a/api/resmap/selector_test.go b/api/resmap/selector_test.go index 3229e8379..922fb1c63 100644 --- a/api/resmap/selector_test.go +++ b/api/resmap/selector_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "sigs.k8s.io/kustomize/api/resid" . "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) func setupRMForPatchTargets(t *testing.T) ResMap { diff --git a/api/resource/factory.go b/api/resource/factory.go index a9a1006bc..791180e1d 100644 --- a/api/resource/factory.go +++ b/api/resource/factory.go @@ -13,9 +13,9 @@ import ( "sigs.k8s.io/kustomize/api/internal/generators" "sigs.k8s.io/kustomize/api/internal/kusterr" "sigs.k8s.io/kustomize/api/konfig" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/kyaml/kio" + "sigs.k8s.io/kustomize/kyaml/resid" "sigs.k8s.io/kustomize/kyaml/yaml" ) diff --git a/api/resource/idset.go b/api/resource/idset.go index eaa253381..5d6bd63ed 100644 --- a/api/resource/idset.go +++ b/api/resource/idset.go @@ -3,7 +3,7 @@ package resource -import "sigs.k8s.io/kustomize/api/resid" +import "sigs.k8s.io/kustomize/kyaml/resid" type IdSet struct { ids map[resid.ResId]bool diff --git a/api/resource/resource.go b/api/resource/resource.go index 826111d89..b3807507b 100644 --- a/api/resource/resource.go +++ b/api/resource/resource.go @@ -13,9 +13,9 @@ import ( "sigs.k8s.io/kustomize/api/filters/patchstrategicmerge" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/konfig" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/kyaml/kio" + "sigs.k8s.io/kustomize/kyaml/resid" kyaml "sigs.k8s.io/kustomize/kyaml/yaml" "sigs.k8s.io/yaml" ) diff --git a/api/resource/resource_test.go b/api/resource/resource_test.go index a946859ae..6640039ab 100644 --- a/api/resource/resource_test.go +++ b/api/resource/resource_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "sigs.k8s.io/kustomize/api/provider" - "sigs.k8s.io/kustomize/api/resid" . "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) var factory = provider.NewDefaultDepProvider().GetResourceFactory() diff --git a/api/testutils/resmaptest/rmbuilder.go b/api/testutils/resmaptest/rmbuilder.go index 7acfd90e9..5b725c3c4 100644 --- a/api/testutils/resmaptest/rmbuilder.go +++ b/api/testutils/resmaptest/rmbuilder.go @@ -7,9 +7,9 @@ import ( "testing" "sigs.k8s.io/kustomize/api/provider" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" + "sigs.k8s.io/kustomize/kyaml/resid" ) // Builds ResMaps for tests, with test-aware error handling. diff --git a/api/types/fieldspec.go b/api/types/fieldspec.go index 0bee70256..8d3579544 100644 --- a/api/types/fieldspec.go +++ b/api/types/fieldspec.go @@ -6,7 +6,7 @@ package types import ( "fmt" - "sigs.k8s.io/kustomize/api/resid" + "sigs.k8s.io/kustomize/kyaml/resid" ) // FieldSpec completely specifies a kustomizable field in a k8s API object. diff --git a/api/types/fieldspec_test.go b/api/types/fieldspec_test.go index 94c400658..c0518b94a 100644 --- a/api/types/fieldspec_test.go +++ b/api/types/fieldspec_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/api/resid" . "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) var mergeTests = []struct { diff --git a/api/types/patch_test.go b/api/types/patch_test.go index 3cde28008..633ef559c 100644 --- a/api/types/patch_test.go +++ b/api/types/patch_test.go @@ -3,8 +3,8 @@ package types_test import ( "testing" - "sigs.k8s.io/kustomize/api/resid" . "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) func TestPatchEquals(t *testing.T) { diff --git a/api/types/replacement.go b/api/types/replacement.go index ae67b38ce..46618b68b 100644 --- a/api/types/replacement.go +++ b/api/types/replacement.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "sigs.k8s.io/kustomize/api/resid" + "sigs.k8s.io/kustomize/kyaml/resid" ) const DefaultReplacementFieldPath = "metadata.name" diff --git a/api/types/selector.go b/api/types/selector.go index e1fc5c4b0..4ad1eb130 100644 --- a/api/types/selector.go +++ b/api/types/selector.go @@ -7,7 +7,7 @@ import ( "fmt" "regexp" - "sigs.k8s.io/kustomize/api/resid" + "sigs.k8s.io/kustomize/kyaml/resid" ) // Selector specifies a set of resources. diff --git a/api/types/selector_test.go b/api/types/selector_test.go index 8042dec7f..96ad99e89 100644 --- a/api/types/selector_test.go +++ b/api/types/selector_test.go @@ -3,8 +3,8 @@ package types_test import ( "testing" - "sigs.k8s.io/kustomize/api/resid" . "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/resid" ) func TestSelectorRegexMatchGvk(t *testing.T) { diff --git a/api/types/var.go b/api/types/var.go index a95315166..0ca5579c0 100644 --- a/api/types/var.go +++ b/api/types/var.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - "sigs.k8s.io/kustomize/api/resid" + "sigs.k8s.io/kustomize/kyaml/resid" ) // Var represents a variable whose value will be sourced diff --git a/api/types/var_test.go b/api/types/var_test.go index 4e5e6fe21..2ef14b2b8 100644 --- a/api/types/var_test.go +++ b/api/types/var_test.go @@ -9,7 +9,7 @@ import ( "testing" "gopkg.in/yaml.v2" - "sigs.k8s.io/kustomize/api/resid" + "sigs.k8s.io/kustomize/kyaml/resid" ) func TestGVK(t *testing.T) { diff --git a/cmd/gorepomod/usage.go b/cmd/gorepomod/usage.go index 11d577dca..47edaed87 100644 --- a/cmd/gorepomod/usage.go +++ b/cmd/gorepomod/usage.go @@ -1,9 +1,8 @@ // Code generated by internal/gen/main.go; DO NOT EDIT. package main - const ( - usageMsg = ` + usageMsg = ` Helps when you have a git repository with multiple Go modules. It handles tasks one might otherwise attempt with diff --git a/cmd/pluginator/internal/krmfunction/funcwrapper/statik.go b/cmd/pluginator/internal/krmfunction/funcwrapper/statik.go index 8973f8ba9..b0872121d 100644 --- a/cmd/pluginator/internal/krmfunction/funcwrapper/statik.go +++ b/cmd/pluginator/internal/krmfunction/funcwrapper/statik.go @@ -6,9 +6,7 @@ import ( "github.com/rakyll/statik/fs" ) - func init() { data := "PK\x03\x04\x14\x00\x08\x00\x08\x00\xc9\xa3yQ\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\n\x00 \x00go.mod.srcUT\x05\x00\x01\xda\xbe\xbe_\x84\xce=\x8e\xc20\x10\xc5\xf1:s\n\x97\xbbE\xc6c;\x1f\x9bb\xb9\x8b\x1dL\x18%\xc6!\x8e#\xc1\xe9QDE\x01\xd4\xef'\xbd\x7f\x88\xc7\x06\x99\xe6\x932\xb2\x8fn\xb1bSHHP$\x1e\x12\x8e\x7f 9\xca1\xa75\x06\xbe{ig\x16\x1ba\x83\xd5;1\xdel\x98v\xd3\xa1y5\xcfA\xa1F\x82\xdf=e\x9el\xef\xc5\xb7#\xf1\x7f\xf8l\x08\xa9\xd4\xa4I)M\xdaPkLI\xb5\xb6\x8d\xab|\xd7\xb4\x0e\x1e\x01\x00\x00\xff\xffPK\x07\x08\xf6G\x8e3\x9e\x00\x00\x00\n\x01\x00\x00PK\x03\x04\x14\x00\x08\x00\x08\x00\xe5\x8ewQ\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x07\x00 \x00main.goUT\x05\x00\x01\x7f\xf7\xbb_\x94TMo\xdc6\x14<\x93\xbf\xe2EE\x0b\n\x10$\xf4V$\xd8Sl\xa7\x05j\xc3\xd8\x1a\xb9\x049\xd0\xd4\xa3B,?\x84Gj7\xe9B\xff\xbd\xa0\xa4\xfdl\x1c8\xc7}\x1a\xce\xcc\x9b\x1d\xb2i\xe0\xe9\x8b\x89\xa0\x8dE\xd8\x19k\xe1\x19\xa1\xa7\xa00FlA\xfa\x16\xd0=c\xdbb\x0b)@o\x87\xcex\x99\x02\xd5\x9c\xf7Rmd\x87\xa0\x07\xafv$\xfb\x1e)\x92\xe2\xdc\xb8>P\x02\xc1Y\xa1]*8+B,8gE4]\xac7\x7f\xc4\xda\x84f3\xc4\x14\x9c\xf9\x17\x1b\xd9\x9b\xa6\xa7\xb05-R\xf1C\x14at\xb2\x7f\x19\xb3\xf9&\x9dm\xb4o4I\x87\xbb@\x9bkl\x06\x14\xbc\xe4\xbci|\xb0\xc6'\x9e\xcd\x83\x93\xc6\x8b\x12\xf6\x9cm%-K\xc2\xacV\xbf\x0f^\x9bn \xf9l\x91\xb3\x1e\xde\xae\xe0\xe0\xb6~\xc0\xdd\x0dj9\xd8t\x83\xfd\xe32\x15%g\xf3\xd9;\xa9R\xa0o\xf9\xc8B\xf6\x80\xbbe(\xfa\xfa\x03\xa65\xc60\x90\xc2\xc3\xb0\xac`\x9a\xdf#-9\x8b\xb2\xe4lv\xf4'\xda\x1c\xf1%\xdd\xe3\xf9'\xc1\x19\xf3\xc6.$w\x06m\xfbQZ\xd3\xceD\x15\\\xd8*\xf9\xe4s\xd2\xff\xdb\xc4\x94y\x7f;&W\xaf\xcf>\xed\xc7Kh}7x\x95L\xf0s8\xb0\x02'\xfbO1\x91\xf1\xddg\xe3\x13\x92\x96\n\xf7\xe3~\xe4\x9c)\xd7f\xea\x13\xf3\xfb\xe0\x9c\xf4\xad8g\xac\xa6\x16\x89\x12\x90(P\xfe'\xb2\xe0\xbd\xec\xab<9\xad\xbcx\xcf\x9b\xaf\xa7\xefw\x14\xdc\xfa!\xb4\xf8\x8f5\n/8\xeb\xbf\x12\xbaXr\xc6\x8c\x9eX\xde\xac\xc0\x1b;\x913\xc24\x90\xcfc\xce\xd8\xc8\x19ke\x92SbG\xc5\x0e\xd3M\x1eRp\x97\xfb\x8a\x1fd\xf13r\x1f\xa5\x1d\xf0(\x97\xbbY\xdfK\x8a_\xa4\x15G7\xaf\xe3\xe3\x8ce\xc4j\xe9\xeeRZq\xd1\x9b\n\x8e\x9a\xaf#\x9d0\xa9\x82\xb0\x99J?3\x8b\xa5zO$}\xd4\x81\x1c\xd2\\\xc1\xf2]\x06N<\xb3\x95t\xc2\x88\xf9\xbf\xcc\xb2\xdf\xd3\xbd\x14\x9e\x94G@\x1b\x11\x8c\x86\xee\x05\x03\x1f\xd0#\xe5b\xffO\xfe\xbc8+\xe8\x0eH\x14?\xa3\xcf\xe7\x06^\x95\xe9@:K\xd4O\xe1\xacz\xaf\x0du\x19xc9\x1bK~8\xf3v\x05\xca\xb5\xf5\xedWTC\xf6\xfa\xee\x9aI\xbbT?\x92\xf1\xc9z\x81DY.\xc4\xfa\xf6\xabI\xe2\xf7\x92\xb3\x91\x8f\xd7\xcf\xda\xcb\x05\xd6\n\xce\xaei \xe2\xecW5\xdf\xc1\xe99\xd4\x87\xf0\xb5\xaa\xc5\xf7\xef\xf8\xbc\xc1\x9b%\xfc\xd3r\x15d\xc3\xb7\x99J\x8bB/\xfa\xa0\xe6\x17\xe3\xd7_\xb6`\"\xf8\x90`\x9b_\xa8\xa2\x02\xad\xa6-\x0e\x14\xfaS\x91\xfbZ|\xae\xa6\xa8F\xfe_\x00\x00\x00\xff\xffPK\x07\x08\xb5\xa26N\xb6\x02\x00\x00\xab\x06\x00\x00PK\x01\x02\x14\x03\x14\x00\x08\x00\x08\x00\xc9\xa3yQ\xf6G\x8e3\x9e\x00\x00\x00\n\x01\x00\x00\n\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xa0\x81\x00\x00\x00\x00go.mod.srcUT\x05\x00\x01\xda\xbe\xbe_PK\x01\x02\x14\x03\x14\x00\x08\x00\x08\x00\xe5\x8ewQ\xb5\xa26N\xb6\x02\x00\x00\xab\x06\x00\x00\x07\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xa0\x81\xdf\x00\x00\x00main.goUT\x05\x00\x01\x7f\xf7\xbb_PK\x05\x06\x00\x00\x00\x00\x02\x00\x02\x00\x7f\x00\x00\x00\xd3\x03\x00\x00\x00\x00" - fs.Register(data) - } - \ No newline at end of file + fs.Register(data) +} diff --git a/api/resid/gvk.go b/kyaml/resid/gvk.go similarity index 100% rename from api/resid/gvk.go rename to kyaml/resid/gvk.go diff --git a/api/resid/gvk_test.go b/kyaml/resid/gvk_test.go similarity index 100% rename from api/resid/gvk_test.go rename to kyaml/resid/gvk_test.go diff --git a/api/resid/resid.go b/kyaml/resid/resid.go similarity index 100% rename from api/resid/resid.go rename to kyaml/resid/resid.go diff --git a/api/resid/resid_test.go b/kyaml/resid/resid_test.go similarity index 100% rename from api/resid/resid_test.go rename to kyaml/resid/resid_test.go diff --git a/kyaml/yaml/internal/k8sgen/pkg/labels/selector.go b/kyaml/yaml/internal/k8sgen/pkg/labels/selector.go index 73c5ae6a6..2999eddd5 100644 --- a/kyaml/yaml/internal/k8sgen/pkg/labels/selector.go +++ b/kyaml/yaml/internal/k8sgen/pkg/labels/selector.go @@ -27,6 +27,7 @@ import ( "strings" "log" + "sigs.k8s.io/kustomize/kyaml/yaml/internal/k8sgen/pkg/selection" "sigs.k8s.io/kustomize/kyaml/yaml/internal/k8sgen/pkg/util/sets" "sigs.k8s.io/kustomize/kyaml/yaml/internal/k8sgen/pkg/util/validation" diff --git a/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go b/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go index f3ab7e7ee..0e1edf8bd 100644 --- a/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go +++ b/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go @@ -4,8 +4,9 @@ package main_test import ( - kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" "testing" + + kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" ) func TestLegacyOrderTransformer(t *testing.T) { diff --git a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go index d7c63a7dd..59de29689 100644 --- a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go +++ b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go @@ -160,8 +160,8 @@ target: name: myDeploy path: jsonpatch.json `, -target, -` + target, + ` apiVersion: apps/v1 kind: Deployment metadata: @@ -206,8 +206,8 @@ target: name: myDeploy path: jsonpatch.json `, -target, -` + target, + ` apiVersion: apps/v1 kind: Deployment metadata: @@ -246,8 +246,8 @@ target: name: myDeploy jsonOp: '[{"op": "add", "path": "/spec/template/spec/dnsPolicy", "value": "ClusterFirst"}]' `, -target, -` + target, + ` apiVersion: apps/v1 kind: Deployment metadata: @@ -286,8 +286,8 @@ jsonOp: |- path: /spec/template/spec/dnsPolicy value: ClusterFirst `, -target, -` + target, + ` apiVersion: apps/v1 kind: Deployment metadata: diff --git a/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go b/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go index a13ec13c3..bcffc0370 100644 --- a/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go +++ b/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go @@ -314,7 +314,6 @@ spec: `) } - func TestStrategicMergeTransformerWrongNamespace(t *testing.T) { th := kusttest_test.MakeEnhancedHarness(t). PrepBuiltin("PatchStrategicMergeTransformer") diff --git a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go index 169f4e96b..7804a1c3f 100644 --- a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go +++ b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go @@ -6,6 +6,7 @@ package main import ( "errors" + "sigs.k8s.io/kustomize/api/filters/prefixsuffix" "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" diff --git a/plugin/builtin/replacementtransformer/ReplacementTransformer.go b/plugin/builtin/replacementtransformer/ReplacementTransformer.go index 49ad499b2..0b9fd993c 100644 --- a/plugin/builtin/replacementtransformer/ReplacementTransformer.go +++ b/plugin/builtin/replacementtransformer/ReplacementTransformer.go @@ -6,6 +6,7 @@ package main import ( "fmt" + "sigs.k8s.io/kustomize/api/filters/replacement" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" diff --git a/plugin/someteam.example.com/v1/calvinduplicator/CalvinDuplicator.go b/plugin/someteam.example.com/v1/calvinduplicator/CalvinDuplicator.go index 9e87218cb..7fcbe9654 100644 --- a/plugin/someteam.example.com/v1/calvinduplicator/CalvinDuplicator.go +++ b/plugin/someteam.example.com/v1/calvinduplicator/CalvinDuplicator.go @@ -5,6 +5,7 @@ package main import ( "fmt" + "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/yaml" )