Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🌱 Bump github.com/blang/semver to v4 #9189

Merged
merged 1 commit into from
Aug 15, 2023
Merged

🌱 Bump github.com/blang/semver to v4 #9189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/kubeadm/types/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/kubeadm/types/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusterctl/api/v1alpha3/metadata_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusterctl/client/cluster/cert_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusterctl/client/repository/repository_github.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusterctl/cmd/version_checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/controllers/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/controllers/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/controllers/fakes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/controllers/remediation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/controllers/scale.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/controllers/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/workload_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/workload_cluster_coredns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/workload_cluster_coredns_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/workload_cluster_etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/workload_cluster_etcd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/workload_cluster_rbac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/workload_cluster_rbac_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/workload_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you open a follow-up PR to regenerate all go.mod files? (i.e. delete everything except the first 3 lines in go.mod + delete go.sum and run the generate target)

I think our current blocks are a bit arbitrary and there are plenty of interesting diffs when we regenerate

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One major diff is that we get a lot less hashicorp dependencies

(cc @killianmuldoon)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting data point. Top-level go.sum goes from 1011 to 856 lines

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably also something that we want to repeat in CAPV

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already done in capv via kubernetes-sigs/cluster-api-provider-vsphere#2219

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When re-generating go.mod it seems to change to a slightly different module

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or maybe I just did something wrong, let's see :D

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From trying this: my conclusion is: not worth it.

The bumps we get are:

google.golang.org/grpc v1.55.0 => v1.57.0
k8s.io/api v0.27.2 => v0.27.4
k8s.io/apiextensions-apiserver v0.27.2 => v0.27.4
k8s.io/apimachinery v0.27.2 => v0.27.4
k8s.io/apiserver v0.27.2 => v0.27.4
k8s.io/client-go v0.27.2 => v0.27.4
k8s.io/cluster-bootstrap v0.27.2 => v0.27.4
k8s.io/component-base v0.27.2 => v0.27.4
k8s.io/klog/v2 v2.90.1 => v2.100.1
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f => v0.0.0-20230811205723-7ac0aad8c58d
k8s.io/kubectl v0.27.2 => v0.27.4
k8s.io/utils v0.0.0-20230209194617-a36077c30491 => v0.0.0-20230726121419-3b25d923346b

Lot's of other dependencies would get downgraded.

Including github.com/coredns/corefile-migration which reduces some transitive deps to hashicorp (but not all). And I assume we don't want to downgrade that.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely don't want to downgrade. I was just looking at our current go.mod file and the 3 different require sections seems to be pretty arbitrary. Since this PR the 2nd one even has a combination of direct & indirect dependencies.

Maybe we can at least put all our current dependencies in the same block and let go mod tidy clean it up?

As far as I can tell this should cleanly format into two blocks. One for direct one for indirect dependencies

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(basically the equivalent of enforcing go import formatting)

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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
3 changes: 1 addition & 2 deletions hack/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions hack/tools/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion hack/tools/mdbook/releaselink/releaselink.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion internal/contract/controlplane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/machineset/machineset_preflight.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/goproxy/goproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/goproxy/goproxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"testing"
"time"

"github.com/blang/semver"
"github.com/blang/semver/v4"
. "github.com/onsi/gomega"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/util/kubeadm/kubeadm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/util/kubeadm/kubeadm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"testing"

"github.com/blang/semver"
"github.com/blang/semver/v4"
. "github.com/onsi/gomega"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/webhooks/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/cluster_upgrade_runtimesdk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/extension/handlers/topologymutation/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/framework/clusterctl/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"regexp"
"strings"

"github.com/blang/semver"
"github.com/blang/semver/v4"
. "github.com/onsi/gomega"
"github.com/pkg/errors"

Expand Down
2 changes: 1 addition & 1 deletion test/framework/daemonset_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/framework/kubernetesversions/versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"net/http"
"strings"

"github.com/blang/semver"
"github.com/blang/semver/v4"
"github.com/pkg/errors"
)

Expand Down
3 changes: 1 addition & 2 deletions test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down