diff --git a/cmd/talosctl/cmd/mgmt/config.go b/cmd/talosctl/cmd/mgmt/config.go index 68b6a77d5..6d414e081 100644 --- a/cmd/talosctl/cmd/mgmt/config.go +++ b/cmd/talosctl/cmd/mgmt/config.go @@ -15,7 +15,7 @@ import ( jsonpatch "github.com/evanphx/json-patch" "github.com/spf13/cobra" talosnet "github.com/talos-systems/net" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" "github.com/talos-systems/talos/cmd/talosctl/cmd/mgmt/gen" "github.com/talos-systems/talos/cmd/talosctl/pkg/mgmt/helpers" diff --git a/cmd/talosctl/cmd/talos/edit.go b/cmd/talosctl/cmd/talos/edit.go index 44f2fa46e..2a926e089 100644 --- a/cmd/talosctl/cmd/talos/edit.go +++ b/cmd/talosctl/cmd/talos/edit.go @@ -13,7 +13,7 @@ import ( "strings" "github.com/spf13/cobra" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/cmd/util/editor" "k8s.io/kubectl/pkg/cmd/util/editor/crlf" diff --git a/cmd/talosctl/cmd/talos/output/json.go b/cmd/talosctl/cmd/talos/output/json.go index 7d691ff57..95547aee0 100644 --- a/cmd/talosctl/cmd/talos/output/json.go +++ b/cmd/talosctl/cmd/talos/output/json.go @@ -11,7 +11,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" ) // JSON outputs resources in JSON format. diff --git a/cmd/talosctl/cmd/talos/output/yaml.go b/cmd/talosctl/cmd/talos/output/yaml.go index daf18d78d..7868b8bfe 100644 --- a/cmd/talosctl/cmd/talos/output/yaml.go +++ b/cmd/talosctl/cmd/talos/output/yaml.go @@ -11,7 +11,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" ) // YAML outputs resources in YAML format. diff --git a/cmd/talosctl/cmd/talos/patch.go b/cmd/talosctl/cmd/talos/patch.go index f2a6fa0ff..1b10320d3 100644 --- a/cmd/talosctl/cmd/talos/patch.go +++ b/cmd/talosctl/cmd/talos/patch.go @@ -14,7 +14,7 @@ import ( jsonpatch "github.com/evanphx/json-patch" "github.com/spf13/cobra" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" cmdutil "k8s.io/kubectl/pkg/cmd/util" "github.com/talos-systems/talos/cmd/talosctl/pkg/talos/helpers" diff --git a/go.sum b/go.sum index ff6281521..06382d584 100644 --- a/go.sum +++ b/go.sum @@ -370,7 +370,6 @@ github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkg github.com/elazarl/goproxy v0.0.0-20190911111923-ecfe977594f1/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e h1:/cwV7t2xezilMljIftb7WlFtzGANRCnoOhPjtl2ifcs= github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= -github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2 h1:dWB6v3RcOy03t/bUadywsbyrQwCqZeNIEX6M1OtSZOM= github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8= github.com/emicklei/dot v0.16.0 h1:7PseyizTgeQ/aSF1eo4LcEfWlQSlzamFZpzY/nMB9EY= github.com/emicklei/dot v0.16.0/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s= diff --git a/hack/docgen/go.mod b/hack/docgen/go.mod index 80c9f022f..9bb1283cb 100644 --- a/hack/docgen/go.mod +++ b/hack/docgen/go.mod @@ -2,7 +2,11 @@ module github.com/talos-systems/talos-hack-docgen go 1.16 +// forked go-yaml that introduces RawYAML interface, which can be used to populate YAML fields using bytes +// which are then encoded as a valid YAML blocks with proper indentiation +replace gopkg.in/yaml.v3 => github.com/unix4ever/yaml v0.0.0-20210315173758-8fb30b8e5a5b + require ( - gopkg.in/yaml.v2 v2.4.0 + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b mvdan.cc/gofumpt v0.1.1 ) diff --git a/hack/docgen/go.sum b/hack/docgen/go.sum index 405ea6a8e..7df732e57 100644 --- a/hack/docgen/go.sum +++ b/hack/docgen/go.sum @@ -6,6 +6,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/unix4ever/yaml v0.0.0-20210315173758-8fb30b8e5a5b h1:8pnPjZJU0SYanlmHnhMTeR8OR148K9yStwBz1GsjBsQ= +github.com/unix4ever/yaml v0.0.0-20210315173758-8fb30b8e5a5b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -37,7 +39,5 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= mvdan.cc/gofumpt v0.1.1 h1:bi/1aS/5W00E2ny5q65w9SnKpWEF/UIOqDYBILpo9rA= mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= diff --git a/hack/docgen/main.go b/hack/docgen/main.go index d63178fae..63aa8b0ba 100644 --- a/hack/docgen/main.go +++ b/hack/docgen/main.go @@ -17,7 +17,7 @@ import ( "strings" "text/template" - yaml "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v3" "mvdan.cc/gofumpt/format" ) diff --git a/internal/app/machined/internal/server/v1alpha1/v1alpha1_resource.go b/internal/app/machined/internal/server/v1alpha1/v1alpha1_resource.go index f1ac1cbc5..217426870 100644 --- a/internal/app/machined/internal/server/v1alpha1/v1alpha1_resource.go +++ b/internal/app/machined/internal/server/v1alpha1/v1alpha1_resource.go @@ -15,7 +15,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" timestamppb "google.golang.org/protobuf/types/known/timestamppb" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" "github.com/talos-systems/talos/pkg/grpc/middleware/authz" resourceapi "github.com/talos-systems/talos/pkg/machinery/api/resource" diff --git a/internal/app/machined/pkg/controllers/k8s/kubelet_static_pod_controller.go b/internal/app/machined/pkg/controllers/k8s/kubelet_static_pod_controller.go index c9cf5e086..59b27ffc3 100644 --- a/internal/app/machined/pkg/controllers/k8s/kubelet_static_pod_controller.go +++ b/internal/app/machined/pkg/controllers/k8s/kubelet_static_pod_controller.go @@ -19,7 +19,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" "go.uber.org/zap" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" "github.com/talos-systems/talos/pkg/kubernetes/kubelet" "github.com/talos-systems/talos/pkg/machinery/constants" diff --git a/internal/pkg/tui/components/form.go b/internal/pkg/tui/components/form.go index 3135ad923..da4b7f159 100644 --- a/internal/pkg/tui/components/form.go +++ b/internal/pkg/tui/components/form.go @@ -11,7 +11,7 @@ import ( "github.com/gdamore/tcell/v2" "github.com/rivo/tview" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" ) var hline string diff --git a/pkg/cluster/kubernetes/patch.go b/pkg/cluster/kubernetes/patch.go index 1fd0b81ec..088770ced 100644 --- a/pkg/cluster/kubernetes/patch.go +++ b/pkg/cluster/kubernetes/patch.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" "github.com/talos-systems/talos/pkg/machinery/api/machine" "github.com/talos-systems/talos/pkg/machinery/client" diff --git a/pkg/cluster/sonobuoy/sonobuoy.go b/pkg/cluster/sonobuoy/sonobuoy.go index 9ee2bd818..1374a7bcb 100644 --- a/pkg/cluster/sonobuoy/sonobuoy.go +++ b/pkg/cluster/sonobuoy/sonobuoy.go @@ -22,7 +22,7 @@ import ( "github.com/vmware-tanzu/sonobuoy/pkg/client" "github.com/vmware-tanzu/sonobuoy/pkg/config" sonodynamic "github.com/vmware-tanzu/sonobuoy/pkg/dynamic" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" "github.com/talos-systems/talos/pkg/cluster" "github.com/talos-systems/talos/pkg/machinery/constants" diff --git a/pkg/machinery/config/decoder/decoder.go b/pkg/machinery/config/decoder/decoder.go index 072642612..1f9866e63 100644 --- a/pkg/machinery/config/decoder/decoder.go +++ b/pkg/machinery/config/decoder/decoder.go @@ -10,7 +10,7 @@ import ( "fmt" "io" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" "github.com/talos-systems/talos/pkg/machinery/config" "github.com/talos-systems/talos/pkg/machinery/config/encoder" diff --git a/pkg/machinery/config/types/v1alpha1/v1alpha1_configurator_bundle.go b/pkg/machinery/config/types/v1alpha1/v1alpha1_configurator_bundle.go index 7249dc6d2..3ce719ffb 100644 --- a/pkg/machinery/config/types/v1alpha1/v1alpha1_configurator_bundle.go +++ b/pkg/machinery/config/types/v1alpha1/v1alpha1_configurator_bundle.go @@ -11,7 +11,7 @@ import ( "strings" jsonpatch "github.com/evanphx/json-patch" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" clientconfig "github.com/talos-systems/talos/pkg/machinery/client/config" "github.com/talos-systems/talos/pkg/machinery/config" diff --git a/pkg/machinery/config/types/v1alpha1/v1alpha1_marshal_test.go b/pkg/machinery/config/types/v1alpha1/v1alpha1_marshal_test.go index cd8b0cf6b..0a1778820 100644 --- a/pkg/machinery/config/types/v1alpha1/v1alpha1_marshal_test.go +++ b/pkg/machinery/config/types/v1alpha1/v1alpha1_marshal_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/talos-systems/go-blockdevice/blockdevice/util/disk" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" )