chore: Add additional field to set Extra Build Information while buil…

…ding argo-cd by vendors (argoproj#13324) * Add additonal field to set Extra Build Information while building argocd by vendors Signed-off-by: ishitasequeira <[email protected]> * Include spaces in extra build info Signed-off-by: ishitasequeira <[email protected]> * Address comments Signed-off-by: ishitasequeira <[email protected]> --------- Signed-off-by: ishitasequeira <[email protected]>
tkasuz · Apr 27, 2023 · 1fe6257 · 1fe6257
1 parent daae5ef
commit 1fe6257
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -146,7 +146,8 @@ override LDFLAGS += \
   -X ${PACKAGE}.buildDate=${BUILD_DATE} \
   -X ${PACKAGE}.gitCommit=${GIT_COMMIT} \
   -X ${PACKAGE}.gitTreeState=${GIT_TREE_STATE}\
-  -X ${PACKAGE}.kubectlVersion=${KUBECTL_VERSION}
+  -X ${PACKAGE}.kubectlVersion=${KUBECTL_VERSION}\
+  -X "${PACKAGE}.extraBuildInfo=${EXTRA_BUILD_INFO}"
 
 ifeq (${STATIC_BUILD}, true)
 override LDFLAGS += -extldflags "-static"

diff --git a/assets/swagger.json b/assets/swagger.json
@@ -8653,6 +8653,9 @@
         "Compiler": {
           "type": "string"
         },
+        "ExtraBuildInfo": {
+          "type": "string"
+        },
         "GitCommit": {
           "type": "string"
         },

diff --git a/cmd/argocd/commands/version.go b/cmd/argocd/commands/version.go
@@ -116,6 +116,9 @@ func printClientVersion(version *common.Version, short bool) string {
 	output += fmt.Sprintf("  GoVersion: %s\n", version.GoVersion)
 	output += fmt.Sprintf("  Compiler: %s\n", version.Compiler)
 	output += fmt.Sprintf("  Platform: %s\n", version.Platform)
+	if version.ExtraBuildInfo != "" {
+		output += fmt.Sprintf("  ExtraBuildInfo: %s\n", version.ExtraBuildInfo)
+	}
 	return output
 }
 
@@ -147,6 +150,9 @@ func printServerVersion(version *version.VersionMessage, short bool) string {
 	if version.Platform != "" {
 		output += fmt.Sprintf("  Platform: %s\n", version.Platform)
 	}
+	if version.ExtraBuildInfo != "" {
+		output += fmt.Sprintf("  ExtraBuildInfo: %s\n", version.ExtraBuildInfo)
+	}
 	if version.KustomizeVersion != "" {
 		output += fmt.Sprintf("  Kustomize Version: %s\n", version.KustomizeVersion)
 	}

diff --git a/common/version.go b/common/version.go
@@ -16,6 +16,7 @@ var (
 	gitTag         = ""                     // output from `git describe --exact-match --tags HEAD` (if clean tree state)
 	gitTreeState   = ""                     // determined from `git status --porcelain`. either 'clean' or 'dirty'
 	kubectlVersion = ""                     // determined from go.mod file
+	extraBuildInfo = ""                     // extra build information for vendors to populate during build
 )
 
 // Version contains Argo version information
@@ -29,6 +30,7 @@ type Version struct {
 	Compiler       string
 	Platform       string
 	KubectlVersion string
+	ExtraBuildInfo string
 }
 
 func (v Version) String() string {
@@ -66,6 +68,7 @@ func GetVersion() Version {
 			versionStr += "+unknown"
 		}
 	}
+
 	return Version{
 		Version:        versionStr,
 		BuildDate:      buildDate,
@@ -76,5 +79,6 @@ func GetVersion() Version {
 		Compiler:       runtime.Compiler,
 		Platform:       fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
 		KubectlVersion: kubectlVersion,
+		ExtraBuildInfo: extraBuildInfo,
 	}
 }
diff --git a/pkg/apiclient/version/version.pb.go b/pkg/apiclient/version/version.pb.go
diff --git a/server/version/version.go b/server/version/version.go
@@ -2,6 +2,7 @@ package version
 
 import (
 	"context"
+
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/google/go-jsonnet"
 
@@ -67,6 +68,7 @@ func (s *Server) Version(ctx context.Context, _ *empty.Empty) (*version.VersionM
 		HelmVersion:      s.helmVersion,
 		JsonnetVersion:   s.jsonnetVersion,
 		KubectlVersion:   vers.KubectlVersion,
+		ExtraBuildInfo:   vers.ExtraBuildInfo,
 	}, nil
 }
 

diff --git a/server/version/version.proto b/server/version/version.proto
@@ -23,6 +23,7 @@ message VersionMessage {
 	string HelmVersion = 11;
 	string KubectlVersion = 12;
 	string JsonnetVersion = 13;
+	string ExtraBuildInfo = 14;
 }
 
 // VersionService returns the version of the API server.

diff --git a/util/cli/cli.go b/util/cli/cli.go
@@ -52,6 +52,9 @@ func NewVersionCmd(cliName string) *cobra.Command {
 			fmt.Printf("  GoVersion: %s\n", version.GoVersion)
 			fmt.Printf("  Compiler: %s\n", version.Compiler)
 			fmt.Printf("  Platform: %s\n", version.Platform)
+			if version.ExtraBuildInfo != "" {
+				fmt.Printf("  ExtraBuildInfo: %s\n", version.ExtraBuildInfo)
+			}
 		},
 	}
 	versionCmd.Flags().BoolVar(&short, "short", false, "print just the version number")