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

switch to pseudo/k8s deps

Browse Source
This commit is contained in:
Phillip Wittrock
2019-11-08 16:48:42 -08:00
parent ad9b869ddb
commit 3dfe62fe55
60 changed files with 1074 additions and 1218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/k8sdeps/doc.go
View File

@@ -21,18 +21,18 @@
// tree/master/pkg/util/yaml
//
// It vendors that package into
// sigs.k8s.io/kustomize/vendor/k8s.io/apimachinery/
// sigs.k8s.io/kustomize/vendor/sigs.k8s.io/kustomize/pseudo/k8s/apimachinery/
//
// Whereas kubectl-kustomize would have to depend on the "staging"
// version of this code, located at
//
// https://github.com/kubernetes/kubernetes/
// blob/master/staging/src/k8s.io/apimachinery/pkg/util/yaml
// blob/master/staging/src/sigs.k8s.io/kustomize/pseudo/k8s/apimachinery/pkg/util/yaml
//
// which is "vendored" via symlinks:
// k8s.io/kubernetes/vendor/k8s.io/apimachinery
// k8s.io/kubernetes/vendor/sigs.k8s.io/kustomize/pseudo/k8s/apimachinery
// is a symlink to
// ../../staging/src/k8s.io/apimachinery
// ../../staging/src/sigs.k8s.io/kustomize/pseudo/k8s/apimachinery
//
// The staging version is the canonical, under-development
// version of the code that kubectl depends on, whereas the packages

4
api/k8sdeps/kunstruct/factory.go
View File

@@ -10,11 +10,11 @@ import (
"strconv"
"strings"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/util/yaml"
"sigs.k8s.io/kustomize/api/ifc"
"sigs.k8s.io/kustomize/api/internal/k8sdeps/configmapandsecret"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/pseudo/k8s/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/kustomize/pseudo/k8s/apimachinery/pkg/util/yaml"
)
// KunstructuredFactoryImpl hides construction using apimachinery types.

4
api/k8sdeps/kunstruct/hasher.go
View File

@@ -7,10 +7,10 @@ import (
"encoding/json"
"fmt"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/kustomize/api/hasher"
"sigs.k8s.io/kustomize/api/ifc"
"sigs.k8s.io/kustomize/pseudo/k8s/api/core/v1"
"sigs.k8s.io/kustomize/pseudo/k8s/apimachinery/pkg/apis/meta/v1/unstructured"
)
// kustHash computes a hash of an unstructured object.

2
api/k8sdeps/kunstruct/hasher_test.go
View File

@@ -8,7 +8,7 @@ import (
"strings"
"testing"
"k8s.io/api/core/v1"
"sigs.k8s.io/kustomize/pseudo/k8s/api/core/v1"
)
func TestConfigMapHash(t *testing.T) {

14
api/k8sdeps/kunstruct/unstructadapter.go
View File

@@ -9,15 +9,15 @@ import (
"fmt"
jsonpatch "github.com/evanphx/json-patch"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/client-go/kubernetes/scheme"
"sigs.k8s.io/kustomize/api/ifc"
"sigs.k8s.io/kustomize/api/resid"
metav1 "sigs.k8s.io/kustomize/pseudo/k8s/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/kustomize/pseudo/k8s/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/kustomize/pseudo/k8s/apimachinery/pkg/labels"
"sigs.k8s.io/kustomize/pseudo/k8s/apimachinery/pkg/runtime"
"sigs.k8s.io/kustomize/pseudo/k8s/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/kustomize/pseudo/k8s/apimachinery/pkg/util/strategicpatch"
"sigs.k8s.io/kustomize/pseudo/k8s/client-go/kubernetes/scheme"
)
var _ ifc.Kunstructured = &UnstructAdapter{}

8
api/k8sdeps/validator/validators.go
View File

@@ -10,10 +10,10 @@ import (
"fmt"
"strings"
apivalidation "k8s.io/apimachinery/pkg/api/validation"
v1validation "k8s.io/apimachinery/pkg/apis/meta/v1/validation"
"k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/validation/field"
apivalidation "sigs.k8s.io/kustomize/pseudo/k8s/apimachinery/pkg/api/validation"
v1validation "sigs.k8s.io/kustomize/pseudo/k8s/apimachinery/pkg/apis/meta/v1/validation"
"sigs.k8s.io/kustomize/pseudo/k8s/apimachinery/pkg/util/validation"
"sigs.k8s.io/kustomize/pseudo/k8s/apimachinery/pkg/util/validation/field"
)
// KustValidator validates Labels and annotations by apimachinery