diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 130ebad7..602d797b 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -58,10 +58,6 @@ "ImportPath": "github.com/evanphx/json-patch", "Rev": "36442dbdb585210f8d5a1b45e67aa323c197d5c4" }, - { - "ImportPath": "github.com/ghodss/yaml", - "Rev": "c7ce16629ff4cd059ed96ed06419dd3856fd3577" - }, { "ImportPath": "github.com/gogo/protobuf/proto", "Rev": "342cbe0a04158f6dcb03ca0079991a51a4248c02" @@ -280,343 +276,347 @@ }, { "ImportPath": "k8s.io/api/admissionregistration/v1alpha1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/admissionregistration/v1beta1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/apps/v1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/apps/v1beta1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/apps/v1beta2", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/auditregistration/v1alpha1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/authentication/v1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/authentication/v1beta1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/authorization/v1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/authorization/v1beta1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/autoscaling/v1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/autoscaling/v2beta1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/autoscaling/v2beta2", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/batch/v1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/batch/v1beta1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/batch/v2alpha1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/certificates/v1beta1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/coordination/v1beta1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/core/v1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/events/v1beta1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/extensions/v1beta1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/imagepolicy/v1alpha1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/networking/v1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/policy/v1beta1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/rbac/v1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/rbac/v1alpha1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/rbac/v1beta1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/scheduling/v1alpha1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/scheduling/v1beta1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/settings/v1alpha1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/storage/v1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/storage/v1alpha1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/api/storage/v1beta1", - "Rev": "86123e1cdfc6aa06adf78c8527fb51c2b2b66af4" + "Rev": "6560175f5b2dbcfe19dd4998f86dcb89a8f82627" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/equality", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/errors", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/meta", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/resource", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/fields", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/labels", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/selection", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/types", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/cache", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/clock", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/diff", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/errors", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/framer", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/intstr", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/json", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/naming", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/net", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/runtime", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/sets", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/wait", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/yaml", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/version", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/pkg/watch", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "90473842928c717082a393d6adceee99889fe8cc" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "Rev": "72693cb1fadd73ae2742f6fe29af77d1aecdd8cd" + }, + { + "ImportPath": "sigs.k8s.io/yaml", + "Rev": "fd68e9863619f6ec2fdd8625fe1f02e7c877e480" } ] } diff --git a/tools/clientcmd/api/helpers_test.go b/tools/clientcmd/api/helpers_test.go index 7ec30e5d..48b3cec2 100644 --- a/tools/clientcmd/api/helpers_test.go +++ b/tools/clientcmd/api/helpers_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" ) func newMergedConfig(certFile, certContent, keyFile, keyContent, caFile, caContent string, t *testing.T) Config { diff --git a/tools/clientcmd/api/types_test.go b/tools/clientcmd/api/types_test.go index bd348345..f7190d93 100644 --- a/tools/clientcmd/api/types_test.go +++ b/tools/clientcmd/api/types_test.go @@ -19,7 +19,7 @@ package api import ( "fmt" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" ) func Example_emptyConfig() { diff --git a/tools/clientcmd/loader_test.go b/tools/clientcmd/loader_test.go index 86eccac4..461d970b 100644 --- a/tools/clientcmd/loader_test.go +++ b/tools/clientcmd/loader_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "k8s.io/apimachinery/pkg/runtime" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" diff --git a/vendor/github.com/ghodss/yaml/.travis.yml b/vendor/github.com/ghodss/yaml/.travis.yml deleted file mode 100644 index 930860e0..00000000 --- a/vendor/github.com/ghodss/yaml/.travis.yml +++ /dev/null @@ -1,8 +0,0 @@ -language: go -go: - - "1.3" - - "1.4" - - "1.10" -script: - - go test - - go build diff --git a/vendor/github.com/ghodss/yaml/.gitignore b/vendor/sigs.k8s.io/yaml/.gitignore similarity index 100% rename from vendor/github.com/ghodss/yaml/.gitignore rename to vendor/sigs.k8s.io/yaml/.gitignore diff --git a/vendor/sigs.k8s.io/yaml/.travis.yml b/vendor/sigs.k8s.io/yaml/.travis.yml new file mode 100644 index 00000000..03ddc731 --- /dev/null +++ b/vendor/sigs.k8s.io/yaml/.travis.yml @@ -0,0 +1,14 @@ +language: go +dist: xenial +go: + - 1.9.x + - 1.10.x + - 1.11.x +script: + - go get -t -v ./... + - diff -u <(echo -n) <(gofmt -d .) + - diff -u <(echo -n) <(golint $(go list -e ./...) | grep -v YAMLToJSON) + - go tool vet . + - go test -v -race ./... +install: + - go get golang.org/x/lint/golint diff --git a/vendor/sigs.k8s.io/yaml/CONTRIBUTING.md b/vendor/sigs.k8s.io/yaml/CONTRIBUTING.md new file mode 100644 index 00000000..de471151 --- /dev/null +++ b/vendor/sigs.k8s.io/yaml/CONTRIBUTING.md @@ -0,0 +1,31 @@ +# Contributing Guidelines + +Welcome to Kubernetes. We are excited about the prospect of you joining our [community](https://github.com/kubernetes/community)! The Kubernetes community abides by the CNCF [code of conduct](code-of-conduct.md). Here is an excerpt: + +_As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities._ + +## Getting Started + +We have full documentation on how to get started contributing here: + + + +- [Contributor License Agreement](https://git.k8s.io/community/CLA.md) Kubernetes projects require that you sign a Contributor License Agreement (CLA) before we can accept your pull requests +- [Kubernetes Contributor Guide](http://git.k8s.io/community/contributors/guide) - Main contributor documentation, or you can just jump directly to the [contributing section](http://git.k8s.io/community/contributors/guide#contributing) +- [Contributor Cheat Sheet](https://git.k8s.io/community/contributors/guide/contributor-cheatsheet.md) - Common resources for existing developers + +## Mentorship + +- [Mentoring Initiatives](https://git.k8s.io/community/mentoring) - We have a diverse set of mentorship programs available that are always looking for volunteers! + + diff --git a/vendor/github.com/ghodss/yaml/LICENSE b/vendor/sigs.k8s.io/yaml/LICENSE similarity index 100% rename from vendor/github.com/ghodss/yaml/LICENSE rename to vendor/sigs.k8s.io/yaml/LICENSE diff --git a/vendor/sigs.k8s.io/yaml/OWNERS b/vendor/sigs.k8s.io/yaml/OWNERS new file mode 100644 index 00000000..11ad7ce1 --- /dev/null +++ b/vendor/sigs.k8s.io/yaml/OWNERS @@ -0,0 +1,25 @@ +approvers: +- dims +- lavalamp +- smarterclayton +- deads2k +- sttts +- liggitt +- caesarxuchao +reviewers: +- dims +- thockin +- lavalamp +- smarterclayton +- wojtek-t +- deads2k +- derekwaynecarr +- caesarxuchao +- mikedanese +- liggitt +- gmarek +- sttts +- ncdc +- tallclair +labels: +- sig/api-machinery diff --git a/vendor/github.com/ghodss/yaml/README.md b/vendor/sigs.k8s.io/yaml/README.md similarity index 100% rename from vendor/github.com/ghodss/yaml/README.md rename to vendor/sigs.k8s.io/yaml/README.md diff --git a/vendor/sigs.k8s.io/yaml/RELEASE.md b/vendor/sigs.k8s.io/yaml/RELEASE.md new file mode 100644 index 00000000..6b642464 --- /dev/null +++ b/vendor/sigs.k8s.io/yaml/RELEASE.md @@ -0,0 +1,9 @@ +# Release Process + +The `yaml` Project is released on an as-needed basis. The process is as follows: + +1. An issue is proposing a new release with a changelog since the last release +1. All [OWNERS](OWNERS) must LGTM this release +1. An OWNER runs `git tag -s $VERSION` and inserts the changelog and pushes the tag with `git push $VERSION` +1. The release issue is closed +1. An announcement email is sent to `kubernetes-dev@googlegroups.com` with the subject `[ANNOUNCE] kubernetes-template-project $VERSION is released` diff --git a/vendor/sigs.k8s.io/yaml/SECURITY_CONTACTS b/vendor/sigs.k8s.io/yaml/SECURITY_CONTACTS new file mode 100644 index 00000000..0648a8eb --- /dev/null +++ b/vendor/sigs.k8s.io/yaml/SECURITY_CONTACTS @@ -0,0 +1,17 @@ +# Defined below are the security contacts for this repo. +# +# They are the contact point for the Product Security Team to reach out +# to for triaging and handling of incoming issues. +# +# The below names agree to abide by the +# [Embargo Policy](https://github.com/kubernetes/sig-release/blob/master/security-release-process-documentation/security-release-process.md#embargo-policy) +# and will be removed and replaced if they violate that agreement. +# +# DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE +# INSTRUCTIONS AT https://kubernetes.io/security/ + +cjcullen +jessfraz +liggitt +philips +tallclair diff --git a/vendor/sigs.k8s.io/yaml/code-of-conduct.md b/vendor/sigs.k8s.io/yaml/code-of-conduct.md new file mode 100644 index 00000000..0d15c00c --- /dev/null +++ b/vendor/sigs.k8s.io/yaml/code-of-conduct.md @@ -0,0 +1,3 @@ +# Kubernetes Community Code of Conduct + +Please refer to our [Kubernetes Community Code of Conduct](https://git.k8s.io/community/code-of-conduct.md) diff --git a/vendor/github.com/ghodss/yaml/fields.go b/vendor/sigs.k8s.io/yaml/fields.go similarity index 99% rename from vendor/github.com/ghodss/yaml/fields.go rename to vendor/sigs.k8s.io/yaml/fields.go index 58600740..235b7f2c 100644 --- a/vendor/github.com/ghodss/yaml/fields.go +++ b/vendor/sigs.k8s.io/yaml/fields.go @@ -1,6 +1,7 @@ // Copyright 2013 The Go Authors. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. + package yaml import ( diff --git a/vendor/github.com/ghodss/yaml/yaml.go b/vendor/sigs.k8s.io/yaml/yaml.go similarity index 92% rename from vendor/github.com/ghodss/yaml/yaml.go rename to vendor/sigs.k8s.io/yaml/yaml.go index 6e7f14fc..02459611 100644 --- a/vendor/github.com/ghodss/yaml/yaml.go +++ b/vendor/sigs.k8s.io/yaml/yaml.go @@ -11,7 +11,7 @@ import ( "gopkg.in/yaml.v2" ) -// Marshals the object into JSON then converts JSON to YAML and returns the +// Marshal marshals the object into JSON then converts JSON to YAML and returns the // YAML. func Marshal(o interface{}) ([]byte, error) { j, err := json.Marshal(o) @@ -33,8 +33,24 @@ type JSONOpt func(*json.Decoder) *json.Decoder // Unmarshal converts YAML to JSON then uses JSON to unmarshal into an object, // optionally configuring the behavior of the JSON unmarshal. func Unmarshal(y []byte, o interface{}, opts ...JSONOpt) error { + return yamlUnmarshal(y, o, false, opts...) +} + +// UnmarshalStrict strictly converts YAML to JSON then uses JSON to unmarshal +// into an object, optionally configuring the behavior of the JSON unmarshal. +func UnmarshalStrict(y []byte, o interface{}, opts ...JSONOpt) error { + return yamlUnmarshal(y, o, true, append(opts, DisallowUnknownFields)...) +} + +// yamlUnmarshal unmarshals the given YAML byte stream into the given interface, +// optionally performing the unmarshalling strictly +func yamlUnmarshal(y []byte, o interface{}, strict bool, opts ...JSONOpt) error { vo := reflect.ValueOf(o) - j, err := yamlToJSON(y, &vo, yaml.Unmarshal) + unmarshalFn := yaml.Unmarshal + if strict { + unmarshalFn = yaml.UnmarshalStrict + } + j, err := yamlToJSON(y, &vo, unmarshalFn) if err != nil { return fmt.Errorf("error converting YAML to JSON: %v", err) } @@ -62,7 +78,7 @@ func jsonUnmarshal(r io.Reader, o interface{}, opts ...JSONOpt) error { return nil } -// Convert JSON to YAML. +// JSONToYAML Converts JSON to YAML. func JSONToYAML(j []byte) ([]byte, error) { // Convert the JSON to an object. var jsonObj interface{} @@ -300,6 +316,4 @@ func convertToJSONableObject(yamlObj interface{}, jsonTarget *reflect.Value) (in } return yamlObj, nil } - - return nil, nil } diff --git a/vendor/github.com/ghodss/yaml/yaml_go110.go b/vendor/sigs.k8s.io/yaml/yaml_go110.go similarity index 100% rename from vendor/github.com/ghodss/yaml/yaml_go110.go rename to vendor/sigs.k8s.io/yaml/yaml_go110.go