Skip to content

Commit

Permalink
Merge pull request #184 from inteon/add_version_info
Browse files Browse the repository at this point in the history
Add version info to binary at compile time
  • Loading branch information
jetstack-bot authored Jan 24, 2024
2 parents bc0739c + c0005e4 commit 7d63675
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 2 deletions.
5 changes: 3 additions & 2 deletions cmd/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"k8s.io/utils/clock"

"github.com/cert-manager/csi-driver/cmd/app/options"
"github.com/cert-manager/csi-driver/internal/version"
csiapi "github.com/cert-manager/csi-driver/pkg/apis/v1alpha1"
"github.com/cert-manager/csi-driver/pkg/filestore"
"github.com/cert-manager/csi-driver/pkg/keygen"
Expand All @@ -56,7 +57,7 @@ func NewCommand(ctx context.Context) *cobra.Command {
},
RunE: func(cmd *cobra.Command, args []string) error {
log := opts.Logr.WithName("main")
log.Info("building driver")
log.Info("Starting driver", "version", version.VersionInfo())

store, err := storage.NewFilesystem(opts.Logr.WithName("storage"), opts.DataRoot)
if err != nil {
Expand All @@ -75,7 +76,7 @@ func NewCommand(ctx context.Context) *cobra.Command {
mngrlog := opts.Logr.WithName("manager")
d, err := driver.New(opts.Endpoint, opts.Logr.WithName("driver"), driver.Options{
DriverName: opts.DriverName,
DriverVersion: "v0.3.0",
DriverVersion: version.AppVersion,
NodeID: opts.NodeID,
Store: store,
Manager: manager.NewManagerOrDie(manager.Options{
Expand Down
53 changes: 53 additions & 0 deletions internal/version/version.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
Copyright 2021 The cert-manager Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package version

import (
"fmt"
"os"
"runtime"
)

func init() {
if AppVersion == "" || GitCommit == "" {
fmt.Fprintf(os.Stderr, "warning: AppVersion or GitCommit not set, this binary was built without -ldflags \"-X internal/version.AppVersion=... -X internal/version.GitCommit=...\"\n")
}
}

type Version struct {
AppVersion string `json:"appVersion"`
GitCommit string `json:"gitCommit"`
GoVersion string `json:"goVersion"`
Compiler string `json:"compiler"`
Platform string `json:"platform"`
}

// This variable block holds information used to build up the version string
var (
AppVersion = ""
GitCommit = ""
)

func VersionInfo() Version {
return Version{
AppVersion: AppVersion,
GitCommit: GitCommit,
GoVersion: runtime.Version(),
Compiler: runtime.Compiler,
Platform: fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
}
}

0 comments on commit 7d63675

Please sign in to comment.