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

make k8sdeps.NewFactory() importable

Browse Source
This commit is contained in:
Benjamin Elder
2018-10-25 14:26:34 -07:00
parent 292ed0e605
commit 76ba38cec5
33 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/vendor_kustomize.sh
View File

@@ -72,14 +72,14 @@ function getKustomizeDeps {
function updateK8s { function updateK8s {
# Copy k8sdeps from Kustomize to kubectl # Copy k8sdeps from Kustomize to kubectl
mkdir -p $GOPATH/src/k8s.io/kubernetes/pkg/kubectl/kustomize mkdir -p $GOPATH/src/k8s.io/kubernetes/pkg/kubectl/kustomize
cp -r $GOPATH/src/sigs.k8s.io/kustomize/internal/k8sdeps \ cp -r $GOPATH/src/sigs.k8s.io/kustomize/k8sdeps \
$GOPATH/src/k8s.io/kubernetes/pkg/kubectl/kustomize/k8sdeps $GOPATH/src/k8s.io/kubernetes/pkg/kubectl/kustomize/k8sdeps
# Change import path of k8sdeps # Change import path of k8sdeps
find $GOPATH/src/k8s.io/kubernetes/pkg/kubectl/kustomize/k8sdeps \ find $GOPATH/src/k8s.io/kubernetes/pkg/kubectl/kustomize/k8sdeps \
-type f -name "*.go" | \ -type f -name "*.go" | \
xargs sed -i \ xargs sed -i \
's!sigs.k8s.io/kustomize/internal/k8sdeps!k8s.io/kubernetes/pkg/kubectl/kustomize/k8sdeps!' 's!sigs.k8s.io/kustomize/k8sdeps!k8s.io/kubernetes/pkg/kubectl/kustomize/k8sdeps!'
# Add kustomize command to kubectl # Add kustomize command to kubectl

0
internal/k8sdeps/configmapandsecret/configmapfactory.go → k8sdeps/configmapandsecret/configmapfactory.go
View File

0
internal/k8sdeps/configmapandsecret/configmapfactory_test.go → k8sdeps/configmapandsecret/configmapfactory_test.go
View File

0
internal/k8sdeps/configmapandsecret/kv.go → k8sdeps/configmapandsecret/kv.go
View File

0
internal/k8sdeps/configmapandsecret/kv_test.go → k8sdeps/configmapandsecret/kv_test.go
View File

0
internal/k8sdeps/configmapandsecret/secretfactory.go → k8sdeps/configmapandsecret/secretfactory.go
View File

0
internal/k8sdeps/doc.go → k8sdeps/doc.go
View File

6
internal/k8sdeps/factory.go → k8sdeps/factory.go
View File

@@ -18,9 +18,9 @@ limitations under the License.
package k8sdeps package k8sdeps
import ( import (
"sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/internal/k8sdeps/transformer" "sigs.k8s.io/kustomize/k8sdeps/transformer"
"sigs.k8s.io/kustomize/internal/k8sdeps/validator" "sigs.k8s.io/kustomize/k8sdeps/validator"
"sigs.k8s.io/kustomize/pkg/factory" "sigs.k8s.io/kustomize/pkg/factory"
) )

2
internal/k8sdeps/kunstruct/factory.go → k8sdeps/kunstruct/factory.go
View File

@@ -23,7 +23,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/util/yaml" "k8s.io/apimachinery/pkg/util/yaml"
"sigs.k8s.io/kustomize/internal/k8sdeps/configmapandsecret" "sigs.k8s.io/kustomize/k8sdeps/configmapandsecret"
"sigs.k8s.io/kustomize/pkg/fs" "sigs.k8s.io/kustomize/pkg/fs"
"sigs.k8s.io/kustomize/pkg/ifc" "sigs.k8s.io/kustomize/pkg/ifc"
"sigs.k8s.io/kustomize/pkg/types" "sigs.k8s.io/kustomize/pkg/types"

0
internal/k8sdeps/kunstruct/factory_test.go → k8sdeps/kunstruct/factory_test.go
View File

0
internal/k8sdeps/kunstruct/kunstruct.go → k8sdeps/kunstruct/kunstruct.go
View File

0
internal/k8sdeps/kunstruct/kunstruct_test.go → k8sdeps/kunstruct/kunstruct_test.go
View File

4
internal/k8sdeps/transformer/factory.go → k8sdeps/transformer/factory.go
View File

@@ -18,8 +18,8 @@ limitations under the License.
package transformer package transformer
import ( import (
"sigs.k8s.io/kustomize/internal/k8sdeps/transformer/hash" "sigs.k8s.io/kustomize/k8sdeps/transformer/hash"
"sigs.k8s.io/kustomize/internal/k8sdeps/transformer/patch" "sigs.k8s.io/kustomize/k8sdeps/transformer/patch"
"sigs.k8s.io/kustomize/pkg/resource" "sigs.k8s.io/kustomize/pkg/resource"
"sigs.k8s.io/kustomize/pkg/transformers" "sigs.k8s.io/kustomize/pkg/transformers"
) )

0
internal/k8sdeps/transformer/hash/hash.go → k8sdeps/transformer/hash/hash.go
View File

0
internal/k8sdeps/transformer/hash/hash_test.go → k8sdeps/transformer/hash/hash_test.go
View File

0
internal/k8sdeps/transformer/hash/namehash.go → k8sdeps/transformer/hash/namehash.go
View File

2
internal/k8sdeps/transformer/hash/namehash_test.go → k8sdeps/transformer/hash/namehash_test.go
View File

@@ -20,7 +20,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/pkg/ifc" "sigs.k8s.io/kustomize/pkg/ifc"
"sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resmap"

0
internal/k8sdeps/transformer/patch/patch.go → k8sdeps/transformer/patch/patch.go
View File

2
internal/k8sdeps/transformer/patch/patch_test.go → k8sdeps/transformer/patch/patch_test.go
View File

@@ -21,7 +21,7 @@ import (
"strings" "strings"
"testing" "testing"
"sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/gvk"
"sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resmap"

0
internal/k8sdeps/transformer/patch/patchconflictdetector.go → k8sdeps/transformer/patch/patchconflictdetector.go
View File

0
internal/k8sdeps/validator/validators.go → k8sdeps/validator/validators.go
View File

2
kustomize.go
View File

@@ -20,7 +20,7 @@ import (
"os" "os"
"github.com/golang/glog" "github.com/golang/glog"
"sigs.k8s.io/kustomize/internal/k8sdeps" "sigs.k8s.io/kustomize/k8sdeps"
"sigs.k8s.io/kustomize/pkg/commands" "sigs.k8s.io/kustomize/pkg/commands"
) )

2
pkg/commands/build/build_test.go
View File

@@ -26,7 +26,7 @@ import (
"testing" "testing"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"sigs.k8s.io/kustomize/internal/k8sdeps" "sigs.k8s.io/kustomize/k8sdeps"
"sigs.k8s.io/kustomize/pkg/commands/kustfile" "sigs.k8s.io/kustomize/pkg/commands/kustfile"
"sigs.k8s.io/kustomize/pkg/constants" "sigs.k8s.io/kustomize/pkg/constants"
"sigs.k8s.io/kustomize/pkg/fs" "sigs.k8s.io/kustomize/pkg/fs"

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

@@ -22,7 +22,7 @@ import (
"testing" "testing"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/gvk"
"sigs.k8s.io/kustomize/pkg/internal/loadertest" "sigs.k8s.io/kustomize/pkg/internal/loadertest"
"sigs.k8s.io/kustomize/pkg/patch" "sigs.k8s.io/kustomize/pkg/patch"

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

@@ -21,7 +21,7 @@ import (
"testing" "testing"
"github.com/evanphx/json-patch" "github.com/evanphx/json-patch"
"sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/gvk"
"sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resmap"

2
pkg/resmap/resmap_test.go
View File

@@ -20,7 +20,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/gvk"
"sigs.k8s.io/kustomize/pkg/ifc" "sigs.k8s.io/kustomize/pkg/ifc"
"sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resid"

2
pkg/resource/resource_test.go
View File

@@ -19,7 +19,7 @@ package resource
import ( import (
"testing" "testing"
"sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/gvk"
"sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resid"
) )

4
pkg/target/kusttarget_test.go
View File

@@ -22,8 +22,8 @@ import (
"strings" "strings"
"testing" "testing"
"sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/internal/k8sdeps/transformer" "sigs.k8s.io/kustomize/k8sdeps/transformer"
"sigs.k8s.io/kustomize/pkg/constants" "sigs.k8s.io/kustomize/pkg/constants"
"sigs.k8s.io/kustomize/pkg/fs" "sigs.k8s.io/kustomize/pkg/fs"
"sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/gvk"

2
pkg/transformers/imagetag_test.go
View File

@@ -20,7 +20,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/gvk"
"sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resmap"

2
pkg/transformers/labelsandannotations_test.go
View File

@@ -20,7 +20,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/gvk"
"sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resmap"

2
pkg/transformers/namereference_test.go
View File

@@ -20,7 +20,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/resource" "sigs.k8s.io/kustomize/pkg/resource"

2
pkg/transformers/namespace_test.go
View File

@@ -20,7 +20,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/resource" "sigs.k8s.io/kustomize/pkg/resource"

2
pkg/transformers/prefixname_test.go
View File

@@ -20,7 +20,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/resource" "sigs.k8s.io/kustomize/pkg/resource"