diff --git a/catalogd/cmd/catalogd/main.go b/catalogd/cmd/catalogd/main.go index 7ba03fb5e..4904857e9 100644 --- a/catalogd/cmd/catalogd/main.go +++ b/catalogd/cmd/catalogd/main.go @@ -61,9 +61,9 @@ import ( "github.com/operator-framework/operator-controller/catalogd/internal/serverutil" "github.com/operator-framework/operator-controller/catalogd/internal/source" "github.com/operator-framework/operator-controller/catalogd/internal/storage" - "github.com/operator-framework/operator-controller/catalogd/internal/version" "github.com/operator-framework/operator-controller/catalogd/internal/webhook" fsutil "github.com/operator-framework/operator-controller/internal/util/fs" + "github.com/operator-framework/operator-controller/internal/version" ) var ( @@ -127,7 +127,7 @@ func main() { pflag.Parse() if catalogdVersion { - fmt.Printf("%#v\n", version.Version()) + fmt.Printf("%#v\n", version.String()) os.Exit(0) } diff --git a/catalogd/internal/version/version.go b/catalogd/internal/version/version.go deleted file mode 100644 index 73ba429a9..000000000 --- a/catalogd/internal/version/version.go +++ /dev/null @@ -1,36 +0,0 @@ -package version - -import ( - "fmt" - "runtime" - "strings" - - "github.com/blang/semver/v4" - genericversion "k8s.io/apimachinery/pkg/version" -) - -var ( - gitVersion = "unknown" - gitCommit = "unknown" // sha1 from git, output of $(git rev-parse HEAD) - gitTreeState = "unknown" // state of git tree, either "clean" or "dirty" - commitDate = "unknown" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ') -) - -// Version returns a version struct for the build -func Version() genericversion.Info { - info := genericversion.Info{ - GitVersion: gitVersion, - GitCommit: gitCommit, - GitTreeState: gitTreeState, - BuildDate: commitDate, - GoVersion: runtime.Version(), - Compiler: runtime.Compiler, - Platform: fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH), - } - v, err := semver.Parse(strings.TrimPrefix(gitVersion, "v")) - if err == nil { - info.Major = fmt.Sprintf("%d", v.Major) - info.Minor = fmt.Sprintf("%d", v.Minor) - } - return info -}