diff --git a/cmd/config/docs/api-conventions/functions-spec.md b/cmd/config/docs/api-conventions/functions-spec.md index 2c3468f87..5108e101e 100644 --- a/cmd/config/docs/api-conventions/functions-spec.md +++ b/cmd/config/docs/api-conventions/functions-spec.md @@ -7,7 +7,7 @@ containers that can be chained together as part of a configuration management pi The end result of such a pipeline are fully rendered configurations that can then be applied to a control plane (e.g. Using ‘kubectl apply’ for Kubernetes control plane). As such, although this document references Kubernetes Resource Model and API conventions, -it is completely decoupled from Kuberentes API machinery and does not depend on any +it is completely decoupled from Kubernetes API machinery and does not depend on any in-cluster components. This document references terms described in [Kubernetes API Conventions][1]. @@ -33,7 +33,7 @@ _Configuration functions_ enable shift-left practices (client-side) through: Performing these on the client rather than the server enables: - Configuration to be reviewed prior to being sent to the API server -- Configuration to be validated as part of the CI?CD pipeline +- Configuration to be validated as part of the CI/CD pipeline - Configuration for Resources to validated holistically rather than individually per-Resource - e.g. ensure the `Service.selector` and `Deployment.spec.template` labels diff --git a/kstatus/go.mod b/kstatus/go.mod index 10aba078a..70aed580d 100644 --- a/kstatus/go.mod +++ b/kstatus/go.mod @@ -3,7 +3,6 @@ module sigs.k8s.io/kustomize/kstatus go 1.14 require ( - github.com/ghodss/yaml v1.0.0 github.com/gogo/protobuf v1.3.1 // indirect github.com/google/go-cmp v0.3.1 // indirect github.com/pkg/errors v0.8.1 diff --git a/kstatus/go.sum b/kstatus/go.sum index 844e0a0d9..748b6ca50 100644 --- a/kstatus/go.sum +++ b/kstatus/go.sum @@ -52,8 +52,6 @@ github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680 h1:ZktWZesgun21uEDrwW7iEV1zPCGQldM2atlJZ3TdvVM= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg= diff --git a/kstatus/status/status_compute_test.go b/kstatus/status/status_compute_test.go index df53f6f7f..6f9eec2f0 100644 --- a/kstatus/status/status_compute_test.go +++ b/kstatus/status/status_compute_test.go @@ -6,10 +6,10 @@ package status import ( "testing" - "github.com/ghodss/yaml" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + "sigs.k8s.io/yaml" ) func y2u(t *testing.T, spec string) *unstructured.Unstructured {