envtest: replace github.com/blang/semver with k8s.io/apimachinery

cbandy · cbandy · commit 95c76a791d8c · 2025-08-13T18:09:40.000-05:00
The former is no longer maintained and the latter is designed to understand Kubernetes versions. This eliminates one direct dependency introduced in b04d5fd. Signed-off-by: Chris Bandy <bandy.chris@gmail.com>
diff --git a/examples/scratch-env/go.mod b/examples/scratch-env/go.mod
@@ -10,7 +10,6 @@ require (
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
diff --git a/examples/scratch-env/go.sum b/examples/scratch-env/go.sum
@@ -1,7 +1,5 @@
 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/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
-github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module sigs.k8s.io/controller-runtime
 go 1.24.0
 
 require (
-	github.com/blang/semver/v4 v4.0.0
 	github.com/evanphx/json-patch/v5 v5.9.11
 	github.com/fsnotify/fsnotify v1.9.0
 	github.com/go-logr/logr v1.4.2
@@ -37,6 +36,7 @@ require (
 	cel.dev/expr v0.24.0 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
diff --git a/pkg/envtest/binaries.go b/pkg/envtest/binaries.go
@@ -35,7 +35,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/blang/semver/v4"
+	"k8s.io/apimachinery/pkg/util/version"
 	"sigs.k8s.io/yaml"
 )
 
@@ -257,15 +257,15 @@ func latestStableVersionFromIndex(index *index) (string, error) {
 		return "", fmt.Errorf("failed to find latest stable version from index: index is empty")
 	}
 
-	parsedVersions := []semver.Version{}
+	parsedVersions := []*version.Version{}
 	for releaseVersion := range index.Releases {
-		v, err := semver.ParseTolerant(releaseVersion)
+		v, err := version.ParseSemantic(releaseVersion)
 		if err != nil {
 			return "", fmt.Errorf("failed to parse version %q: %w", releaseVersion, err)
 		}
 
 		// Filter out pre-releases.
-		if len(v.Pre) > 0 {
+		if len(v.PreRelease()) > 0 {
 			continue
 		}
 
@@ -277,7 +277,7 @@ func latestStableVersionFromIndex(index *index) (string, error) {
 	}
 
 	sort.Slice(parsedVersions, func(i, j int) bool {
-		return parsedVersions[i].GT(parsedVersions[j])
+		return parsedVersions[i].GreaterThan(parsedVersions[j])
 	})
 	return "v" + parsedVersions[0].String(), nil
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ import (`
`35`	`35`	`"sort"`
`36`	`36`	`"strings"`
`37`	`37`
`38`		`- "github.com/blang/semver/v4"`
	`38`	`+ "k8s.io/apimachinery/pkg/util/version"`
`39`	`39`	`"sigs.k8s.io/yaml"`
`40`	`40`	`)`
`41`	`41`
`@@ -257,15 +257,15 @@ func latestStableVersionFromIndex(index *index) (string, error) {`
`257`	`257`	`return "", fmt.Errorf("failed to find latest stable version from index: index is empty")`
`258`	`258`	`}`
`259`	`259`
`260`		`- parsedVersions := []semver.Version{}`
	`260`	`+ parsedVersions := []*version.Version{}`
`261`	`261`	`for releaseVersion := range index.Releases {`
`262`		`- v, err := semver.ParseTolerant(releaseVersion)`
	`262`	`+ v, err := version.ParseSemantic(releaseVersion)`
`263`	`263`	`if err != nil {`
`264`	`264`	`return "", fmt.Errorf("failed to parse version %q: %w", releaseVersion, err)`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`// Filter out pre-releases.`
`268`		`- if len(v.Pre) > 0 {`
	`268`	`+ if len(v.PreRelease()) > 0 {`
`269`	`269`	`continue`
`270`	`270`	`}`
`271`	`271`
`@@ -277,7 +277,7 @@ func latestStableVersionFromIndex(index *index) (string, error) {`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`sort.Slice(parsedVersions, func(i, j int) bool {`
`280`		`- return parsedVersions[i].GT(parsedVersions[j])`
	`280`	`+ return parsedVersions[i].GreaterThan(parsedVersions[j])`
`281`	`281`	`})`
`282`	`282`	`return "v" + parsedVersions[0].String(), nil`
`283`	`283`	`}`