use the upstream kubernetes version lib and ldflags (sigstore#1413)

Signed-off-by: Scott Nichols <n3wscott@chainguard.dev>
mlieberman85 · May 6, 2022 · 51ae750 · 51ae750
1 parent 6da9ec2
commit 51ae750
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 294 deletions.
diff --git a/Makefile b/Makefile
@@ -43,8 +43,10 @@ endif
 PLATFORMS=darwin linux windows
 ARCHITECTURES=amd64
 
-PKG=github.com/sigstore/cosign/pkg/version
-LDFLAGS=-X $(PKG).GitVersion=$(GIT_VERSION) -X $(PKG).gitCommit=$(GIT_HASH) -X $(PKG).gitTreeState=$(GIT_TREESTATE) -X $(PKG).buildDate=$(BUILD_DATE)
+LDFLAGS=-X sigs.k8s.io/release-utils/version.gitVersion=$(GIT_VERSION) \
+        -X sigs.k8s.io/release-utils/version.gitCommit=$(GIT_HASH) \
+        -X sigs.k8s.io/release-utils/version.gitTreeState=$(GIT_TREESTATE) \
+        -X sigs.k8s.io/release-utils/version.buildDate=$(BUILD_DATE)
 
 SRCS = $(shell find cmd -iname "*.go") $(shell find pkg -iname "*.go")
 

diff --git a/cmd/cosign/cli/commands.go b/cmd/cosign/cli/commands.go
@@ -21,6 +21,7 @@ import (
 	"github.com/google/go-containerregistry/pkg/logs"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/release-utils/version"
 
 	cranecmd "github.com/google/go-containerregistry/cmd/crane/cmd"
 	"github.com/sigstore/cosign/cmd/cosign/cli/options"
@@ -92,7 +93,7 @@ func New() *cobra.Command {
 	cmd.AddCommand(VerifyAttestation())
 	cmd.AddCommand(VerifyBlob())
 	cmd.AddCommand(Triangulate())
-	cmd.AddCommand(Version())
+	cmd.AddCommand(version.Version())
 
 	cmd.AddCommand(cranecmd.NewCmdAuthLogin("cosign"))
 	return cmd

diff --git a/cmd/cosign/cli/options/useragent.go b/cmd/cosign/cli/options/useragent.go
@@ -18,13 +18,13 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/sigstore/cosign/pkg/version"
+	"sigs.k8s.io/release-utils/version"
 )
 
 var (
 	// uaString is meant to resemble the User-Agent sent by browsers with requests.
 	// See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent
-	uaString = fmt.Sprintf("cosign/%s (%s; %s)", version.GitVersion, runtime.GOOS, runtime.GOARCH)
+	uaString = fmt.Sprintf("cosign/%s (%s; %s)", version.GetVersionInfo().GitVersion, runtime.GOOS, runtime.GOARCH)
 )
 
 // UserAgent returns the User-Agent string which `cosign` should send with HTTP requests.ß

diff --git a/cmd/cosign/cli/version.go b/cmd/cosign/cli/version.go
diff --git a/cmd/cosign/cli/version_test.go b/cmd/cosign/cli/version_test.go
diff --git a/cmd/cosign/webhook/main.go b/cmd/cosign/webhook/main.go
@@ -35,9 +35,9 @@ import (
 	"knative.dev/pkg/webhook/resourcesemantics"
 	"knative.dev/pkg/webhook/resourcesemantics/defaulting"
 	"knative.dev/pkg/webhook/resourcesemantics/validation"
+	"sigs.k8s.io/release-utils/version"
 
 	cwebhook "github.com/sigstore/cosign/pkg/cosign/kubernetes/webhook"
-	"github.com/sigstore/cosign/pkg/version"
 )
 
 var secretName = flag.String("secret-name", "", "The name of the secret in the webhook's namespace that holds the public key for verification.")

diff --git a/cmd/sget/cli/commands.go b/cmd/sget/cli/commands.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/release-utils/version"
 
 	"github.com/sigstore/cosign/cmd/sget/cli/options"
 	"github.com/sigstore/cosign/pkg/sget"
@@ -54,7 +55,7 @@ func New() *cobra.Command {
 	ro.AddFlags(cmd)
 
 	// Add sub-commands.
-	cmd.AddCommand(Version())
+	cmd.AddCommand(version.Version())
 
 	return cmd
 }

diff --git a/cmd/sget/cli/version.go b/cmd/sget/cli/version.go
diff --git a/cmd/sget/cli/version_test.go b/cmd/sget/cli/version_test.go
diff --git a/doc/cosign.md b/doc/cosign.md
diff --git a/doc/cosign_version.md b/doc/cosign_version.md
diff --git a/go.mod b/go.mod
@@ -42,6 +42,7 @@ require (
 	k8s.io/client-go v0.22.5
 	k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
 	knative.dev/pkg v0.0.0-20220121092305-3ba5d72e310a
+	sigs.k8s.io/release-utils v0.4.1-0.20220207182343-6dadf2228617
 )
 
 require (