diff --git a/.github/actions/install_docgen/action.yml b/.github/actions/install_docgen/action.yml index c74afedf6..7d1d57060 100644 --- a/.github/actions/install_docgen/action.yml +++ b/.github/actions/install_docgen/action.yml @@ -9,7 +9,7 @@ runs: with: fetch-depth: 0 repository: "siderolabs/talos" - ref: "v1.2.6" + ref: "v1.3.1" path: talos # This is required to be able to build docgen diff --git a/cli/internal/cmd/configgenerate.go b/cli/internal/cmd/configgenerate.go index 1f3414aad..2fd494378 100644 --- a/cli/internal/cmd/configgenerate.go +++ b/cli/internal/cmd/configgenerate.go @@ -13,9 +13,9 @@ import ( "github.com/edgelesssys/constellation/v2/internal/config" "github.com/edgelesssys/constellation/v2/internal/constants" "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/siderolabs/talos/pkg/machinery/config/encoder" "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/talos-systems/talos/pkg/machinery/config/encoder" ) func newConfigGenerateCmd() *cobra.Command { diff --git a/cli/internal/cmd/upgradeplan.go b/cli/internal/cmd/upgradeplan.go index a4dba4bff..24ada54ac 100644 --- a/cli/internal/cmd/upgradeplan.go +++ b/cli/internal/cmd/upgradeplan.go @@ -22,9 +22,9 @@ import ( "github.com/edgelesssys/constellation/v2/internal/sigstore" "github.com/edgelesssys/constellation/v2/internal/versionsapi" "github.com/manifoldco/promptui" + "github.com/siderolabs/talos/pkg/machinery/config/encoder" "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/talos-systems/talos/pkg/machinery/config/encoder" "golang.org/x/mod/semver" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/go.mod b/go.mod index e769e29a4..24741d585 100644 --- a/go.mod +++ b/go.mod @@ -78,12 +78,12 @@ require ( github.com/microsoft/ApplicationInsights-Go v0.4.4 github.com/pkg/errors v0.9.1 github.com/schollz/progressbar/v3 v3.12.2 + github.com/siderolabs/talos/pkg/machinery v1.3.1 github.com/sigstore/rekor v1.0.1 github.com/sigstore/sigstore v1.5.0 github.com/spf13/afero v1.9.3 github.com/spf13/cobra v1.6.1 github.com/stretchr/testify v1.8.1 - github.com/talos-systems/talos/pkg/machinery v1.2.7 go.uber.org/goleak v1.2.0 go.uber.org/multierr v1.9.0 go.uber.org/zap v1.24.0 diff --git a/go.sum b/go.sum index 6bf7c3e6a..d404aa1f1 100644 --- a/go.sum +++ b/go.sum @@ -1027,7 +1027,7 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU= +github.com/onsi/ginkgo/v2 v2.2.0 h1:3ZNA3L1c5FYDFTTxbFeVGGD8jYvjYauHD30YgLxVsNI= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= @@ -1176,6 +1176,8 @@ github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNX github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/siderolabs/talos/pkg/machinery v1.3.1 h1:zZ7deoEvNIvRBq9hOsfBWtfZCCmne0JkumW/GA1vyw8= +github.com/siderolabs/talos/pkg/machinery v1.3.1/go.mod h1:PXpbFE4TwMm0c2v4wRRU6EZlEEknUde1pwcsRAqf4bs= github.com/sigstore/rekor v1.0.1 h1:rcESXSNkAPRWFYZel9rarspdvneET60F2ngNkadi89c= github.com/sigstore/rekor v1.0.1/go.mod h1:ecTKdZWGWqE1pl3U1m1JebQJLU/hSjD9vYHOmHQ7w4g= github.com/sigstore/sigstore v1.5.0 h1:NqstQ6SwwhQsp6Ll0wgk/d9g5MlfmEppo14aquUjJ/8= @@ -1249,8 +1251,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/talos-systems/talos/pkg/machinery v1.2.7 h1:z7zfjQX4Hinf+e72LgG2WzyslZkvqgAHWuYU6PJWb3Q= -github.com/talos-systems/talos/pkg/machinery v1.2.7/go.mod h1:rw43co/ZCikBHnFiuQhmmMmk4NYNdCC/N3nx8c4K/v0= github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= github.com/tent/canonical-json-go v0.0.0-20130607151641-96e4ba3a7613 h1:iGnD/q9160NWqKZZ5vY4p0dMiYMRknzctfSkqA4nBDw= github.com/tent/canonical-json-go v0.0.0-20130607151641-96e4ba3a7613/go.mod h1:g6AnIpDSYMcphz193otpSIzN+11Rs+AAIIC6rm1enug= diff --git a/hack/check-licenses.sh b/hack/check-licenses.sh index daeacbebd..c41ac4ab9 100755 --- a/hack/check-licenses.sh +++ b/hack/check-licenses.sh @@ -24,7 +24,7 @@ go-licenses csv ./... | { MPL-2.0) case ${pkg} in - github.com/talos-systems/talos/pkg/machinery/config/encoder) ;; + github.com/siderolabs/talos/pkg/machinery/config/encoder) ;; github.com/letsencrypt/boulder) ;; diff --git a/hack/go.mod b/hack/go.mod index 5e3779e61..29e79b76c 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -233,6 +233,7 @@ require ( github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect github.com/sergi/go-diff v1.2.0 // indirect github.com/shopspring/decimal v1.2.0 // indirect + github.com/siderolabs/talos/pkg/machinery v1.3.1 // indirect github.com/sigstore/rekor v1.0.1 // indirect github.com/sigstore/sigstore v1.5.0 // indirect github.com/sirupsen/logrus v1.9.0 // indirect @@ -240,7 +241,6 @@ require ( github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/talos-systems/talos/pkg/machinery v1.2.7 // indirect github.com/tent/canonical-json-go v0.0.0-20130607151641-96e4ba3a7613 // indirect github.com/theupdateframework/go-tuf v0.5.2-0.20220930112810-3890c1e7ace4 // indirect github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect diff --git a/hack/go.sum b/hack/go.sum index 62aa1c654..be1028be3 100644 --- a/hack/go.sum +++ b/hack/go.sum @@ -1031,7 +1031,7 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU= +github.com/onsi/ginkgo/v2 v2.2.0 h1:3ZNA3L1c5FYDFTTxbFeVGGD8jYvjYauHD30YgLxVsNI= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= @@ -1182,6 +1182,8 @@ github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNX github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/siderolabs/talos/pkg/machinery v1.3.1 h1:zZ7deoEvNIvRBq9hOsfBWtfZCCmne0JkumW/GA1vyw8= +github.com/siderolabs/talos/pkg/machinery v1.3.1/go.mod h1:PXpbFE4TwMm0c2v4wRRU6EZlEEknUde1pwcsRAqf4bs= github.com/sigstore/rekor v1.0.1 h1:rcESXSNkAPRWFYZel9rarspdvneET60F2ngNkadi89c= github.com/sigstore/rekor v1.0.1/go.mod h1:ecTKdZWGWqE1pl3U1m1JebQJLU/hSjD9vYHOmHQ7w4g= github.com/sigstore/sigstore v1.5.0 h1:NqstQ6SwwhQsp6Ll0wgk/d9g5MlfmEppo14aquUjJ/8= @@ -1257,8 +1259,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/talos-systems/talos/pkg/machinery v1.2.7 h1:z7zfjQX4Hinf+e72LgG2WzyslZkvqgAHWuYU6PJWb3Q= -github.com/talos-systems/talos/pkg/machinery v1.2.7/go.mod h1:rw43co/ZCikBHnFiuQhmmMmk4NYNdCC/N3nx8c4K/v0= github.com/tent/canonical-json-go v0.0.0-20130607151641-96e4ba3a7613 h1:iGnD/q9160NWqKZZ5vY4p0dMiYMRknzctfSkqA4nBDw= github.com/tent/canonical-json-go v0.0.0-20130607151641-96e4ba3a7613/go.mod h1:g6AnIpDSYMcphz193otpSIzN+11Rs+AAIIC6rm1enug= github.com/theupdateframework/go-tuf v0.5.2-0.20220930112810-3890c1e7ace4 h1:1i/Afw3rmaR1gF3sfVkG2X6ldkikQwA9zY380LrR5YI= diff --git a/internal/attestation/measurements/measurements.go b/internal/attestation/measurements/measurements.go index 522c057ae..6fbcbf4d6 100644 --- a/internal/attestation/measurements/measurements.go +++ b/internal/attestation/measurements/measurements.go @@ -23,7 +23,7 @@ import ( "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/v2/internal/sigstore" "github.com/google/go-tpm/tpmutil" - "github.com/talos-systems/talos/pkg/machinery/config/encoder" + "github.com/siderolabs/talos/pkg/machinery/config/encoder" "go.uber.org/multierr" "gopkg.in/yaml.v3" ) diff --git a/internal/attestation/measurements/measurements_test.go b/internal/attestation/measurements/measurements_test.go index 3ca162348..61d4f2dba 100644 --- a/internal/attestation/measurements/measurements_test.go +++ b/internal/attestation/measurements/measurements_test.go @@ -16,9 +16,9 @@ import ( "testing" "github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider" + "github.com/siderolabs/talos/pkg/machinery/config/encoder" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/talos-systems/talos/pkg/machinery/config/encoder" "gopkg.in/yaml.v3" ) diff --git a/internal/config/config_doc.go b/internal/config/config_doc.go index 83c94c5af..78534a276 100644 --- a/internal/config/config_doc.go +++ b/internal/config/config_doc.go @@ -7,7 +7,7 @@ package config import ( - "github.com/talos-systems/talos/pkg/machinery/config/encoder" + "github.com/siderolabs/talos/pkg/machinery/config/encoder" ) var ( diff --git a/internal/file/file.go b/internal/file/file.go index 115042cd7..1a3d9d488 100644 --- a/internal/file/file.go +++ b/internal/file/file.go @@ -19,8 +19,8 @@ import ( "os" "path" + "github.com/siderolabs/talos/pkg/machinery/config/encoder" "github.com/spf13/afero" - "github.com/talos-systems/talos/pkg/machinery/config/encoder" "gopkg.in/yaml.v3" )