From a3149578a0efb49b44d7607f847b4d596d260642 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Tue, 15 Aug 2023 08:59:54 +0200 Subject: [PATCH] Bump github.com/blang/semver to v4 --- .../kubeadm/internal/controllers/kubeadmconfig_controller.go | 2 +- bootstrap/kubeadm/types/utils.go | 2 +- bootstrap/kubeadm/types/utils_test.go | 2 +- cmd/clusterctl/api/v1alpha3/metadata_type.go | 2 +- cmd/clusterctl/client/cluster/cert_manager.go | 2 +- cmd/clusterctl/client/repository/repository_github.go | 2 +- cmd/clusterctl/cmd/version_checker.go | 2 +- .../kubeadm/api/v1beta1/kubeadm_control_plane_webhook.go | 2 +- controlplane/kubeadm/internal/controllers/controller.go | 2 +- controlplane/kubeadm/internal/controllers/controller_test.go | 2 +- controlplane/kubeadm/internal/controllers/fakes_test.go | 2 +- controlplane/kubeadm/internal/controllers/remediation.go | 2 +- controlplane/kubeadm/internal/controllers/scale.go | 2 +- controlplane/kubeadm/internal/controllers/upgrade.go | 2 +- controlplane/kubeadm/internal/workload_cluster.go | 2 +- controlplane/kubeadm/internal/workload_cluster_coredns.go | 2 +- controlplane/kubeadm/internal/workload_cluster_coredns_test.go | 2 +- controlplane/kubeadm/internal/workload_cluster_etcd.go | 2 +- controlplane/kubeadm/internal/workload_cluster_etcd_test.go | 2 +- controlplane/kubeadm/internal/workload_cluster_rbac.go | 2 +- controlplane/kubeadm/internal/workload_cluster_rbac_test.go | 2 +- controlplane/kubeadm/internal/workload_cluster_test.go | 2 +- go.mod | 3 +-- go.sum | 2 -- hack/tools/go.mod | 3 +-- hack/tools/go.sum | 2 -- hack/tools/mdbook/releaselink/releaselink.go | 2 +- internal/contract/controlplane.go | 2 +- internal/controllers/machineset/machineset_preflight.go | 2 +- internal/goproxy/goproxy.go | 2 +- internal/goproxy/goproxy_test.go | 2 +- internal/util/kubeadm/kubeadm.go | 2 +- internal/util/kubeadm/kubeadm_test.go | 2 +- internal/webhooks/cluster.go | 2 +- test/e2e/cluster_upgrade_runtimesdk_test.go | 2 +- test/e2e/common.go | 2 +- test/extension/handlers/topologymutation/handler.go | 2 +- test/framework/clusterctl/repository.go | 2 +- test/framework/daemonset_helpers.go | 2 +- test/framework/kubernetesversions/versions.go | 2 +- test/go.mod | 3 +-- test/go.sum | 2 -- test/infrastructure/docker/exp/internal/docker/nodepool.go | 2 +- test/infrastructure/docker/internal/docker/machine.go | 2 +- .../docker/internal/provisioning/cloudinit/adapter_test.go | 2 +- .../docker/internal/provisioning/cloudinit/writefiles.go | 2 +- .../docker/internal/provisioning/cloudinit/writefiles_test.go | 2 +- test/infrastructure/kind/mapper.go | 2 +- test/infrastructure/kind/mapper_test.go | 2 +- util/collections/machine_collection.go | 2 +- util/collections/machine_filters.go | 2 +- util/util.go | 2 +- util/util_test.go | 2 +- util/version/version.go | 2 +- util/version/version_test.go | 2 +- 55 files changed, 52 insertions(+), 61 deletions(-) diff --git a/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go b/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go index 18e1fce5716d..dd0d572f2c52 100644 --- a/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go +++ b/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go @@ -22,7 +22,7 @@ import ( "strconv" "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/go-logr/logr" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" diff --git a/bootstrap/kubeadm/types/utils.go b/bootstrap/kubeadm/types/utils.go index 0ee8c23bb875..7372d9378be7 100644 --- a/bootstrap/kubeadm/types/utils.go +++ b/bootstrap/kubeadm/types/utils.go @@ -18,7 +18,7 @@ limitations under the License. package utils import ( - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/bootstrap/kubeadm/types/utils_test.go b/bootstrap/kubeadm/types/utils_test.go index 5153d834a0dc..62a0a72d48f5 100644 --- a/bootstrap/kubeadm/types/utils_test.go +++ b/bootstrap/kubeadm/types/utils_test.go @@ -19,7 +19,7 @@ package utils import ( "testing" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/google/go-cmp/cmp" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/cmd/clusterctl/api/v1alpha3/metadata_type.go b/cmd/clusterctl/api/v1alpha3/metadata_type.go index 0eacecbf4346..0009c160bec9 100644 --- a/cmd/clusterctl/api/v1alpha3/metadata_type.go +++ b/cmd/clusterctl/api/v1alpha3/metadata_type.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha3 import ( - "github.com/blang/semver" + "github.com/blang/semver/v4" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/version" ) diff --git a/cmd/clusterctl/client/cluster/cert_manager.go b/cmd/clusterctl/client/cluster/cert_manager.go index 954c401b9d95..2c73c5d4b744 100644 --- a/cmd/clusterctl/client/cluster/cert_manager.go +++ b/cmd/clusterctl/client/cluster/cert_manager.go @@ -21,7 +21,7 @@ import ( _ "embed" "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/cmd/clusterctl/client/repository/repository_github.go b/cmd/clusterctl/client/repository/repository_github.go index 5cddd0128cee..ab51f41fb3ab 100644 --- a/cmd/clusterctl/client/repository/repository_github.go +++ b/cmd/clusterctl/client/repository/repository_github.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/google/go-github/v53/github" "github.com/pkg/errors" "golang.org/x/oauth2" diff --git a/cmd/clusterctl/cmd/version_checker.go b/cmd/clusterctl/cmd/version_checker.go index c195a5eb0854..f0334225cac7 100644 --- a/cmd/clusterctl/cmd/version_checker.go +++ b/cmd/clusterctl/cmd/version_checker.go @@ -26,7 +26,7 @@ import ( "time" "github.com/adrg/xdg" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/google/go-github/v53/github" "github.com/pkg/errors" "golang.org/x/oauth2" diff --git a/controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook.go b/controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook.go index 9db8198d29ce..c84a799c5935 100644 --- a/controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook.go +++ b/controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/coredns/corefile-migration/migration" jsonpatch "github.com/evanphx/json-patch/v5" "github.com/pkg/errors" diff --git a/controlplane/kubeadm/internal/controllers/controller.go b/controlplane/kubeadm/internal/controllers/controller.go index 73c2ae7b9ba8..dd388c61c0c7 100644 --- a/controlplane/kubeadm/internal/controllers/controller.go +++ b/controlplane/kubeadm/internal/controllers/controller.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/controlplane/kubeadm/internal/controllers/controller_test.go b/controlplane/kubeadm/internal/controllers/controller_test.go index 8f8f73472382..e364176b0b25 100644 --- a/controlplane/kubeadm/internal/controllers/controller_test.go +++ b/controlplane/kubeadm/internal/controllers/controller_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/controlplane/kubeadm/internal/controllers/fakes_test.go b/controlplane/kubeadm/internal/controllers/fakes_test.go index 7f5a962e2db8..ebc04e404246 100644 --- a/controlplane/kubeadm/internal/controllers/fakes_test.go +++ b/controlplane/kubeadm/internal/controllers/fakes_test.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controlplane/kubeadm/internal/controllers/remediation.go b/controlplane/kubeadm/internal/controllers/remediation.go index d1c8fd44efe9..69861243728a 100644 --- a/controlplane/kubeadm/internal/controllers/remediation.go +++ b/controlplane/kubeadm/internal/controllers/remediation.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/go-logr/logr" "github.com/pkg/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controlplane/kubeadm/internal/controllers/scale.go b/controlplane/kubeadm/internal/controllers/scale.go index 4ed1682c210b..66608e60ae61 100644 --- a/controlplane/kubeadm/internal/controllers/scale.go +++ b/controlplane/kubeadm/internal/controllers/scale.go @@ -20,7 +20,7 @@ import ( "context" "strings" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/controlplane/kubeadm/internal/controllers/upgrade.go b/controlplane/kubeadm/internal/controllers/upgrade.go index b1528283d959..f51bce9d84b7 100644 --- a/controlplane/kubeadm/internal/controllers/upgrade.go +++ b/controlplane/kubeadm/internal/controllers/upgrade.go @@ -19,7 +19,7 @@ package controllers import ( "context" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" ctrl "sigs.k8s.io/controller-runtime" diff --git a/controlplane/kubeadm/internal/workload_cluster.go b/controlplane/kubeadm/internal/workload_cluster.go index 4112106f570e..9d7de352b817 100644 --- a/controlplane/kubeadm/internal/workload_cluster.go +++ b/controlplane/kubeadm/internal/workload_cluster.go @@ -29,7 +29,7 @@ import ( "reflect" "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/controlplane/kubeadm/internal/workload_cluster_coredns.go b/controlplane/kubeadm/internal/workload_cluster_coredns.go index 9ebf7eda9950..5699c9c06656 100644 --- a/controlplane/kubeadm/internal/workload_cluster_coredns.go +++ b/controlplane/kubeadm/internal/workload_cluster_coredns.go @@ -22,7 +22,7 @@ import ( "reflect" "strings" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/coredns/corefile-migration/migration" "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" diff --git a/controlplane/kubeadm/internal/workload_cluster_coredns_test.go b/controlplane/kubeadm/internal/workload_cluster_coredns_test.go index bac6124e733b..38e6aa1f4c4b 100644 --- a/controlplane/kubeadm/internal/workload_cluster_coredns_test.go +++ b/controlplane/kubeadm/internal/workload_cluster_coredns_test.go @@ -19,7 +19,7 @@ package internal import ( "testing" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/google/go-cmp/cmp" . "github.com/onsi/gomega" "github.com/pkg/errors" diff --git a/controlplane/kubeadm/internal/workload_cluster_etcd.go b/controlplane/kubeadm/internal/workload_cluster_etcd.go index 3b3662a29f01..bb4c4d417960 100644 --- a/controlplane/kubeadm/internal/workload_cluster_etcd.go +++ b/controlplane/kubeadm/internal/workload_cluster_etcd.go @@ -19,7 +19,7 @@ package internal import ( "context" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" kerrors "k8s.io/apimachinery/pkg/util/errors" diff --git a/controlplane/kubeadm/internal/workload_cluster_etcd_test.go b/controlplane/kubeadm/internal/workload_cluster_etcd_test.go index 9972cd283b69..e80e869a51ba 100644 --- a/controlplane/kubeadm/internal/workload_cluster_etcd_test.go +++ b/controlplane/kubeadm/internal/workload_cluster_etcd_test.go @@ -21,7 +21,7 @@ import ( "errors" "testing" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/google/go-cmp/cmp" . "github.com/onsi/gomega" pb "go.etcd.io/etcd/api/v3/etcdserverpb" diff --git a/controlplane/kubeadm/internal/workload_cluster_rbac.go b/controlplane/kubeadm/internal/workload_cluster_rbac.go index d714c6329c5f..eb22e348051b 100644 --- a/controlplane/kubeadm/internal/workload_cluster_rbac.go +++ b/controlplane/kubeadm/internal/workload_cluster_rbac.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" rbacv1 "k8s.io/api/rbac/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/controlplane/kubeadm/internal/workload_cluster_rbac_test.go b/controlplane/kubeadm/internal/workload_cluster_rbac_test.go index f4f93e3d6451..3463e10ad742 100644 --- a/controlplane/kubeadm/internal/workload_cluster_rbac_test.go +++ b/controlplane/kubeadm/internal/workload_cluster_rbac_test.go @@ -20,7 +20,7 @@ import ( "errors" "testing" - "github.com/blang/semver" + "github.com/blang/semver/v4" . "github.com/onsi/gomega" rbacv1 "k8s.io/api/rbac/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/controlplane/kubeadm/internal/workload_cluster_test.go b/controlplane/kubeadm/internal/workload_cluster_test.go index f1540168a1aa..b0e900387f42 100644 --- a/controlplane/kubeadm/internal/workload_cluster_test.go +++ b/controlplane/kubeadm/internal/workload_cluster_test.go @@ -21,7 +21,7 @@ import ( "errors" "testing" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/google/go-cmp/cmp" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/go.mod b/go.mod index 782100a84cc0..927802164716 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( github.com/MakeNowJust/heredoc v1.0.0 github.com/Masterminds/sprig/v3 v3.2.3 github.com/adrg/xdg v0.4.0 - github.com/blang/semver v3.5.1+incompatible github.com/coredns/corefile-migration v1.0.20 github.com/davecgh/go-spew v1.1.1 github.com/docker/distribution v2.8.2+incompatible @@ -56,6 +55,7 @@ require ( github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/blang/semver/v4 v4.0.0 github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chai2010/gettext-go v1.0.2 // indirect github.com/coredns/caddy v1.1.0 // indirect @@ -145,7 +145,6 @@ require ( require ( github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect - github.com/blang/semver/v4 v4.0.0 // indirect github.com/cloudflare/circl v1.3.3 // indirect github.com/daviddengcn/go-colortext v1.0.0 // indirect github.com/emicklei/go-restful/v3 v3.9.0 // indirect diff --git a/go.sum b/go.sum index 0de4131ee01d..6c181f85bdef 100644 --- a/go.sum +++ b/go.sum @@ -80,8 +80,6 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= diff --git a/hack/tools/go.mod b/hack/tools/go.mod index fd3cea0fdbfe..de9868c377c4 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -8,7 +8,7 @@ replace sigs.k8s.io/cluster-api/test => ../../test require ( cloud.google.com/go/storage v1.31.0 - github.com/blang/semver v3.5.1+incompatible + github.com/blang/semver/v4 v4.0.0 github.com/pkg/errors v0.9.1 github.com/spf13/pflag v1.0.5 github.com/valyala/fastjson v1.6.4 @@ -45,7 +45,6 @@ require ( github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/blang/semver/v4 v4.0.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cloudflare/circl v1.3.3 // indirect github.com/coredns/caddy v1.1.0 // indirect diff --git a/hack/tools/go.sum b/hack/tools/go.sum index cba73fc71d89..09e7eabcc93f 100644 --- a/hack/tools/go.sum +++ b/hack/tools/go.sum @@ -81,8 +81,6 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= diff --git a/hack/tools/mdbook/releaselink/releaselink.go b/hack/tools/mdbook/releaselink/releaselink.go index 4bd707e196e6..96d9cf99ff69 100644 --- a/hack/tools/mdbook/releaselink/releaselink.go +++ b/hack/tools/mdbook/releaselink/releaselink.go @@ -28,7 +28,7 @@ import ( "reflect" "strings" - "github.com/blang/semver" + "github.com/blang/semver/v4" "golang.org/x/tools/go/vcs" "sigs.k8s.io/kubebuilder/docs/book/utils/plugin" diff --git a/internal/contract/controlplane.go b/internal/contract/controlplane.go index df322ddcda06..7bbc306e7997 100644 --- a/internal/contract/controlplane.go +++ b/internal/contract/controlplane.go @@ -19,7 +19,7 @@ package contract import ( "sync" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/utils/pointer" diff --git a/internal/controllers/machineset/machineset_preflight.go b/internal/controllers/machineset/machineset_preflight.go index 00d5d67fc8f2..c9ce691e85fa 100644 --- a/internal/controllers/machineset/machineset_preflight.go +++ b/internal/controllers/machineset/machineset_preflight.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/internal/goproxy/goproxy.go b/internal/goproxy/goproxy.go index a44bd0ce194c..3448de0fa3b1 100644 --- a/internal/goproxy/goproxy.go +++ b/internal/goproxy/goproxy.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/wait" ) diff --git a/internal/goproxy/goproxy_test.go b/internal/goproxy/goproxy_test.go index c914fa6f26e1..f25f69b83f68 100644 --- a/internal/goproxy/goproxy_test.go +++ b/internal/goproxy/goproxy_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" . "github.com/onsi/gomega" ) diff --git a/internal/util/kubeadm/kubeadm.go b/internal/util/kubeadm/kubeadm.go index bd69027114fa..a35d984011d5 100644 --- a/internal/util/kubeadm/kubeadm.go +++ b/internal/util/kubeadm/kubeadm.go @@ -17,7 +17,7 @@ limitations under the License. // Package kubeadm contains utils related to kubeadm. package kubeadm -import "github.com/blang/semver" +import "github.com/blang/semver/v4" const ( // DefaultImageRepository is the new default Kubernetes image registry. diff --git a/internal/util/kubeadm/kubeadm_test.go b/internal/util/kubeadm/kubeadm_test.go index 4e1f7c81f12a..2f4639b9fe33 100644 --- a/internal/util/kubeadm/kubeadm_test.go +++ b/internal/util/kubeadm/kubeadm_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/blang/semver" + "github.com/blang/semver/v4" . "github.com/onsi/gomega" ) diff --git a/internal/webhooks/cluster.go b/internal/webhooks/cluster.go index 2e0da4f579c7..61eff982db7f 100644 --- a/internal/webhooks/cluster.go +++ b/internal/webhooks/cluster.go @@ -24,7 +24,7 @@ import ( "strings" "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" diff --git a/test/e2e/cluster_upgrade_runtimesdk_test.go b/test/e2e/cluster_upgrade_runtimesdk_test.go index 5596311b3b12..b8a6af160d16 100644 --- a/test/e2e/cluster_upgrade_runtimesdk_test.go +++ b/test/e2e/cluster_upgrade_runtimesdk_test.go @@ -20,7 +20,7 @@ limitations under the License. package e2e import ( - "github.com/blang/semver" + "github.com/blang/semver/v4" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/utils/pointer" diff --git a/test/e2e/common.go b/test/e2e/common.go index c0c46ae23c01..0e4990ed82bd 100644 --- a/test/e2e/common.go +++ b/test/e2e/common.go @@ -21,7 +21,7 @@ import ( "fmt" "path/filepath" - "github.com/blang/semver" + "github.com/blang/semver/v4" . "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega/types" corev1 "k8s.io/api/core/v1" diff --git a/test/extension/handlers/topologymutation/handler.go b/test/extension/handlers/topologymutation/handler.go index 1cae18815a4a..dc61ce92140d 100644 --- a/test/extension/handlers/topologymutation/handler.go +++ b/test/extension/handlers/topologymutation/handler.go @@ -25,7 +25,7 @@ import ( "context" "fmt" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/test/framework/clusterctl/repository.go b/test/framework/clusterctl/repository.go index ff20678286ca..42c855a540b9 100644 --- a/test/framework/clusterctl/repository.go +++ b/test/framework/clusterctl/repository.go @@ -28,7 +28,7 @@ import ( "regexp" "strings" - "github.com/blang/semver" + "github.com/blang/semver/v4" . "github.com/onsi/gomega" "github.com/pkg/errors" diff --git a/test/framework/daemonset_helpers.go b/test/framework/daemonset_helpers.go index 40510638e93d..a8322309a6aa 100644 --- a/test/framework/daemonset_helpers.go +++ b/test/framework/daemonset_helpers.go @@ -19,7 +19,7 @@ package framework import ( "context" - "github.com/blang/semver" + "github.com/blang/semver/v4" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/test/framework/kubernetesversions/versions.go b/test/framework/kubernetesversions/versions.go index 6340229a178f..4af7cc3f8d6f 100644 --- a/test/framework/kubernetesversions/versions.go +++ b/test/framework/kubernetesversions/versions.go @@ -23,7 +23,7 @@ import ( "net/http" "strings" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" ) diff --git a/test/go.mod b/test/go.mod index 1cc32a7ed92a..5d9afafafa07 100644 --- a/test/go.mod +++ b/test/go.mod @@ -5,7 +5,7 @@ go 1.20 replace sigs.k8s.io/cluster-api => ../ require ( - github.com/blang/semver v3.5.1+incompatible + github.com/blang/semver/v4 v4.0.0 github.com/docker/docker v24.0.5+incompatible github.com/docker/go-connections v0.4.0 github.com/emicklei/go-restful/v3 v3.10.2 @@ -51,7 +51,6 @@ require ( github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/blang/semver/v4 v4.0.0 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cloudflare/circl v1.3.3 // indirect diff --git a/test/go.sum b/test/go.sum index 4978eb7a9832..5e060e19f05e 100644 --- a/test/go.sum +++ b/test/go.sum @@ -85,8 +85,6 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= diff --git a/test/infrastructure/docker/exp/internal/docker/nodepool.go b/test/infrastructure/docker/exp/internal/docker/nodepool.go index 08683dea8b47..12920be700a8 100644 --- a/test/infrastructure/docker/exp/internal/docker/nodepool.go +++ b/test/infrastructure/docker/exp/internal/docker/nodepool.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" "k8s.io/klog/v2" diff --git a/test/infrastructure/docker/internal/docker/machine.go b/test/infrastructure/docker/internal/docker/machine.go index c65c9a882235..96c9df5ed6d8 100644 --- a/test/infrastructure/docker/internal/docker/machine.go +++ b/test/infrastructure/docker/internal/docker/machine.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/go-logr/logr" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" diff --git a/test/infrastructure/docker/internal/provisioning/cloudinit/adapter_test.go b/test/infrastructure/docker/internal/provisioning/cloudinit/adapter_test.go index 759d0550b932..1a4fdcea89de 100644 --- a/test/infrastructure/docker/internal/provisioning/cloudinit/adapter_test.go +++ b/test/infrastructure/docker/internal/provisioning/cloudinit/adapter_test.go @@ -19,7 +19,7 @@ package cloudinit import ( "testing" - "github.com/blang/semver" + "github.com/blang/semver/v4" . "github.com/onsi/gomega" "sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/provisioning" diff --git a/test/infrastructure/docker/internal/provisioning/cloudinit/writefiles.go b/test/infrastructure/docker/internal/provisioning/cloudinit/writefiles.go index 6e31a29f9085..aa47d0db2432 100644 --- a/test/infrastructure/docker/internal/provisioning/cloudinit/writefiles.go +++ b/test/infrastructure/docker/internal/provisioning/cloudinit/writefiles.go @@ -25,7 +25,7 @@ import ( "path/filepath" "strings" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" "sigs.k8s.io/yaml" diff --git a/test/infrastructure/docker/internal/provisioning/cloudinit/writefiles_test.go b/test/infrastructure/docker/internal/provisioning/cloudinit/writefiles_test.go index 28077c652953..28902c292825 100644 --- a/test/infrastructure/docker/internal/provisioning/cloudinit/writefiles_test.go +++ b/test/infrastructure/docker/internal/provisioning/cloudinit/writefiles_test.go @@ -21,7 +21,7 @@ import ( "compress/gzip" "testing" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/google/go-cmp/cmp" . "github.com/onsi/gomega" diff --git a/test/infrastructure/kind/mapper.go b/test/infrastructure/kind/mapper.go index 4bdb5e77feaa..d6db884d7793 100644 --- a/test/infrastructure/kind/mapper.go +++ b/test/infrastructure/kind/mapper.go @@ -37,7 +37,7 @@ package kind import ( "fmt" - "github.com/blang/semver" + "github.com/blang/semver/v4" clusterapicontainer "sigs.k8s.io/cluster-api/util/container" ) diff --git a/test/infrastructure/kind/mapper_test.go b/test/infrastructure/kind/mapper_test.go index 42bf2556d3d2..8636691120bb 100644 --- a/test/infrastructure/kind/mapper_test.go +++ b/test/infrastructure/kind/mapper_test.go @@ -19,7 +19,7 @@ package kind import ( "testing" - "github.com/blang/semver" + "github.com/blang/semver/v4" . "github.com/onsi/gomega" ) diff --git a/util/collections/machine_collection.go b/util/collections/machine_collection.go index 2958ee5d62e9..83a50ad9433d 100644 --- a/util/collections/machine_collection.go +++ b/util/collections/machine_collection.go @@ -30,7 +30,7 @@ package collections import ( "sort" - "github.com/blang/semver" + "github.com/blang/semver/v4" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/cluster-api/util/conditions" diff --git a/util/collections/machine_filters.go b/util/collections/machine_filters.go index d856610129c3..12c2e20f8ca7 100644 --- a/util/collections/machine_filters.go +++ b/util/collections/machine_filters.go @@ -19,7 +19,7 @@ package collections import ( "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/selection" diff --git a/util/util.go b/util/util.go index 9edcf9123cbd..d72947ecfd89 100644 --- a/util/util.go +++ b/util/util.go @@ -27,7 +27,7 @@ import ( "strings" "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" diff --git a/util/util_test.go b/util/util_test.go index c736c02b6eb1..748ca0cbcd61 100644 --- a/util/util_test.go +++ b/util/util_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/blang/semver" + "github.com/blang/semver/v4" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" diff --git a/util/version/version.go b/util/version/version.go index 277ed61050ec..601f934bd7c2 100644 --- a/util/version/version.go +++ b/util/version/version.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" ) diff --git a/util/version/version_test.go b/util/version/version_test.go index a76ea9d2c7e5..abe9501b08f8 100644 --- a/util/version/version_test.go +++ b/util/version/version_test.go @@ -19,7 +19,7 @@ package version import ( "testing" - "github.com/blang/semver" + "github.com/blang/semver/v4" . "github.com/onsi/gomega" )