diff --git a/Dockerfile b/Dockerfile index c386c5bf1..f2d5ead5d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,8 @@ RUN ["/toolchain/bin/ln", "-svf", "/toolchain/etc/ssl", "/etc/ssl"] RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b /toolchain/bin v1.18.0 RUN cd $(mktemp -d) \ && go mod init tmp \ - && go get mvdan.cc/gofumpt \ - && mv /go/bin/gofumpt /toolchain/go/bin/gofumpt + && go get mvdan.cc/gofumpt/gofumports \ + && mv /go/bin/gofumports /toolchain/go/bin/gofumports RUN curl -sfL https://github.com/uber/prototool/releases/download/v1.8.0/prototool-Linux-x86_64.tar.gz | tar -xz --strip-components=2 -C /toolchain/bin prototool/bin/prototool # The build target creates a container that will be used to build Talos source @@ -321,7 +321,7 @@ COPY hack/golang/golangci-lint.yaml . ENV GOGC=50 RUN --mount=type=cache,target=/.cache/go-build golangci-lint run --config golangci-lint.yaml RUN find . -name '*.pb.go' | xargs rm -RUN FILES="$(gofumpt -l .)" && test -z "${FILES}" || (echo -e "Source code is not formatted with 'gofumpt -s -w':\n${FILES}"; exit 1) +RUN FILES="$(gofumports -l -local github.com/talos-systems/talos .)" && test -z "${FILES}" || (echo -e "Source code is not formatted with 'gofumports -w -local github.com/talos-systems/talos .':\n${FILES}"; exit 1) # The protolint target performs linting on Markdown files. diff --git a/Makefile b/Makefile index e6b073480..051476edf 100644 --- a/Makefile +++ b/Makefile @@ -264,7 +264,7 @@ unit-tests-race: buildkitd .PHONY: fmt fmt: - @docker run --rm -it -v $(PWD):/src -w /src golang:$(GO_VERSION) bash -c "export GO111MODULE=on; export GOPROXY=https://proxy.golang.org; cd /tmp && go mod init tmp && go get mvdan.cc/gofumpt && cd - && gofumpt -s -w ." + @docker run --rm -it -v $(PWD):/src -w /src golang:$(GO_VERSION) bash -c "export GO111MODULE=on; export GOPROXY=https://proxy.golang.org; cd /tmp && go mod init tmp && go get mvdan.cc/gofumpt/gofumports && cd - && gofumports -w -local github.com/talos-systems/talos ." .PHONY: lint lint: buildkitd diff --git a/cmd/osctl/cmd/cluster.go b/cmd/osctl/cmd/cluster.go index 0cad1443f..f4d8f4cc3 100644 --- a/cmd/osctl/cmd/cluster.go +++ b/cmd/osctl/cmd/cluster.go @@ -21,6 +21,7 @@ import ( "github.com/hashicorp/go-multierror" "github.com/pkg/errors" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/cmd/cluster/pkg/node" "github.com/talos-systems/talos/cmd/osctl/pkg/client/config" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" diff --git a/cmd/osctl/cmd/cluster/pkg/node/node.go b/cmd/osctl/cmd/cluster/pkg/node/node.go index 5300eaf44..2888e86b9 100644 --- a/cmd/osctl/cmd/cluster/pkg/node/node.go +++ b/cmd/osctl/cmd/cluster/pkg/node/node.go @@ -15,6 +15,7 @@ import ( "github.com/docker/docker/api/types/network" "github.com/docker/docker/client" "github.com/docker/go-connections/nat" + "github.com/talos-systems/talos/pkg/userdata/v1alpha1/generate" ) diff --git a/cmd/osctl/cmd/config.go b/cmd/osctl/cmd/config.go index 718cdb7ae..4edf59664 100644 --- a/cmd/osctl/cmd/config.go +++ b/cmd/osctl/cmd/config.go @@ -15,6 +15,7 @@ import ( "strings" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/pkg/client/config" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" udv0 "github.com/talos-systems/talos/pkg/userdata" diff --git a/cmd/osctl/cmd/df.go b/cmd/osctl/cmd/df.go index 77890f902..960a331e2 100644 --- a/cmd/osctl/cmd/df.go +++ b/cmd/osctl/cmd/df.go @@ -12,6 +12,7 @@ import ( "text/tabwriter" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/pkg/client" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" "github.com/talos-systems/talos/internal/app/machined/proto" diff --git a/cmd/osctl/cmd/dmesg.go b/cmd/osctl/cmd/dmesg.go index 8d2ac2f65..397d1295c 100644 --- a/cmd/osctl/cmd/dmesg.go +++ b/cmd/osctl/cmd/dmesg.go @@ -8,6 +8,7 @@ import ( "os" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/pkg/client" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" ) diff --git a/cmd/osctl/cmd/gen.go b/cmd/osctl/cmd/gen.go index 073dd8f5b..ef80d3b2b 100644 --- a/cmd/osctl/cmd/gen.go +++ b/cmd/osctl/cmd/gen.go @@ -14,6 +14,7 @@ import ( "time" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" "github.com/talos-systems/talos/pkg/crypto/x509" ) diff --git a/cmd/osctl/cmd/inject.go b/cmd/osctl/cmd/inject.go index e0890236f..f96bb2472 100644 --- a/cmd/osctl/cmd/inject.go +++ b/cmd/osctl/cmd/inject.go @@ -9,10 +9,11 @@ import ( "io/ioutil" "github.com/spf13/cobra" + yaml "gopkg.in/yaml.v2" + "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" "github.com/talos-systems/talos/pkg/crypto/x509" "github.com/talos-systems/talos/pkg/userdata" - yaml "gopkg.in/yaml.v2" ) // injectCmd represents the inject command diff --git a/cmd/osctl/cmd/install_linux.go b/cmd/osctl/cmd/install_linux.go index fc2f823bd..5d17c2898 100644 --- a/cmd/osctl/cmd/install_linux.go +++ b/cmd/osctl/cmd/install_linux.go @@ -10,6 +10,7 @@ import ( "path/filepath" "github.com/spf13/cobra" + localud "github.com/talos-systems/talos/cmd/osctl/internal/userdata" "github.com/talos-systems/talos/internal/pkg/installer" "github.com/talos-systems/talos/internal/pkg/kernel" diff --git a/cmd/osctl/cmd/interfaces.go b/cmd/osctl/cmd/interfaces.go index 901aa1570..f11dd3eae 100644 --- a/cmd/osctl/cmd/interfaces.go +++ b/cmd/osctl/cmd/interfaces.go @@ -11,6 +11,7 @@ import ( "text/tabwriter" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/pkg/client" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" "github.com/talos-systems/talos/internal/app/networkd/proto" diff --git a/cmd/osctl/cmd/kubeconfig.go b/cmd/osctl/cmd/kubeconfig.go index 1f24065c3..bbb750ac5 100644 --- a/cmd/osctl/cmd/kubeconfig.go +++ b/cmd/osctl/cmd/kubeconfig.go @@ -9,6 +9,7 @@ import ( "os" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/pkg/client" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" ) diff --git a/cmd/osctl/cmd/ps.go b/cmd/osctl/cmd/ps.go index da7351328..96ce8f06d 100644 --- a/cmd/osctl/cmd/ps.go +++ b/cmd/osctl/cmd/ps.go @@ -14,6 +14,7 @@ import ( criconstants "github.com/containerd/cri/pkg/constants" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/pkg/client" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" "github.com/talos-systems/talos/internal/app/osd/proto" diff --git a/cmd/osctl/cmd/reboot.go b/cmd/osctl/cmd/reboot.go index 782962d4a..479a92050 100644 --- a/cmd/osctl/cmd/reboot.go +++ b/cmd/osctl/cmd/reboot.go @@ -9,6 +9,7 @@ import ( "os" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/pkg/client" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" ) diff --git a/cmd/osctl/cmd/reset.go b/cmd/osctl/cmd/reset.go index b5cb7e315..e4f3dd6af 100644 --- a/cmd/osctl/cmd/reset.go +++ b/cmd/osctl/cmd/reset.go @@ -9,6 +9,7 @@ import ( "os" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/pkg/client" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" ) diff --git a/cmd/osctl/cmd/restart.go b/cmd/osctl/cmd/restart.go index 2cfa18b25..f32d294d2 100644 --- a/cmd/osctl/cmd/restart.go +++ b/cmd/osctl/cmd/restart.go @@ -10,6 +10,7 @@ import ( criconstants "github.com/containerd/cri/pkg/constants" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/pkg/client" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" "github.com/talos-systems/talos/internal/app/osd/proto" diff --git a/cmd/osctl/cmd/root.go b/cmd/osctl/cmd/root.go index 2f88136b3..84ac8e345 100644 --- a/cmd/osctl/cmd/root.go +++ b/cmd/osctl/cmd/root.go @@ -13,6 +13,7 @@ import ( "syscall" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/pkg/client" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" "github.com/talos-systems/talos/pkg/constants" diff --git a/cmd/osctl/cmd/routes.go b/cmd/osctl/cmd/routes.go index c9920ed02..8953a5749 100644 --- a/cmd/osctl/cmd/routes.go +++ b/cmd/osctl/cmd/routes.go @@ -11,6 +11,7 @@ import ( "text/tabwriter" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/pkg/client" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" "github.com/talos-systems/talos/internal/app/networkd/proto" diff --git a/cmd/osctl/cmd/shutdown.go b/cmd/osctl/cmd/shutdown.go index ecbb2230a..ab9da460b 100644 --- a/cmd/osctl/cmd/shutdown.go +++ b/cmd/osctl/cmd/shutdown.go @@ -9,6 +9,7 @@ import ( "os" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/pkg/client" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" ) diff --git a/cmd/osctl/cmd/stats.go b/cmd/osctl/cmd/stats.go index 648e3a0a2..c583af1be 100644 --- a/cmd/osctl/cmd/stats.go +++ b/cmd/osctl/cmd/stats.go @@ -14,6 +14,7 @@ import ( criconstants "github.com/containerd/cri/pkg/constants" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/pkg/client" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" "github.com/talos-systems/talos/internal/app/osd/proto" diff --git a/cmd/osctl/cmd/top.go b/cmd/osctl/cmd/top.go index bf98fa6f2..6dfd45c80 100644 --- a/cmd/osctl/cmd/top.go +++ b/cmd/osctl/cmd/top.go @@ -19,10 +19,11 @@ import ( "github.com/gizak/termui/v3/widgets" "github.com/ryanuber/columnize" "github.com/spf13/cobra" + "golang.org/x/crypto/ssh/terminal" + "github.com/talos-systems/talos/cmd/osctl/pkg/client" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" "github.com/talos-systems/talos/pkg/proc" - "golang.org/x/crypto/ssh/terminal" ) // versionCmd represents the version command diff --git a/cmd/osctl/cmd/upgrade.go b/cmd/osctl/cmd/upgrade.go index d845ca2ee..03026f067 100644 --- a/cmd/osctl/cmd/upgrade.go +++ b/cmd/osctl/cmd/upgrade.go @@ -9,6 +9,7 @@ import ( "fmt" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/pkg/client" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" ) diff --git a/cmd/osctl/cmd/validate.go b/cmd/osctl/cmd/validate.go index 397e5f3df..d73e6f471 100644 --- a/cmd/osctl/cmd/validate.go +++ b/cmd/osctl/cmd/validate.go @@ -9,6 +9,7 @@ import ( "log" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/internal/userdata" ) diff --git a/cmd/osctl/cmd/version.go b/cmd/osctl/cmd/version.go index 4f7b5aa81..1a25f28c4 100644 --- a/cmd/osctl/cmd/version.go +++ b/cmd/osctl/cmd/version.go @@ -8,6 +8,7 @@ import ( "os" "github.com/spf13/cobra" + "github.com/talos-systems/talos/cmd/osctl/pkg/client" "github.com/talos-systems/talos/cmd/osctl/pkg/helpers" "github.com/talos-systems/talos/pkg/version" diff --git a/internal/app/init/main.go b/internal/app/init/main.go index 596392cce..c112495be 100644 --- a/internal/app/init/main.go +++ b/internal/app/init/main.go @@ -9,13 +9,14 @@ import ( "time" "github.com/pkg/errors" + "golang.org/x/sys/unix" + "github.com/talos-systems/talos/internal/pkg/kmsg" "github.com/talos-systems/talos/internal/pkg/mount/manager" "github.com/talos-systems/talos/internal/pkg/mount/manager/squashfs" "github.com/talos-systems/talos/internal/pkg/mount/manager/virtual" "github.com/talos-systems/talos/internal/pkg/mount/switchroot" "github.com/talos-systems/talos/pkg/constants" - "golang.org/x/sys/unix" ) // nolint: gocyclo diff --git a/internal/app/machined/internal/cni/cni.go b/internal/app/machined/internal/cni/cni.go index 92b90d4f4..b388ca178 100644 --- a/internal/app/machined/internal/cni/cni.go +++ b/internal/app/machined/internal/cni/cni.go @@ -6,6 +6,7 @@ package cni import ( specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/talos-systems/talos/pkg/userdata" ) diff --git a/internal/app/machined/internal/install/install.go b/internal/app/machined/internal/install/install.go index 0037d2783..12a54e884 100644 --- a/internal/app/machined/internal/install/install.go +++ b/internal/app/machined/internal/install/install.go @@ -14,6 +14,7 @@ import ( "github.com/containerd/containerd/oci" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/pkg/kernel" "github.com/talos-systems/talos/pkg/constants" ) diff --git a/internal/app/machined/internal/phase/disk/reset.go b/internal/app/machined/internal/phase/disk/reset.go index d8b6ffda6..6a6608700 100644 --- a/internal/app/machined/internal/phase/disk/reset.go +++ b/internal/app/machined/internal/phase/disk/reset.go @@ -6,6 +6,7 @@ package disk import ( "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/internal/phase" "github.com/talos-systems/talos/internal/app/machined/internal/platform" "github.com/talos-systems/talos/internal/app/machined/internal/runtime" diff --git a/internal/app/machined/internal/phase/kubernetes/tasks.go b/internal/app/machined/internal/phase/kubernetes/tasks.go index 8b990f607..a0ed99503 100644 --- a/internal/app/machined/internal/phase/kubernetes/tasks.go +++ b/internal/app/machined/internal/phase/kubernetes/tasks.go @@ -13,13 +13,14 @@ import ( "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/namespaces" "github.com/pkg/errors" + "golang.org/x/sync/errgroup" + "github.com/talos-systems/talos/internal/app/machined/internal/phase" "github.com/talos-systems/talos/internal/app/machined/internal/platform" "github.com/talos-systems/talos/internal/app/machined/internal/runtime" "github.com/talos-systems/talos/internal/app/machined/pkg/system" "github.com/talos-systems/talos/pkg/constants" "github.com/talos-systems/talos/pkg/userdata" - "golang.org/x/sync/errgroup" ) // KillKubernetesTasks represents the task for stop all containerd tasks in the diff --git a/internal/app/machined/internal/phase/phase.go b/internal/app/machined/internal/phase/phase.go index 851ec7423..92569a0ba 100644 --- a/internal/app/machined/internal/phase/phase.go +++ b/internal/app/machined/internal/phase/phase.go @@ -11,6 +11,7 @@ import ( "github.com/hashicorp/go-multierror" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/internal/platform" "github.com/talos-systems/talos/internal/app/machined/internal/runtime" "github.com/talos-systems/talos/internal/pkg/kmsg" diff --git a/internal/app/machined/internal/phase/rootfs/etc/etc.go b/internal/app/machined/internal/phase/rootfs/etc/etc.go index c352e0751..faac5224f 100644 --- a/internal/app/machined/internal/phase/rootfs/etc/etc.go +++ b/internal/app/machined/internal/phase/rootfs/etc/etc.go @@ -14,6 +14,7 @@ import ( "text/template" "github.com/pkg/errors" + "github.com/talos-systems/talos/pkg/version" "golang.org/x/sys/unix" diff --git a/internal/app/machined/internal/phase/rootfs/mount_cgroups.go b/internal/app/machined/internal/phase/rootfs/mount_cgroups.go index 40de8a167..6269d377d 100644 --- a/internal/app/machined/internal/phase/rootfs/mount_cgroups.go +++ b/internal/app/machined/internal/phase/rootfs/mount_cgroups.go @@ -11,6 +11,7 @@ import ( "strconv" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/internal/phase" "github.com/talos-systems/talos/internal/app/machined/internal/platform" "github.com/talos-systems/talos/internal/app/machined/internal/runtime" diff --git a/internal/app/machined/internal/phase/rootfs/mount_shared.go b/internal/app/machined/internal/phase/rootfs/mount_shared.go index 57a038217..3aaafbd58 100644 --- a/internal/app/machined/internal/phase/rootfs/mount_shared.go +++ b/internal/app/machined/internal/phase/rootfs/mount_shared.go @@ -5,11 +5,12 @@ package rootfs import ( + "golang.org/x/sys/unix" + "github.com/talos-systems/talos/internal/app/machined/internal/phase" "github.com/talos-systems/talos/internal/app/machined/internal/platform" "github.com/talos-systems/talos/internal/app/machined/internal/runtime" "github.com/talos-systems/talos/pkg/userdata" - "golang.org/x/sys/unix" ) // MountShared represents the MountShared task. diff --git a/internal/app/machined/internal/phase/rootfs/unmount_pod_mounts.go b/internal/app/machined/internal/phase/rootfs/unmount_pod_mounts.go index 1fa59f89a..c815b3c1c 100644 --- a/internal/app/machined/internal/phase/rootfs/unmount_pod_mounts.go +++ b/internal/app/machined/internal/phase/rootfs/unmount_pod_mounts.go @@ -12,12 +12,13 @@ import ( "strings" "github.com/pkg/errors" + "golang.org/x/sys/unix" + "github.com/talos-systems/talos/internal/app/machined/internal/phase" "github.com/talos-systems/talos/internal/app/machined/internal/platform" "github.com/talos-systems/talos/internal/app/machined/internal/runtime" "github.com/talos-systems/talos/pkg/constants" "github.com/talos-systems/talos/pkg/userdata" - "golang.org/x/sys/unix" ) // UnmountPodMounts represents the UnmountPodMounts task. diff --git a/internal/app/machined/internal/phase/services/stop_non_crucial_services.go b/internal/app/machined/internal/phase/services/stop_non_crucial_services.go index 8072f8b7a..345b94a3e 100644 --- a/internal/app/machined/internal/phase/services/stop_non_crucial_services.go +++ b/internal/app/machined/internal/phase/services/stop_non_crucial_services.go @@ -8,6 +8,7 @@ import ( "context" "github.com/containerd/containerd/namespaces" + "github.com/talos-systems/talos/internal/app/machined/internal/phase" "github.com/talos-systems/talos/internal/app/machined/internal/platform" "github.com/talos-systems/talos/internal/app/machined/internal/runtime" diff --git a/internal/app/machined/internal/phase/sysctls/sysctls.go b/internal/app/machined/internal/phase/sysctls/sysctls.go index 57162dafd..1953201b3 100644 --- a/internal/app/machined/internal/phase/sysctls/sysctls.go +++ b/internal/app/machined/internal/phase/sysctls/sysctls.go @@ -7,6 +7,7 @@ package sysctls import ( "github.com/hashicorp/go-multierror" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/internal/phase" "github.com/talos-systems/talos/internal/app/machined/internal/platform" "github.com/talos-systems/talos/internal/app/machined/internal/runtime" diff --git a/internal/app/machined/internal/phase/upgrade/leave_etcd.go b/internal/app/machined/internal/phase/upgrade/leave_etcd.go index 5dcbcb869..f47415c37 100644 --- a/internal/app/machined/internal/phase/upgrade/leave_etcd.go +++ b/internal/app/machined/internal/phase/upgrade/leave_etcd.go @@ -11,6 +11,7 @@ import ( "time" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/internal/phase" "github.com/talos-systems/talos/internal/app/machined/internal/platform" "github.com/talos-systems/talos/internal/app/machined/internal/runtime" diff --git a/internal/app/machined/internal/phase/upgrade/upgrade.go b/internal/app/machined/internal/phase/upgrade/upgrade.go index 3a10ca4d5..890153735 100644 --- a/internal/app/machined/internal/phase/upgrade/upgrade.go +++ b/internal/app/machined/internal/phase/upgrade/upgrade.go @@ -8,6 +8,7 @@ import ( "strings" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/internal/install" "github.com/talos-systems/talos/internal/app/machined/internal/phase" "github.com/talos-systems/talos/internal/app/machined/internal/platform" diff --git a/internal/app/machined/internal/phase/userdata/extra_devices.go b/internal/app/machined/internal/phase/userdata/extra_devices.go index b65548a83..ee52c507b 100644 --- a/internal/app/machined/internal/phase/userdata/extra_devices.go +++ b/internal/app/machined/internal/phase/userdata/extra_devices.go @@ -7,13 +7,14 @@ package userdata import ( "fmt" + "golang.org/x/sys/unix" + "github.com/talos-systems/talos/internal/app/machined/internal/phase" "github.com/talos-systems/talos/internal/app/machined/internal/platform" "github.com/talos-systems/talos/internal/app/machined/internal/runtime" "github.com/talos-systems/talos/internal/pkg/mount" "github.com/talos-systems/talos/internal/pkg/mount/manager" "github.com/talos-systems/talos/pkg/userdata" - "golang.org/x/sys/unix" ) // ExtraDevices represents the ExtraDevices task. diff --git a/internal/app/machined/internal/phase/userdata/extra_files.go b/internal/app/machined/internal/phase/userdata/extra_files.go index ef7f347ae..842b63643 100644 --- a/internal/app/machined/internal/phase/userdata/extra_files.go +++ b/internal/app/machined/internal/phase/userdata/extra_files.go @@ -10,6 +10,7 @@ import ( "path/filepath" "github.com/hashicorp/go-multierror" + "github.com/talos-systems/talos/internal/app/machined/internal/phase" "github.com/talos-systems/talos/internal/app/machined/internal/platform" "github.com/talos-systems/talos/internal/app/machined/internal/runtime" diff --git a/internal/app/machined/internal/phase/userdata/pki.go b/internal/app/machined/internal/phase/userdata/pki.go index a84f2d335..6daaec85c 100644 --- a/internal/app/machined/internal/phase/userdata/pki.go +++ b/internal/app/machined/internal/phase/userdata/pki.go @@ -8,6 +8,7 @@ import ( "log" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/internal/phase" "github.com/talos-systems/talos/internal/app/machined/internal/platform" "github.com/talos-systems/talos/internal/app/machined/internal/runtime" diff --git a/internal/app/machined/internal/phase/userdata/save_userdata.go b/internal/app/machined/internal/phase/userdata/save_userdata.go index bcc09464c..2a0d2c5a0 100644 --- a/internal/app/machined/internal/phase/userdata/save_userdata.go +++ b/internal/app/machined/internal/phase/userdata/save_userdata.go @@ -9,12 +9,13 @@ import ( "log" "os" + "gopkg.in/yaml.v2" + "github.com/talos-systems/talos/internal/app/machined/internal/phase" "github.com/talos-systems/talos/internal/app/machined/internal/platform" "github.com/talos-systems/talos/internal/app/machined/internal/runtime" "github.com/talos-systems/talos/pkg/constants" "github.com/talos-systems/talos/pkg/userdata" - "gopkg.in/yaml.v2" ) // SaveUserData represents the SaveUserData task. diff --git a/internal/app/machined/internal/phase/userdata/userdata.go b/internal/app/machined/internal/phase/userdata/userdata.go index 4e5fcee6c..2fae1b07d 100644 --- a/internal/app/machined/internal/phase/userdata/userdata.go +++ b/internal/app/machined/internal/phase/userdata/userdata.go @@ -8,14 +8,15 @@ import ( "errors" "log" + kubeproxyconfig "k8s.io/kube-proxy/config/v1alpha1" + kubeletconfig "k8s.io/kubelet/config/v1beta1" + "github.com/talos-systems/talos/internal/app/machined/internal/phase" "github.com/talos-systems/talos/internal/app/machined/internal/platform" "github.com/talos-systems/talos/internal/app/machined/internal/runtime" "github.com/talos-systems/talos/internal/pkg/kernel" "github.com/talos-systems/talos/pkg/constants" "github.com/talos-systems/talos/pkg/userdata" - kubeproxyconfig "k8s.io/kube-proxy/config/v1alpha1" - kubeletconfig "k8s.io/kubelet/config/v1beta1" ) // UserData represents the UserData task. diff --git a/internal/app/machined/internal/platform/aws/aws.go b/internal/app/machined/internal/platform/aws/aws.go index 28746cd30..81bb190dd 100644 --- a/internal/app/machined/internal/platform/aws/aws.go +++ b/internal/app/machined/internal/platform/aws/aws.go @@ -13,6 +13,7 @@ import ( "net/http" "github.com/fullsailor/pkcs7" + "github.com/talos-systems/talos/internal/app/machined/internal/runtime" "github.com/talos-systems/talos/pkg/userdata" "github.com/talos-systems/talos/pkg/userdata/download" diff --git a/internal/app/machined/internal/platform/container/container.go b/internal/app/machined/internal/platform/container/container.go index ae2b28dc3..8a9149130 100644 --- a/internal/app/machined/internal/platform/container/container.go +++ b/internal/app/machined/internal/platform/container/container.go @@ -9,6 +9,7 @@ import ( "os" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/internal/runtime" "github.com/talos-systems/talos/pkg/userdata" "github.com/talos-systems/talos/pkg/userdata/translate" diff --git a/internal/app/machined/internal/platform/metal/metal.go b/internal/app/machined/internal/platform/metal/metal.go index f3786fb9b..1486b9518 100644 --- a/internal/app/machined/internal/platform/metal/metal.go +++ b/internal/app/machined/internal/platform/metal/metal.go @@ -10,6 +10,7 @@ import ( "path" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/internal/runtime" "github.com/talos-systems/talos/internal/pkg/kernel" "github.com/talos-systems/talos/pkg/blockdevice/probe" diff --git a/internal/app/machined/internal/platform/platform.go b/internal/app/machined/internal/platform/platform.go index 36211f0c2..163804f53 100644 --- a/internal/app/machined/internal/platform/platform.go +++ b/internal/app/machined/internal/platform/platform.go @@ -8,6 +8,7 @@ import ( "os" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/internal/platform/aws" "github.com/talos-systems/talos/internal/app/machined/internal/platform/azure" "github.com/talos-systems/talos/internal/app/machined/internal/platform/container" diff --git a/internal/app/machined/internal/platform/vmware/vmware.go b/internal/app/machined/internal/platform/vmware/vmware.go index afdb34943..a98700904 100644 --- a/internal/app/machined/internal/platform/vmware/vmware.go +++ b/internal/app/machined/internal/platform/vmware/vmware.go @@ -8,12 +8,13 @@ import ( "encoding/base64" "fmt" + "github.com/vmware/vmw-guestinfo/rpcvmx" + "github.com/vmware/vmw-guestinfo/vmcheck" + "github.com/talos-systems/talos/internal/app/machined/internal/runtime" "github.com/talos-systems/talos/internal/pkg/kernel" "github.com/talos-systems/talos/pkg/constants" "github.com/talos-systems/talos/pkg/userdata" - "github.com/vmware/vmw-guestinfo/rpcvmx" - "github.com/vmware/vmw-guestinfo/vmcheck" yaml "gopkg.in/yaml.v2" ) diff --git a/internal/app/machined/internal/runtime/initializer/interactive/interactive.go b/internal/app/machined/internal/runtime/initializer/interactive/interactive.go index b1e66291e..d8deff993 100644 --- a/internal/app/machined/internal/runtime/initializer/interactive/interactive.go +++ b/internal/app/machined/internal/runtime/initializer/interactive/interactive.go @@ -13,13 +13,14 @@ import ( "strings" "github.com/pkg/errors" + "golang.org/x/sys/unix" + "github.com/talos-systems/talos/internal/app/machined/internal/platform" "github.com/talos-systems/talos/internal/pkg/installer" "github.com/talos-systems/talos/internal/pkg/kernel" "github.com/talos-systems/talos/pkg/blockdevice/probe" "github.com/talos-systems/talos/pkg/constants" "github.com/talos-systems/talos/pkg/userdata" - "golang.org/x/sys/unix" ) // Interactive is an initializer that performs an installation by prompting the diff --git a/internal/app/machined/internal/runtime/initializer/metal/metal.go b/internal/app/machined/internal/runtime/initializer/metal/metal.go index ec9e0153e..fc1703074 100644 --- a/internal/app/machined/internal/runtime/initializer/metal/metal.go +++ b/internal/app/machined/internal/runtime/initializer/metal/metal.go @@ -10,6 +10,7 @@ import ( "strings" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/internal/event" "github.com/talos-systems/talos/internal/app/machined/internal/install" "github.com/talos-systems/talos/internal/app/machined/internal/platform" diff --git a/internal/app/machined/pkg/system/mocks_test.go b/internal/app/machined/pkg/system/mocks_test.go index 4f6b20613..889d90559 100644 --- a/internal/app/machined/pkg/system/mocks_test.go +++ b/internal/app/machined/pkg/system/mocks_test.go @@ -10,6 +10,7 @@ import ( "time" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/pkg/system/conditions" "github.com/talos-systems/talos/internal/app/machined/pkg/system/events" "github.com/talos-systems/talos/internal/app/machined/pkg/system/health" diff --git a/internal/app/machined/pkg/system/runner/containerd/containerd.go b/internal/app/machined/pkg/system/runner/containerd/containerd.go index b6319e371..a77ad5ed6 100644 --- a/internal/app/machined/pkg/system/runner/containerd/containerd.go +++ b/internal/app/machined/pkg/system/runner/containerd/containerd.go @@ -17,6 +17,7 @@ import ( "github.com/containerd/containerd/oci" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/pkg/system/events" "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner" "github.com/talos-systems/talos/pkg/userdata" diff --git a/internal/app/machined/pkg/system/runner/containerd/containerd_test.go b/internal/app/machined/pkg/system/runner/containerd/containerd_test.go index deae8c7b5..152922ca8 100644 --- a/internal/app/machined/pkg/system/runner/containerd/containerd_test.go +++ b/internal/app/machined/pkg/system/runner/containerd/containerd_test.go @@ -21,6 +21,7 @@ import ( "github.com/containerd/containerd/oci" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/suite" + "github.com/talos-systems/talos/internal/app/machined/pkg/system/events" "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner" containerdrunner "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner/containerd" diff --git a/internal/app/machined/pkg/system/runner/containerd/import.go b/internal/app/machined/pkg/system/runner/containerd/import.go index 20f0de9de..1ff2426b1 100644 --- a/internal/app/machined/pkg/system/runner/containerd/import.go +++ b/internal/app/machined/pkg/system/runner/containerd/import.go @@ -13,6 +13,7 @@ import ( "github.com/containerd/containerd/namespaces" multierror "github.com/hashicorp/go-multierror" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/pkg/system/conditions" "github.com/talos-systems/talos/pkg/constants" ) diff --git a/internal/app/machined/pkg/system/runner/goroutine/goroutine_test.go b/internal/app/machined/pkg/system/runner/goroutine/goroutine_test.go index 0f1b2c558..f2cc1d866 100644 --- a/internal/app/machined/pkg/system/runner/goroutine/goroutine_test.go +++ b/internal/app/machined/pkg/system/runner/goroutine/goroutine_test.go @@ -17,6 +17,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/suite" + "github.com/talos-systems/talos/internal/app/machined/pkg/system/events" "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner" "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner/goroutine" diff --git a/internal/app/machined/pkg/system/runner/process/process.go b/internal/app/machined/pkg/system/runner/process/process.go index 5f0af923f..1b11958a9 100644 --- a/internal/app/machined/pkg/system/runner/process/process.go +++ b/internal/app/machined/pkg/system/runner/process/process.go @@ -14,6 +14,7 @@ import ( "time" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/pkg/system/events" processlogger "github.com/talos-systems/talos/internal/app/machined/pkg/system/log" "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner" diff --git a/internal/app/machined/pkg/system/runner/process/process_test.go b/internal/app/machined/pkg/system/runner/process/process_test.go index 0f8d749f9..70e1315de 100644 --- a/internal/app/machined/pkg/system/runner/process/process_test.go +++ b/internal/app/machined/pkg/system/runner/process/process_test.go @@ -16,6 +16,7 @@ import ( "time" "github.com/stretchr/testify/suite" + "github.com/talos-systems/talos/internal/app/machined/pkg/system/events" "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner" "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner/process" diff --git a/internal/app/machined/pkg/system/service_events.go b/internal/app/machined/pkg/system/service_events.go index 940508968..6ba409416 100644 --- a/internal/app/machined/pkg/system/service_events.go +++ b/internal/app/machined/pkg/system/service_events.go @@ -9,6 +9,7 @@ import ( "fmt" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/pkg/system/conditions" ) diff --git a/internal/app/machined/pkg/system/service_runner.go b/internal/app/machined/pkg/system/service_runner.go index 201ea84b6..08918200a 100644 --- a/internal/app/machined/pkg/system/service_runner.go +++ b/internal/app/machined/pkg/system/service_runner.go @@ -12,6 +12,7 @@ import ( "time" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/pkg/system/conditions" "github.com/talos-systems/talos/internal/app/machined/pkg/system/events" "github.com/talos-systems/talos/internal/app/machined/pkg/system/health" diff --git a/internal/app/machined/pkg/system/service_runner_test.go b/internal/app/machined/pkg/system/service_runner_test.go index c7d15cc6c..c2363a1a3 100644 --- a/internal/app/machined/pkg/system/service_runner_test.go +++ b/internal/app/machined/pkg/system/service_runner_test.go @@ -10,6 +10,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/suite" + "github.com/talos-systems/talos/internal/app/machined/pkg/system" "github.com/talos-systems/talos/internal/app/machined/pkg/system/conditions" "github.com/talos-systems/talos/internal/app/machined/pkg/system/events" diff --git a/internal/app/machined/pkg/system/services/kubeadm.go b/internal/app/machined/pkg/system/services/kubeadm.go index c5a461940..6d416fb65 100644 --- a/internal/app/machined/pkg/system/services/kubeadm.go +++ b/internal/app/machined/pkg/system/services/kubeadm.go @@ -18,6 +18,7 @@ import ( criconstants "github.com/containerd/cri/pkg/constants" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/app/machined/pkg/system/conditions" "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner" "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner/containerd" diff --git a/internal/app/machined/pkg/system/services/kubeadm/kubeadm.go b/internal/app/machined/pkg/system/services/kubeadm/kubeadm.go index 0fa05bac7..a94342490 100644 --- a/internal/app/machined/pkg/system/services/kubeadm/kubeadm.go +++ b/internal/app/machined/pkg/system/services/kubeadm/kubeadm.go @@ -17,6 +17,11 @@ import ( "strings" "time" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + kubeadmv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" + "github.com/talos-systems/talos/internal/app/trustd/proto" "github.com/talos-systems/talos/internal/pkg/cis" "github.com/talos-systems/talos/pkg/cmd" @@ -24,10 +29,6 @@ import ( "github.com/talos-systems/talos/pkg/crypto/x509" "github.com/talos-systems/talos/pkg/grpc/middleware/auth/basic" "github.com/talos-systems/talos/pkg/userdata" - "google.golang.org/grpc" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" - kubeadmv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" ) const dirPerm os.FileMode = 0700 diff --git a/internal/app/machined/pkg/system/services/kubeadm/kubeadm_test.go b/internal/app/machined/pkg/system/services/kubeadm/kubeadm_test.go index d948574de..e9787b579 100644 --- a/internal/app/machined/pkg/system/services/kubeadm/kubeadm_test.go +++ b/internal/app/machined/pkg/system/services/kubeadm/kubeadm_test.go @@ -11,11 +11,12 @@ import ( "testing" "github.com/stretchr/testify/suite" + "gopkg.in/yaml.v2" + "github.com/talos-systems/talos/internal/app/trustd/proto" "github.com/talos-systems/talos/pkg/constants" "github.com/talos-systems/talos/pkg/grpc/middleware/auth/basic" "github.com/talos-systems/talos/pkg/userdata" - "gopkg.in/yaml.v2" ) type KubeadmSuite struct { diff --git a/internal/app/machined/pkg/system/services/networkd.go b/internal/app/machined/pkg/system/services/networkd.go index 2c0f1d5d3..01b4cb26b 100644 --- a/internal/app/machined/pkg/system/services/networkd.go +++ b/internal/app/machined/pkg/system/services/networkd.go @@ -14,6 +14,7 @@ import ( containerdapi "github.com/containerd/containerd" "github.com/containerd/containerd/oci" specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/talos-systems/talos/internal/app/machined/pkg/system/conditions" "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner" "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner/containerd" diff --git a/internal/app/machined/pkg/system/services/ntpd.go b/internal/app/machined/pkg/system/services/ntpd.go index e3c29fb40..55d2ab895 100644 --- a/internal/app/machined/pkg/system/services/ntpd.go +++ b/internal/app/machined/pkg/system/services/ntpd.go @@ -14,6 +14,7 @@ import ( containerdapi "github.com/containerd/containerd" "github.com/containerd/containerd/oci" specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/talos-systems/talos/internal/app/machined/pkg/system/conditions" "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner" "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner/containerd" diff --git a/internal/app/machined/pkg/system/services/osd.go b/internal/app/machined/pkg/system/services/osd.go index bbbec911a..a0b6322bc 100644 --- a/internal/app/machined/pkg/system/services/osd.go +++ b/internal/app/machined/pkg/system/services/osd.go @@ -13,6 +13,7 @@ import ( containerdapi "github.com/containerd/containerd" "github.com/containerd/containerd/oci" specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/talos-systems/talos/internal/app/machined/pkg/system" "github.com/talos-systems/talos/internal/app/machined/pkg/system/conditions" "github.com/talos-systems/talos/internal/app/machined/pkg/system/health" diff --git a/internal/app/machined/pkg/system/services/proxyd.go b/internal/app/machined/pkg/system/services/proxyd.go index 653ed46c1..54bbc5458 100644 --- a/internal/app/machined/pkg/system/services/proxyd.go +++ b/internal/app/machined/pkg/system/services/proxyd.go @@ -13,6 +13,7 @@ import ( containerdapi "github.com/containerd/containerd" "github.com/containerd/containerd/oci" specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/talos-systems/talos/internal/app/machined/pkg/system" "github.com/talos-systems/talos/internal/app/machined/pkg/system/conditions" "github.com/talos-systems/talos/internal/app/machined/pkg/system/health" diff --git a/internal/app/machined/pkg/system/services/trustd.go b/internal/app/machined/pkg/system/services/trustd.go index fda0805f3..93e989d7a 100644 --- a/internal/app/machined/pkg/system/services/trustd.go +++ b/internal/app/machined/pkg/system/services/trustd.go @@ -13,6 +13,7 @@ import ( containerdapi "github.com/containerd/containerd" "github.com/containerd/containerd/oci" specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/talos-systems/talos/internal/app/machined/pkg/system" "github.com/talos-systems/talos/internal/app/machined/pkg/system/conditions" "github.com/talos-systems/talos/internal/app/machined/pkg/system/health" diff --git a/internal/app/machined/pkg/system/system_test.go b/internal/app/machined/pkg/system/system_test.go index 8a4e2b02d..733a860da 100644 --- a/internal/app/machined/pkg/system/system_test.go +++ b/internal/app/machined/pkg/system/system_test.go @@ -10,6 +10,7 @@ import ( "time" "github.com/stretchr/testify/suite" + "github.com/talos-systems/talos/internal/app/machined/pkg/system" ) diff --git a/internal/app/networkd/pkg/address/dhcp.go b/internal/app/networkd/pkg/address/dhcp.go index 94ec28845..3ebf1016d 100644 --- a/internal/app/networkd/pkg/address/dhcp.go +++ b/internal/app/networkd/pkg/address/dhcp.go @@ -13,9 +13,10 @@ import ( "github.com/insomniacslk/dhcp/dhcpv4" "github.com/insomniacslk/dhcp/dhcpv4/nclient4" + "golang.org/x/sys/unix" + "github.com/talos-systems/talos/internal/pkg/kernel" "github.com/talos-systems/talos/pkg/constants" - "golang.org/x/sys/unix" ) // DHCP implements the Addressing interface diff --git a/internal/app/networkd/pkg/address/static.go b/internal/app/networkd/pkg/address/static.go index f00872b88..edf5d6eb4 100644 --- a/internal/app/networkd/pkg/address/static.go +++ b/internal/app/networkd/pkg/address/static.go @@ -9,8 +9,9 @@ import ( "net" "time" - "github.com/talos-systems/talos/pkg/userdata" "golang.org/x/sys/unix" + + "github.com/talos-systems/talos/pkg/userdata" ) // Static implements the Addressing interface diff --git a/internal/app/networkd/pkg/networkd/networkd.go b/internal/app/networkd/pkg/networkd/networkd.go index 38195018c..0e44a416b 100644 --- a/internal/app/networkd/pkg/networkd/networkd.go +++ b/internal/app/networkd/pkg/networkd/networkd.go @@ -17,9 +17,10 @@ import ( "github.com/jsimonetti/rtnetlink" "github.com/jsimonetti/rtnetlink/rtnl" "github.com/mdlayher/netlink" + "golang.org/x/sys/unix" + "github.com/talos-systems/talos/internal/app/networkd/pkg/address" "github.com/talos-systems/talos/internal/app/networkd/pkg/nic" - "golang.org/x/sys/unix" ) // Set up default nameservers diff --git a/internal/app/networkd/pkg/nic/nic.go b/internal/app/networkd/pkg/nic/nic.go index 13f03d6ca..35c1d961d 100644 --- a/internal/app/networkd/pkg/nic/nic.go +++ b/internal/app/networkd/pkg/nic/nic.go @@ -9,6 +9,7 @@ import ( "net" "github.com/hashicorp/go-multierror" + "github.com/talos-systems/talos/internal/app/networkd/pkg/address" "github.com/talos-systems/talos/internal/pkg/kernel" "github.com/talos-systems/talos/pkg/constants" diff --git a/internal/app/networkd/pkg/reg/reg.go b/internal/app/networkd/pkg/reg/reg.go index 6c55ac95f..e7b65f406 100644 --- a/internal/app/networkd/pkg/reg/reg.go +++ b/internal/app/networkd/pkg/reg/reg.go @@ -11,10 +11,11 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" - "github.com/talos-systems/talos/internal/app/networkd/pkg/networkd" - "github.com/talos-systems/talos/internal/app/networkd/proto" "golang.org/x/sys/unix" "google.golang.org/grpc" + + "github.com/talos-systems/talos/internal/app/networkd/pkg/networkd" + "github.com/talos-systems/talos/internal/app/networkd/proto" ) // Registrator is the concrete type that implements the factory.Registrator and diff --git a/internal/app/networkd/pkg/reg/reg_test.go b/internal/app/networkd/pkg/reg/reg_test.go index 32698b601..629068241 100644 --- a/internal/app/networkd/pkg/reg/reg_test.go +++ b/internal/app/networkd/pkg/reg/reg_test.go @@ -14,11 +14,12 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/stretchr/testify/suite" + "golang.org/x/sys/unix" + "google.golang.org/grpc" + "github.com/talos-systems/talos/internal/app/networkd/pkg/networkd" "github.com/talos-systems/talos/internal/app/networkd/proto" "github.com/talos-systems/talos/pkg/grpc/factory" - "golang.org/x/sys/unix" - "google.golang.org/grpc" ) type NetworkdSuite struct { diff --git a/internal/app/ntpd/pkg/reg/reg.go b/internal/app/ntpd/pkg/reg/reg.go index c545492cc..ef3a1f6c0 100644 --- a/internal/app/ntpd/pkg/reg/reg.go +++ b/internal/app/ntpd/pkg/reg/reg.go @@ -10,9 +10,10 @@ import ( "github.com/golang/protobuf/ptypes" "github.com/golang/protobuf/ptypes/empty" + "google.golang.org/grpc" + "github.com/talos-systems/talos/internal/app/ntpd/pkg/ntp" "github.com/talos-systems/talos/internal/app/ntpd/proto" - "google.golang.org/grpc" ) // Registrator is the concrete type that implements the factory.Registrator and diff --git a/internal/app/ntpd/pkg/reg/reg_test.go b/internal/app/ntpd/pkg/reg/reg_test.go index 1f14f9572..4928e2da3 100644 --- a/internal/app/ntpd/pkg/reg/reg_test.go +++ b/internal/app/ntpd/pkg/reg/reg_test.go @@ -14,10 +14,11 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/stretchr/testify/suite" + "google.golang.org/grpc" + "github.com/talos-systems/talos/internal/app/ntpd/pkg/ntp" "github.com/talos-systems/talos/internal/app/ntpd/proto" "github.com/talos-systems/talos/pkg/grpc/factory" - "google.golang.org/grpc" ) type NtpdSuite struct { diff --git a/internal/app/osd/internal/reg/init_client.go b/internal/app/osd/internal/reg/init_client.go index c9a93cbaa..60941d097 100644 --- a/internal/app/osd/internal/reg/init_client.go +++ b/internal/app/osd/internal/reg/init_client.go @@ -9,9 +9,10 @@ import ( "io" "github.com/golang/protobuf/ptypes/empty" + "google.golang.org/grpc" + "github.com/talos-systems/talos/internal/app/machined/proto" "github.com/talos-systems/talos/pkg/constants" - "google.golang.org/grpc" ) // InitServiceClient is a gRPC client for init service API diff --git a/internal/app/osd/internal/reg/networkd_client.go b/internal/app/osd/internal/reg/networkd_client.go index 2fcebeeed..9b1f09585 100644 --- a/internal/app/osd/internal/reg/networkd_client.go +++ b/internal/app/osd/internal/reg/networkd_client.go @@ -8,9 +8,10 @@ import ( "context" "github.com/golang/protobuf/ptypes/empty" + "google.golang.org/grpc" + "github.com/talos-systems/talos/internal/app/networkd/proto" "github.com/talos-systems/talos/pkg/constants" - "google.golang.org/grpc" ) // NetworkdClient is a gRPC client for init service API diff --git a/internal/app/osd/internal/reg/ntp_client.go b/internal/app/osd/internal/reg/ntp_client.go index 049636030..7e475104c 100644 --- a/internal/app/osd/internal/reg/ntp_client.go +++ b/internal/app/osd/internal/reg/ntp_client.go @@ -8,9 +8,10 @@ import ( "context" "github.com/golang/protobuf/ptypes/empty" + "google.golang.org/grpc" + "github.com/talos-systems/talos/internal/app/ntpd/proto" "github.com/talos-systems/talos/pkg/constants" - "google.golang.org/grpc" ) // NtpdClient is a gRPC client for init service API diff --git a/internal/app/osd/main.go b/internal/app/osd/main.go index 6e3379da7..0a3d7893a 100644 --- a/internal/app/osd/main.go +++ b/internal/app/osd/main.go @@ -9,14 +9,15 @@ import ( "flag" "log" + "google.golang.org/grpc" + "google.golang.org/grpc/credentials" + "github.com/talos-systems/talos/internal/app/osd/internal/reg" "github.com/talos-systems/talos/pkg/constants" "github.com/talos-systems/talos/pkg/grpc/factory" "github.com/talos-systems/talos/pkg/grpc/tls" "github.com/talos-systems/talos/pkg/startup" "github.com/talos-systems/talos/pkg/userdata" - "google.golang.org/grpc" - "google.golang.org/grpc/credentials" ) var dataPath *string diff --git a/internal/app/proxyd/internal/frontend/frontend.go b/internal/app/proxyd/internal/frontend/frontend.go index 30bfc84a3..48103f0be 100644 --- a/internal/app/proxyd/internal/frontend/frontend.go +++ b/internal/app/proxyd/internal/frontend/frontend.go @@ -14,8 +14,6 @@ import ( "sync" "time" - "github.com/talos-systems/talos/internal/app/proxyd/internal/backend" - tnet "github.com/talos-systems/talos/pkg/net" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" @@ -24,6 +22,9 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" + + "github.com/talos-systems/talos/internal/app/proxyd/internal/backend" + tnet "github.com/talos-systems/talos/pkg/net" ) // ReverseProxy represents a reverse proxy server. diff --git a/internal/app/proxyd/internal/frontend/frontend_test.go b/internal/app/proxyd/internal/frontend/frontend_test.go index 7f11d9658..b4a451668 100644 --- a/internal/app/proxyd/internal/frontend/frontend_test.go +++ b/internal/app/proxyd/internal/frontend/frontend_test.go @@ -15,11 +15,12 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/suite" - "github.com/talos-systems/talos/internal/app/proxyd/internal/backend" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/talos-systems/talos/internal/app/proxyd/internal/backend" + "k8s.io/client-go/kubernetes/fake" ) diff --git a/internal/app/proxyd/internal/reg/reg.go b/internal/app/proxyd/internal/reg/reg.go index 03b608907..1031fa4b6 100644 --- a/internal/app/proxyd/internal/reg/reg.go +++ b/internal/app/proxyd/internal/reg/reg.go @@ -8,9 +8,10 @@ import ( "context" "github.com/golang/protobuf/ptypes/empty" + "google.golang.org/grpc" + "github.com/talos-systems/talos/internal/app/proxyd/internal/frontend" "github.com/talos-systems/talos/internal/app/proxyd/proto" - "google.golang.org/grpc" ) // Registrator is the concrete type that implements the factory.Registrator and diff --git a/internal/app/proxyd/internal/reg/reg_test.go b/internal/app/proxyd/internal/reg/reg_test.go index 247320ac7..fcc85caf3 100644 --- a/internal/app/proxyd/internal/reg/reg_test.go +++ b/internal/app/proxyd/internal/reg/reg_test.go @@ -15,10 +15,11 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/stretchr/testify/suite" + "google.golang.org/grpc" + "github.com/talos-systems/talos/internal/app/proxyd/internal/frontend" "github.com/talos-systems/talos/internal/app/proxyd/proto" "github.com/talos-systems/talos/pkg/grpc/factory" - "google.golang.org/grpc" ) type ProxydSuite struct { diff --git a/internal/app/proxyd/main.go b/internal/app/proxyd/main.go index 23f30e747..653a20349 100644 --- a/internal/app/proxyd/main.go +++ b/internal/app/proxyd/main.go @@ -9,6 +9,9 @@ import ( "flag" "log" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/tools/clientcmd" + "github.com/talos-systems/talos/internal/app/machined/pkg/system/conditions" "github.com/talos-systems/talos/internal/app/proxyd/internal/frontend" "github.com/talos-systems/talos/internal/app/proxyd/internal/reg" @@ -16,8 +19,6 @@ import ( "github.com/talos-systems/talos/pkg/grpc/factory" "github.com/talos-systems/talos/pkg/startup" "github.com/talos-systems/talos/pkg/userdata" - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/tools/clientcmd" pkgnet "github.com/talos-systems/talos/pkg/net" ) diff --git a/internal/app/trustd/internal/reg/reg.go b/internal/app/trustd/internal/reg/reg.go index 0b431005e..d709a4f07 100644 --- a/internal/app/trustd/internal/reg/reg.go +++ b/internal/app/trustd/internal/reg/reg.go @@ -11,10 +11,11 @@ import ( "os" "path" + "google.golang.org/grpc" + "github.com/talos-systems/talos/internal/app/trustd/proto" "github.com/talos-systems/talos/pkg/crypto/x509" "github.com/talos-systems/talos/pkg/userdata" - "google.golang.org/grpc" ) // Registrator is the concrete type that implements the factory.Registrator and diff --git a/internal/app/trustd/main.go b/internal/app/trustd/main.go index b9a2e21d4..6ea521c74 100644 --- a/internal/app/trustd/main.go +++ b/internal/app/trustd/main.go @@ -8,6 +8,9 @@ import ( "flag" "log" + "google.golang.org/grpc" + "google.golang.org/grpc/credentials" + "github.com/talos-systems/talos/internal/app/trustd/internal/reg" "github.com/talos-systems/talos/pkg/constants" "github.com/talos-systems/talos/pkg/grpc/factory" @@ -15,8 +18,6 @@ import ( "github.com/talos-systems/talos/pkg/grpc/tls" "github.com/talos-systems/talos/pkg/startup" "github.com/talos-systems/talos/pkg/userdata" - "google.golang.org/grpc" - "google.golang.org/grpc/credentials" ) var dataPath *string diff --git a/internal/pkg/installer/bootloader/syslinux/syslinux.go b/internal/pkg/installer/bootloader/syslinux/syslinux.go index 9cbd24a1f..475ab187f 100644 --- a/internal/pkg/installer/bootloader/syslinux/syslinux.go +++ b/internal/pkg/installer/bootloader/syslinux/syslinux.go @@ -13,6 +13,7 @@ import ( "text/template" "github.com/pkg/errors" + "github.com/talos-systems/talos/pkg/cmd" "golang.org/x/sys/unix" diff --git a/internal/pkg/installer/installer.go b/internal/pkg/installer/installer.go index bb073cc7f..8e62ad00f 100644 --- a/internal/pkg/installer/installer.go +++ b/internal/pkg/installer/installer.go @@ -12,6 +12,8 @@ import ( "unsafe" "github.com/pkg/errors" + "golang.org/x/sys/unix" + "github.com/talos-systems/talos/internal/pkg/installer/bootloader/syslinux" "github.com/talos-systems/talos/internal/pkg/installer/manifest" "github.com/talos-systems/talos/internal/pkg/kernel" @@ -20,7 +22,6 @@ import ( "github.com/talos-systems/talos/internal/pkg/mount/manager/owned" "github.com/talos-systems/talos/pkg/constants" "github.com/talos-systems/talos/pkg/userdata" - "golang.org/x/sys/unix" ) // Installer represents the installer logic. It serves as the entrypoint to all diff --git a/internal/pkg/installer/manifest/manifest.go b/internal/pkg/installer/manifest/manifest.go index 9cc32698d..a9cabadf7 100644 --- a/internal/pkg/installer/manifest/manifest.go +++ b/internal/pkg/installer/manifest/manifest.go @@ -13,6 +13,7 @@ import ( "strings" "github.com/pkg/errors" + "github.com/talos-systems/talos/pkg/blockdevice" "github.com/talos-systems/talos/pkg/blockdevice/filesystem/vfat" "github.com/talos-systems/talos/pkg/blockdevice/filesystem/xfs" diff --git a/internal/pkg/installer/manifest/manifest_test.go b/internal/pkg/installer/manifest/manifest_test.go index bbe37d91e..23ddd7bc9 100644 --- a/internal/pkg/installer/manifest/manifest_test.go +++ b/internal/pkg/installer/manifest/manifest_test.go @@ -13,8 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/talos-systems/talos/pkg/userdata" "gopkg.in/yaml.v2" + + "github.com/talos-systems/talos/pkg/userdata" ) type manifestSuite struct { diff --git a/internal/pkg/installer/manifest/verify.go b/internal/pkg/installer/manifest/verify.go index dc650852c..b1a75e1d5 100644 --- a/internal/pkg/installer/manifest/verify.go +++ b/internal/pkg/installer/manifest/verify.go @@ -6,6 +6,7 @@ package manifest import ( "github.com/pkg/errors" + "github.com/talos-systems/talos/pkg/blockdevice/probe" "github.com/talos-systems/talos/pkg/constants" "github.com/talos-systems/talos/pkg/userdata" diff --git a/internal/pkg/installer/manifest/verify_test.go b/internal/pkg/installer/manifest/verify_test.go index 4571c1476..b3b71ef70 100644 --- a/internal/pkg/installer/manifest/verify_test.go +++ b/internal/pkg/installer/manifest/verify_test.go @@ -8,8 +8,9 @@ import ( "testing" "github.com/stretchr/testify/suite" - "github.com/talos-systems/talos/pkg/userdata" "gopkg.in/yaml.v2" + + "github.com/talos-systems/talos/pkg/userdata" ) type validateSuite struct { diff --git a/internal/pkg/kernel/kspp/kspp.go b/internal/pkg/kernel/kspp/kspp.go index a04274b94..bcace0dd6 100644 --- a/internal/pkg/kernel/kspp/kspp.go +++ b/internal/pkg/kernel/kspp/kspp.go @@ -7,6 +7,7 @@ package kspp import ( "github.com/hashicorp/go-multierror" "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/pkg/kernel" "github.com/talos-systems/talos/pkg/sysctl" ) diff --git a/internal/pkg/mount/manager/manager.go b/internal/pkg/mount/manager/manager.go index 71d63756b..3ec47ec0b 100644 --- a/internal/pkg/mount/manager/manager.go +++ b/internal/pkg/mount/manager/manager.go @@ -6,6 +6,7 @@ package manager import ( "github.com/pkg/errors" + "github.com/talos-systems/talos/internal/pkg/mount" ) diff --git a/internal/pkg/mount/manager/owned/owned.go b/internal/pkg/mount/manager/owned/owned.go index e67cf6fe1..daf4eafe6 100644 --- a/internal/pkg/mount/manager/owned/owned.go +++ b/internal/pkg/mount/manager/owned/owned.go @@ -8,10 +8,11 @@ import ( "log" "github.com/pkg/errors" + "golang.org/x/sys/unix" + "github.com/talos-systems/talos/internal/pkg/mount" "github.com/talos-systems/talos/pkg/blockdevice/probe" "github.com/talos-systems/talos/pkg/constants" - "golang.org/x/sys/unix" ) // MountPointsForDevice returns the mountpoints required to boot the system. diff --git a/internal/pkg/mount/manager/squashfs/squashfs.go b/internal/pkg/mount/manager/squashfs/squashfs.go index ed1afdb68..3d88c9657 100644 --- a/internal/pkg/mount/manager/squashfs/squashfs.go +++ b/internal/pkg/mount/manager/squashfs/squashfs.go @@ -5,10 +5,11 @@ package squashfs import ( - "github.com/talos-systems/talos/internal/pkg/mount" - "github.com/talos-systems/talos/pkg/constants" "golang.org/x/sys/unix" "gopkg.in/freddierice/go-losetup.v1" + + "github.com/talos-systems/talos/internal/pkg/mount" + "github.com/talos-systems/talos/pkg/constants" ) // MountPoints returns the mountpoints required to boot the system. diff --git a/internal/pkg/mount/manager/virtual/virtual.go b/internal/pkg/mount/manager/virtual/virtual.go index 9a6ea7dea..1b6788c96 100644 --- a/internal/pkg/mount/manager/virtual/virtual.go +++ b/internal/pkg/mount/manager/virtual/virtual.go @@ -5,8 +5,9 @@ package virtual import ( - "github.com/talos-systems/talos/internal/pkg/mount" "golang.org/x/sys/unix" + + "github.com/talos-systems/talos/internal/pkg/mount" ) // MountPoints returns the mountpoints required to boot the system. diff --git a/internal/pkg/mount/mount.go b/internal/pkg/mount/mount.go index 95aac2e0b..c4cfcba7c 100644 --- a/internal/pkg/mount/mount.go +++ b/internal/pkg/mount/mount.go @@ -13,12 +13,13 @@ import ( "time" "github.com/pkg/errors" + "golang.org/x/sys/unix" + "github.com/talos-systems/talos/pkg/blockdevice" "github.com/talos-systems/talos/pkg/blockdevice/filesystem/xfs" gptpartition "github.com/talos-systems/talos/pkg/blockdevice/table/gpt/partition" "github.com/talos-systems/talos/pkg/blockdevice/util" "github.com/talos-systems/talos/pkg/constants" - "golang.org/x/sys/unix" ) // RetryFunc defines the requirements for retrying a mount point operation. diff --git a/internal/pkg/mount/switchroot/switchroot.go b/internal/pkg/mount/switchroot/switchroot.go index d662ec9a8..5bc960ede 100644 --- a/internal/pkg/mount/switchroot/switchroot.go +++ b/internal/pkg/mount/switchroot/switchroot.go @@ -9,8 +9,9 @@ import ( "os" "github.com/pkg/errors" - "github.com/talos-systems/talos/internal/pkg/mount/manager" "golang.org/x/sys/unix" + + "github.com/talos-systems/talos/internal/pkg/mount/manager" ) // Switch moves the rootfs to a specified directory. See diff --git a/pkg/archiver/tar_test.go b/pkg/archiver/tar_test.go index 5f802a0a6..ccf1c40fd 100644 --- a/pkg/archiver/tar_test.go +++ b/pkg/archiver/tar_test.go @@ -16,6 +16,7 @@ import ( "testing" "github.com/stretchr/testify/suite" + "github.com/talos-systems/talos/pkg/archiver" ) diff --git a/pkg/archiver/walker_test.go b/pkg/archiver/walker_test.go index d770cecd4..e61dcc602 100644 --- a/pkg/archiver/walker_test.go +++ b/pkg/archiver/walker_test.go @@ -11,6 +11,7 @@ import ( "testing" "github.com/stretchr/testify/suite" + "github.com/talos-systems/talos/pkg/archiver" ) diff --git a/pkg/blockdevice/blkpg/blkpg.go b/pkg/blockdevice/blkpg/blkpg.go index e8a5a38c0..de01ab474 100644 --- a/pkg/blockdevice/blkpg/blkpg.go +++ b/pkg/blockdevice/blkpg/blkpg.go @@ -9,9 +9,10 @@ import ( "syscall" "unsafe" + "golang.org/x/sys/unix" + "github.com/talos-systems/talos/pkg/blockdevice/lba" "github.com/talos-systems/talos/pkg/blockdevice/table" - "golang.org/x/sys/unix" ) // InformKernelOfAdd invokes the BLKPG_ADD_PARTITION ioctl. diff --git a/pkg/blockdevice/blockdevice.go b/pkg/blockdevice/blockdevice.go index c3fca6b56..fb7d9da9e 100644 --- a/pkg/blockdevice/blockdevice.go +++ b/pkg/blockdevice/blockdevice.go @@ -13,6 +13,7 @@ import ( "unsafe" "github.com/pkg/errors" + "github.com/talos-systems/talos/pkg/blockdevice/table" "github.com/talos-systems/talos/pkg/blockdevice/table/gpt" diff --git a/pkg/blockdevice/probe/probe.go b/pkg/blockdevice/probe/probe.go index 917ae17c9..fea6e9a08 100644 --- a/pkg/blockdevice/probe/probe.go +++ b/pkg/blockdevice/probe/probe.go @@ -16,6 +16,7 @@ import ( "time" "github.com/pkg/errors" + "github.com/talos-systems/talos/pkg/blockdevice" "github.com/talos-systems/talos/pkg/blockdevice/filesystem" "github.com/talos-systems/talos/pkg/blockdevice/filesystem/iso9660" diff --git a/pkg/blockdevice/table/gpt/gpt.go b/pkg/blockdevice/table/gpt/gpt.go index e90fdc806..95714d2e6 100644 --- a/pkg/blockdevice/table/gpt/gpt.go +++ b/pkg/blockdevice/table/gpt/gpt.go @@ -11,6 +11,7 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" + "github.com/talos-systems/talos/pkg/blockdevice/blkpg" "github.com/talos-systems/talos/pkg/blockdevice/lba" "github.com/talos-systems/talos/pkg/blockdevice/table" diff --git a/pkg/blockdevice/table/gpt/header/header.go b/pkg/blockdevice/table/gpt/header/header.go index cd7707855..8e8ca6a5d 100644 --- a/pkg/blockdevice/table/gpt/header/header.go +++ b/pkg/blockdevice/table/gpt/header/header.go @@ -12,6 +12,7 @@ import ( "hash/crc32" "github.com/google/uuid" + "github.com/talos-systems/talos/pkg/blockdevice/lba" "github.com/talos-systems/talos/pkg/serde" ) diff --git a/pkg/blockdevice/table/gpt/partition/partition.go b/pkg/blockdevice/table/gpt/partition/partition.go index 32a302e3d..85d304046 100644 --- a/pkg/blockdevice/table/gpt/partition/partition.go +++ b/pkg/blockdevice/table/gpt/partition/partition.go @@ -11,8 +11,9 @@ import ( "fmt" "github.com/google/uuid" - "github.com/talos-systems/talos/pkg/serde" "golang.org/x/text/encoding/unicode" + + "github.com/talos-systems/talos/pkg/serde" ) // Partition represents a partition entry in a GUID partition table. diff --git a/pkg/chunker/file/file.go b/pkg/chunker/file/file.go index 5e002b445..c7ad34dc7 100644 --- a/pkg/chunker/file/file.go +++ b/pkg/chunker/file/file.go @@ -11,8 +11,9 @@ import ( "os" "path/filepath" - "github.com/talos-systems/talos/pkg/chunker" "gopkg.in/fsnotify.v1" + + "github.com/talos-systems/talos/pkg/chunker" ) // Options is the functional options struct. diff --git a/pkg/grpc/gen/gen.go b/pkg/grpc/gen/gen.go index 934c809dd..02e452a54 100644 --- a/pkg/grpc/gen/gen.go +++ b/pkg/grpc/gen/gen.go @@ -11,11 +11,12 @@ import ( "time" "github.com/hashicorp/go-multierror" + "google.golang.org/grpc" + "github.com/talos-systems/talos/internal/app/trustd/proto" "github.com/talos-systems/talos/pkg/crypto/x509" "github.com/talos-systems/talos/pkg/grpc/middleware/auth/basic" "github.com/talos-systems/talos/pkg/userdata" - "google.golang.org/grpc" ) // Generator represents the OS identity generator. diff --git a/pkg/grpc/middleware/auth/basic/basic.go b/pkg/grpc/middleware/auth/basic/basic.go index 05abc3203..f4648d2e4 100644 --- a/pkg/grpc/middleware/auth/basic/basic.go +++ b/pkg/grpc/middleware/auth/basic/basic.go @@ -9,10 +9,11 @@ import ( "errors" "fmt" - "github.com/talos-systems/talos/pkg/net" - "github.com/talos-systems/talos/pkg/userdata" "google.golang.org/grpc" "google.golang.org/grpc/credentials" + + "github.com/talos-systems/talos/pkg/net" + "github.com/talos-systems/talos/pkg/userdata" ) // Credentials describes an authorization method. diff --git a/pkg/grpc/tls/cert.go b/pkg/grpc/tls/cert.go index eaf3b5c90..7a624664d 100644 --- a/pkg/grpc/tls/cert.go +++ b/pkg/grpc/tls/cert.go @@ -14,6 +14,7 @@ import ( "time" "github.com/pkg/errors" + "github.com/talos-systems/talos/pkg/constants" "github.com/talos-systems/talos/pkg/grpc/gen" "github.com/talos-systems/talos/pkg/userdata" diff --git a/pkg/grpc/tls/tls.go b/pkg/grpc/tls/tls.go index e6e93723b..840042c9c 100644 --- a/pkg/grpc/tls/tls.go +++ b/pkg/grpc/tls/tls.go @@ -9,6 +9,7 @@ import ( "crypto/x509" "github.com/pkg/errors" + "github.com/talos-systems/talos/pkg/userdata" ) diff --git a/pkg/userdata/download/download.go b/pkg/userdata/download/download.go index f952c7e73..8ec20d8d2 100644 --- a/pkg/userdata/download/download.go +++ b/pkg/userdata/download/download.go @@ -14,9 +14,10 @@ import ( "net/url" "time" + yaml "gopkg.in/yaml.v2" + "github.com/talos-systems/talos/pkg/userdata" "github.com/talos-systems/talos/pkg/userdata/translate" - yaml "gopkg.in/yaml.v2" ) const b64 = "base64" diff --git a/pkg/userdata/generate/generate_test.go b/pkg/userdata/generate/generate_test.go index d31836bce..aa8aee438 100644 --- a/pkg/userdata/generate/generate_test.go +++ b/pkg/userdata/generate/generate_test.go @@ -10,9 +10,10 @@ import ( "testing" "github.com/stretchr/testify/suite" + "gopkg.in/yaml.v2" + "github.com/talos-systems/talos/pkg/userdata" "github.com/talos-systems/talos/pkg/userdata/generate" - "gopkg.in/yaml.v2" ) var ( diff --git a/pkg/userdata/kubernetes_security.go b/pkg/userdata/kubernetes_security.go index 21b7b0f1c..6568a2387 100644 --- a/pkg/userdata/kubernetes_security.go +++ b/pkg/userdata/kubernetes_security.go @@ -6,6 +6,7 @@ package userdata import ( "github.com/hashicorp/go-multierror" + "github.com/talos-systems/talos/pkg/crypto/x509" ) diff --git a/pkg/userdata/kubernetes_security_test.go b/pkg/userdata/kubernetes_security_test.go index 61512aaff..d7424398b 100644 --- a/pkg/userdata/kubernetes_security_test.go +++ b/pkg/userdata/kubernetes_security_test.go @@ -7,8 +7,9 @@ package userdata import ( "github.com/hashicorp/go-multierror" - "github.com/talos-systems/talos/pkg/crypto/x509" "golang.org/x/xerrors" + + "github.com/talos-systems/talos/pkg/crypto/x509" ) func (suite *validateSuite) TestValidateKubernetesSecurity() { diff --git a/pkg/userdata/os_security.go b/pkg/userdata/os_security.go index 6a4038f63..c8dcf9c6b 100644 --- a/pkg/userdata/os_security.go +++ b/pkg/userdata/os_security.go @@ -6,6 +6,7 @@ package userdata import ( "github.com/hashicorp/go-multierror" + "github.com/talos-systems/talos/pkg/crypto/x509" ) diff --git a/pkg/userdata/os_security_test.go b/pkg/userdata/os_security_test.go index d6955086c..722578654 100644 --- a/pkg/userdata/os_security_test.go +++ b/pkg/userdata/os_security_test.go @@ -7,8 +7,9 @@ package userdata import ( "github.com/hashicorp/go-multierror" - "github.com/talos-systems/talos/pkg/crypto/x509" "golang.org/x/xerrors" + + "github.com/talos-systems/talos/pkg/crypto/x509" ) func (suite *validateSuite) TestValidateOSSecurity() { diff --git a/pkg/userdata/translate/translate_v1alpha1.go b/pkg/userdata/translate/translate_v1alpha1.go index 1716269f8..90d451d2f 100644 --- a/pkg/userdata/translate/translate_v1alpha1.go +++ b/pkg/userdata/translate/translate_v1alpha1.go @@ -9,15 +9,16 @@ import ( "strings" "time" - "github.com/talos-systems/talos/pkg/constants" - "github.com/talos-systems/talos/pkg/crypto/x509" - "github.com/talos-systems/talos/pkg/userdata" - v1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1" yaml "gopkg.in/yaml.v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kubeproxyconfig "k8s.io/kube-proxy/config/v1alpha1" kubeletconfig "k8s.io/kubelet/config/v1beta1" kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" + + "github.com/talos-systems/talos/pkg/constants" + "github.com/talos-systems/talos/pkg/crypto/x509" + "github.com/talos-systems/talos/pkg/userdata" + v1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1" ) // V1Alpha1Translator holds info about a v1alpha1 machine config translation layer diff --git a/pkg/userdata/userdata.go b/pkg/userdata/userdata.go index f3d34783a..2bba32765 100644 --- a/pkg/userdata/userdata.go +++ b/pkg/userdata/userdata.go @@ -14,9 +14,10 @@ import ( "strings" "github.com/hashicorp/go-multierror" + "golang.org/x/xerrors" + "github.com/talos-systems/talos/pkg/crypto/x509" "github.com/talos-systems/talos/pkg/net" - "golang.org/x/xerrors" yaml "gopkg.in/yaml.v2" ) diff --git a/pkg/userdata/v1alpha1/generate/controlplane.go b/pkg/userdata/v1alpha1/generate/controlplane.go index a02589f27..2765a0df6 100644 --- a/pkg/userdata/v1alpha1/generate/controlplane.go +++ b/pkg/userdata/v1alpha1/generate/controlplane.go @@ -5,8 +5,9 @@ package generate import ( - v1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1" yaml "gopkg.in/yaml.v2" + + v1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1" ) func controlPlaneUd(in *Input) (string, error) { diff --git a/pkg/userdata/v1alpha1/generate/generate_test.go b/pkg/userdata/v1alpha1/generate/generate_test.go index cc1e16a63..553fa25b0 100644 --- a/pkg/userdata/v1alpha1/generate/generate_test.go +++ b/pkg/userdata/v1alpha1/generate/generate_test.go @@ -9,9 +9,10 @@ import ( "testing" "github.com/stretchr/testify/suite" + "gopkg.in/yaml.v2" + v1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1" udgenv1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1/generate" - "gopkg.in/yaml.v2" ) var input *udgenv1alpha1.Input diff --git a/pkg/userdata/v1alpha1/generate/init.go b/pkg/userdata/v1alpha1/generate/init.go index 138c80c6e..8a0bfcc0c 100644 --- a/pkg/userdata/v1alpha1/generate/init.go +++ b/pkg/userdata/v1alpha1/generate/init.go @@ -5,8 +5,9 @@ package generate import ( - v1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1" yaml "gopkg.in/yaml.v2" + + v1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1" ) func initUd(in *Input) (string, error) { diff --git a/pkg/userdata/v1alpha1/generate/join.go b/pkg/userdata/v1alpha1/generate/join.go index 6794722f9..ea45eb5e2 100644 --- a/pkg/userdata/v1alpha1/generate/join.go +++ b/pkg/userdata/v1alpha1/generate/join.go @@ -5,8 +5,9 @@ package generate import ( - v1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1" yaml "gopkg.in/yaml.v2" + + v1alpha1 "github.com/talos-systems/talos/pkg/userdata/v1alpha1" ) func workerUd(in *Input) (string, error) {