Get system architecture from code

grycap · Jun 16, 2020 · ec30533 · ec30533
1 parent f8b9f38
commit ec30533
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,6 @@ FROM golang:1.14 as build
 
 ARG VERSION
 ARG GIT_COMMIT
-ARG PLATFORM="x86_64"
 ARG GOOS=linux
 
 RUN mkdir /oscar
@@ -15,8 +14,7 @@ COPY pkg pkg
 
 RUN GOOS=${GOOS} CGO_ENABLED=0 go build --ldflags "-s -w \
 -X \"github.com/grycap/oscar/pkg/version.Version=${VERSION}\" \
--X \"github.com/grycap/oscar/pkg/version.GitCommit=${GIT_COMMIT}\" \
--X \"github.com/grycap/oscar/pkg/version.Platform=${PLATFORM}\"" \
+-X \"github.com/grycap/oscar/pkg/version.GitCommit=${GIT_COMMIT}\"" \
 -a -installsuffix cgo -o oscar .
 
 

diff --git a/pkg/types/info.go b/pkg/types/info.go
@@ -20,7 +20,7 @@ package types
 type Info struct {
 	Version               string                 `json:"version"`
 	GitCommit             string                 `json:"git_commit"`
-	Platform              string                 `json:"platform"`
+	Architecture          string                 `json:"architecture"`
 	KubeVersion           string                 `json:"kubernetes_version"`
 	ServerlessBackendInfo *ServerlessBackendInfo `json:"serverless_backend,omitempty"`
 }

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -17,6 +17,8 @@ limitations under the License.
 package version
 
 import (
+	"runtime"
+
 	"github.com/grycap/oscar/pkg/types"
 	"k8s.io/client-go/kubernetes"
 )
@@ -27,9 +29,6 @@ var (
 
 	// GitCommit SHA of last git commit
 	GitCommit string
-
-	// Platform architecture of the compiled binary
-	Platform string
 )
 
 // GetInfo returns version info
@@ -43,7 +42,7 @@ func GetInfo(kubeClientset *kubernetes.Clientset, back types.ServerlessBackend)
 	return types.Info{
 		Version:               version,
 		GitCommit:             GitCommit,
-		Platform:              Platform,
+		Architecture:          runtime.GOARCH,
 		KubeVersion:           getKubeVersion(kubeClientset),
 		ServerlessBackendInfo: back.GetInfo(),
 	}