Merge pull request #5644 from koba1t/fix/version_subcommand_is_broken

fix version subcommand is not working after release build
2026-06-16 03:18:16 +00:00 · 2024-04-04 09:53:40 -07:00 · 2024-04-05 01:37:31 +09:00 · 2024-04-04 08:57:57 -07:00 · 2024-04-05 00:45:41 +09:00 · 2024-04-04 07:06:03 -07:00
33 changed files with 55 additions and 40 deletions
--- a/api/provenance/provenance.go
+++ b/api/provenance/provenance.go
@@ -67,14 +67,22 @@ func GetProvenance() Provenance {

 	for _, dep := range info.Deps {
 		if dep != nil && dep.Path == "sigs.k8s.io/kustomize/kustomize/v5" {
-			p.Version = GetMostRecentTag(*dep)
+			if dep.Version != "devel" {
+				continue
+			}
+			v, err := GetMostRecentTag(*dep)
+			if err != nil {
+				fmt.Printf("failed to get most recent tag for %s: %v\n", dep.Path, err)
+				continue
+			}
+			p.Version = v
 		}
 	}

 	return p
 }

-func GetMostRecentTag(m debug.Module) string {
+func GetMostRecentTag(m debug.Module) (string, error) {
 	for m.Replace != nil {
 		m = *m.Replace
 	}
@@ -83,13 +91,13 @@ func GetMostRecentTag(m debug.Module) string {
 	sv, err := semver.Parse(strings.TrimPrefix(split[0], "v"))

 	if err != nil {
-		return "unknown"
+		return "", fmt.Errorf("failed to parse version %s: %w", m.Version, err)
 	}

 	if len(split) > 1 && sv.Patch > 0 {
 		sv.Patch -= 1
 	}
-	return fmt.Sprintf("v%s", sv.FinalizeVersion())
+	return fmt.Sprintf("v%s", sv.FinalizeVersion()), nil
 }

 // Short returns the shortened provenance stamp.
--- a/api/provenance/provenance_test.go
+++ b/api/provenance/provenance_test.go
@@ -59,6 +59,7 @@ func TestGetMostRecentTag(t *testing.T) {
 	tests := []struct {
 		name        string
 		module      debug.Module
+		isError     bool
 		expectedTag string
 	}{
 		{
@@ -72,9 +73,9 @@ func TestGetMostRecentTag(t *testing.T) {
 			expectedTag: "v0.0.0",
 		},
 		{
-			name:        "Invalid semver string",
-			module:      mockModule("invalid-version"),
-			expectedTag: "unknown",
+			name:    "Invalid semver string",
+			module:  mockModule("invalid-version"),
+			isError: true,
 		},
 		{
 			name:        "Valid semver with patch increment and pre-release info",
@@ -90,8 +91,14 @@ func TestGetMostRecentTag(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			tag := provenance.GetMostRecentTag(tt.module)
-			assert.Equal(t, tt.expectedTag, tag)
+			tag, err := provenance.GetMostRecentTag(tt.module)
+			if err != nil {
+				if !tt.isError {
+					assert.NoError(t, err)
+				}
+			} else {
+				assert.Equal(t, tt.expectedTag, tag)
+			}
 		})
 	}
 }
--- a/cmd/pluginator/go.mod
+++ b/cmd/pluginator/go.mod
@@ -5,7 +5,7 @@ go 1.21
 require (
 	github.com/spf13/cobra v1.8.0
 	github.com/stretchr/testify v1.8.4
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/kustomize/kyaml v0.17.0
 )

--- a/kustomize/go.mod
+++ b/kustomize/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/text v0.14.0
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/kustomize/cmd/config v0.14.0
 	sigs.k8s.io/kustomize/kyaml v0.17.0
 	sigs.k8s.io/yaml v1.4.0
--- a/plugin/builtin/annotationstransformer/go.mod
+++ b/plugin/builtin/annotationstransformer/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/builtin/annotationstransformer
 go 1.21

 require (
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )

--- a/plugin/builtin/configmapgenerator/go.mod
+++ b/plugin/builtin/configmapgenerator/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/builtin/configmapgenerator
 go 1.21

 require (
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )

--- a/plugin/builtin/hashtransformer/go.mod
+++ b/plugin/builtin/hashtransformer/go.mod
@@ -2,7 +2,7 @@ module sigs.k8s.io/kustomize/plugin/builtin/hashtransformer

 go 1.21

-require sigs.k8s.io/kustomize/api v0.16.0
+require sigs.k8s.io/kustomize/api v0.17.0

 require (
 	github.com/blang/semver/v4 v4.0.0 // indirect
--- a/plugin/builtin/helmchartinflationgenerator/go.mod
+++ b/plugin/builtin/helmchartinflationgenerator/go.mod
@@ -4,7 +4,7 @@ go 1.21

 require (
 	github.com/stretchr/testify v1.8.4
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/kustomize/kyaml v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )
--- a/plugin/builtin/iampolicygenerator/go.mod
+++ b/plugin/builtin/iampolicygenerator/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/builtin/iampolicygenerator
 go 1.21

 require (
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )

--- a/plugin/builtin/imagetagtransformer/go.mod
+++ b/plugin/builtin/imagetagtransformer/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/builtin/imagetagtransformer
 go 1.21

 require (
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )

--- a/plugin/builtin/labeltransformer/go.mod
+++ b/plugin/builtin/labeltransformer/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/builtin/labeltransformer
 go 1.21

 require (
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )

--- a/plugin/builtin/namespacetransformer/go.mod
+++ b/plugin/builtin/namespacetransformer/go.mod
@@ -4,7 +4,7 @@ go 1.21

 require (
 	github.com/stretchr/testify v1.8.4
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/kustomize/kyaml v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )
--- a/plugin/builtin/patchjson6902transformer/go.mod
+++ b/plugin/builtin/patchjson6902transformer/go.mod
@@ -4,7 +4,7 @@ go 1.21

 require (
 	gopkg.in/evanphx/json-patch.v4 v4.12.0
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/kustomize/kyaml v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )
--- a/plugin/builtin/patchstrategicmergetransformer/go.mod
+++ b/plugin/builtin/patchstrategicmergetransformer/go.mod
@@ -4,7 +4,7 @@ go 1.21

 require (
 	github.com/stretchr/testify v1.8.4
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )

--- a/plugin/builtin/patchtransformer/go.mod
+++ b/plugin/builtin/patchtransformer/go.mod
@@ -5,7 +5,7 @@ go 1.21
 require (
 	github.com/stretchr/testify v1.8.4
 	gopkg.in/evanphx/json-patch.v4 v4.12.0
-	sigs.k8s.io/kustomize/api v0.14.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/kustomize/kyaml v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )
--- a/plugin/builtin/prefixtransformer/go.mod
+++ b/plugin/builtin/prefixtransformer/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/builtin/prefixtransformer
 go 1.21

 require (
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/kustomize/kyaml v0.17.0
 )

--- a/plugin/builtin/replacementtransformer/go.mod
+++ b/plugin/builtin/replacementtransformer/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/builtin/replacementtransformer
 go 1.21

 require (
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )

--- a/plugin/builtin/replicacounttransformer/go.mod
+++ b/plugin/builtin/replicacounttransformer/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/builtin/replicacounttransformer
 go 1.21

 require (
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/kustomize/kyaml v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )
--- a/plugin/builtin/secretgenerator/go.mod
+++ b/plugin/builtin/secretgenerator/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/builtin/secretgenerator
 go 1.21

 require (
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )

--- a/plugin/builtin/sortordertransformer/go.mod
+++ b/plugin/builtin/sortordertransformer/go.mod
@@ -4,7 +4,7 @@ go 1.21

 require (
 	github.com/stretchr/testify v1.8.4
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/kustomize/kyaml v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )
--- a/plugin/builtin/suffixtransformer/go.mod
+++ b/plugin/builtin/suffixtransformer/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/builtin/suffixtransformer
 go 1.21

 require (
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/kustomize/kyaml v0.17.0
 )

--- a/plugin/builtin/valueaddtransformer/go.mod
+++ b/plugin/builtin/valueaddtransformer/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/builtin/valueaddtransformer
 go 1.21

 require (
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )

--- a/plugin/someteam.example.com/v1/bashedconfigmap/go.mod
+++ b/plugin/someteam.example.com/v1/bashedconfigmap/go.mod
@@ -2,7 +2,7 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/bashedconfigmap

 go 1.21

-require sigs.k8s.io/kustomize/api v0.16.0
+require sigs.k8s.io/kustomize/api v0.17.0

 require (
 	github.com/blang/semver/v4 v4.0.0 // indirect
--- a/plugin/someteam.example.com/v1/calvinduplicator/go.mod
+++ b/plugin/someteam.example.com/v1/calvinduplicator/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/calvinduplicator
 go 1.21

 require (
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )

--- a/plugin/someteam.example.com/v1/dateprefixer/go.mod
+++ b/plugin/someteam.example.com/v1/dateprefixer/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/dateprefixer
 go 1.21

 require (
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/kustomize/kyaml v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )
--- a/plugin/someteam.example.com/v1/printpluginenv/go.mod
+++ b/plugin/someteam.example.com/v1/printpluginenv/go.mod
@@ -2,7 +2,7 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/printpluginenv

 go 1.21

-require sigs.k8s.io/kustomize/api v0.16.0
+require sigs.k8s.io/kustomize/api v0.17.0

 require (
 	github.com/blang/semver/v4 v4.0.0 // indirect
--- a/plugin/someteam.example.com/v1/secretsfromdatabase/go.mod
+++ b/plugin/someteam.example.com/v1/secretsfromdatabase/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/secretsfromdatabase
 go 1.21

 require (
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )

--- a/plugin/someteam.example.com/v1/sedtransformer/go.mod
+++ b/plugin/someteam.example.com/v1/sedtransformer/go.mod
@@ -2,7 +2,7 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/sedtransformer

 go 1.21

-require sigs.k8s.io/kustomize/api v0.16.0
+require sigs.k8s.io/kustomize/api v0.17.0

 require (
 	github.com/blang/semver/v4 v4.0.0 // indirect
--- a/plugin/someteam.example.com/v1/someservicegenerator/go.mod
+++ b/plugin/someteam.example.com/v1/someservicegenerator/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/someservicegenerator
 go 1.21

 require (
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )

--- a/plugin/someteam.example.com/v1/starlarkmixer/go.mod
+++ b/plugin/someteam.example.com/v1/starlarkmixer/go.mod
@@ -2,7 +2,7 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/starlarkmixer

 go 1.21

-require sigs.k8s.io/kustomize/api v0.16.0
+require sigs.k8s.io/kustomize/api v0.17.0

 require (
 	github.com/blang/semver/v4 v4.0.0 // indirect
--- a/plugin/someteam.example.com/v1/stringprefixer/go.mod
+++ b/plugin/someteam.example.com/v1/stringprefixer/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/stringprefixer
 go 1.21

 require (
-	sigs.k8s.io/kustomize/api v0.16.0
+	sigs.k8s.io/kustomize/api v0.17.0
 	sigs.k8s.io/kustomize/kyaml v0.17.0
 	sigs.k8s.io/yaml v1.4.0
 )
--- a/plugin/someteam.example.com/v1/validator/go.mod
+++ b/plugin/someteam.example.com/v1/validator/go.mod
@@ -2,7 +2,7 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/validator

 go 1.21

-require sigs.k8s.io/kustomize/api v0.16.0
+require sigs.k8s.io/kustomize/api v0.17.0

 require (
 	github.com/blang/semver/v4 v4.0.0 // indirect
--- a/plugin/untested/v1/gogetter/go.mod
+++ b/plugin/untested/v1/gogetter/go.mod
@@ -2,7 +2,7 @@ module sigs.k8s.io/kustomize/plugin/untested/v1/gogetter

 go 1.21

-require sigs.k8s.io/kustomize/api v0.16.0
+require sigs.k8s.io/kustomize/api v0.17.0

 require github.com/josharian/intern v1.0.0 // indirect
Author	SHA1	Message	Date
Kubernetes Prow Robot	42873c8d2a	Merge pull request #5644 from koba1t/fix/version_subcommand_is_broken fix version subcommand is not working after release build	2024-04-04 09:53:40 -07:00
koba1t	277da9ed21	fix version subcommand is not working after release build	2024-04-05 01:37:31 +09:00
Kubernetes Prow Robot	2b00d887fd	Merge pull request #5643 from koba1t/unpinEverything unpin api	2024-04-04 08:57:57 -07:00
koba1t	08d0593c3e	unpin api	2024-04-05 00:45:41 +09:00
Kubernetes Prow Robot	31706fd7fd	Merge pull request #5641 from koba1t/pinToApi Update api to v0.17.0	2024-04-04 07:06:03 -07:00
koba1t	e862612703	Update api to v0.17.0	2024-04-04 22:45:14 +09:00