Add version flag to operator binary

Refer submariner-io/enhancements#204 Fixes #2751 Signed-off-by: Vishal Thapar <[email protected]>
submariner-io · Aug 7, 2023 · 86081de · 86081de
1 parent 3e9f4e9
commit 86081de
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.67.1
 	github.com/prometheus-operator/prometheus-operator/pkg/client v0.67.1
 	github.com/prometheus/client_golang v1.16.0
-	github.com/submariner-io/admiral v0.16.0-m3
+	github.com/submariner-io/admiral v0.16.0-m3.0.20230807132642-3d805dda2f2c
 	github.com/submariner-io/shipyard v0.16.0-m3
 	github.com/submariner-io/submariner v0.16.0-m3
 	github.com/uw-labs/lichen v0.1.7

diff --git a/go.sum b/go.sum
@@ -973,8 +973,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/submariner-io/admiral v0.16.0-m3 h1:qHpRw8mE80/Q3e/2z0ZPdqPVBESYWPPXRmJxUn5azeY=
-github.com/submariner-io/admiral v0.16.0-m3/go.mod h1:wiU8hC/soJ6C3g634CFvaGq/Hptgy4D2Xpf8IlQ5y5A=
+github.com/submariner-io/admiral v0.16.0-m3.0.20230807132642-3d805dda2f2c h1:Poy5ytHRcX/XET/5Ha4kC/BuWiKJSkfv2Hgyn/K/2zc=
+github.com/submariner-io/admiral v0.16.0-m3.0.20230807132642-3d805dda2f2c/go.mod h1:wiU8hC/soJ6C3g634CFvaGq/Hptgy4D2Xpf8IlQ5y5A=
 github.com/submariner-io/shipyard v0.16.0-m3 h1:795gM5zCjszEjQ5UM9LY/7vRTldHt16PdETTzjY265A=
 github.com/submariner-io/shipyard v0.16.0-m3/go.mod h1:P6zHeYDcQMS24/8Z7NN2WP4Ydqdu4CB4HC+VRn3l2MA=
 github.com/submariner-io/submariner v0.16.0-m3 h1:AMwSNZOv64XyLOrDxVFYOb2a+nZU7dwWam1Bkt23T7A=

diff --git a/main.go b/main.go
@@ -28,6 +28,8 @@ import (
 	configv1 "github.com/openshift/api/config/v1"
 	"github.com/operator-framework/operator-lib/leader"
 	"github.com/submariner-io/admiral/pkg/log/kzerolog"
+	"github.com/submariner-io/admiral/pkg/names"
+	admversion "github.com/submariner-io/admiral/pkg/version"
 	"github.com/submariner-io/submariner-operator/api/v1alpha1"
 	"github.com/submariner-io/submariner-operator/controllers/metrics"
 	"github.com/submariner-io/submariner-operator/controllers/servicediscovery"
@@ -58,20 +60,21 @@ var (
 )
 
 var (
-	scheme  = apiruntime.NewScheme()
-	log     = logf.Log.WithName("cmd")
-	help    = false
-	version = "devel"
+	scheme      = apiruntime.NewScheme()
+	log         = logf.Log.WithName("cmd")
+	help        = false
+	version     = "devel"
+	showVersion = false
 )
 
 func printVersion() {
 	log.Info(fmt.Sprintf("Go Version: %s", runtime.Version()))
 	log.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH))
-	log.Info(fmt.Sprintf("Submariner operator version: %v", version))
 }
 
 func init() {
 	flag.BoolVar(&help, "help", help, "Print usage options")
+	flag.BoolVar(&showVersion, "version", showVersion, "Show version")
 }
 
 //nolint:gocyclo // No further refactors necessary
@@ -91,6 +94,12 @@ func main() {
 		return
 	}
 
+	admversion.Print(names.OperatorComponent, version)
+
+	if showVersion {
+		return
+	}
+
 	kzerolog.InitK8sLogging()
 	log.Info("Starting submariner-operator")
 

diff --git a/scripts/test/e2e.sh b/scripts/test/e2e.sh
@@ -20,7 +20,7 @@ subm_ns=submariner-operator
 # Check that we're testing the version we expect
 function check_operator_version() {
     local opv
-    opv=$(kubectl --context="$cluster" logs -n submariner-operator -l name=submariner-operator --tail=-1 | awk '/Submariner operator version/ { print $NF }')
+    opv=$(kubectl --context="$cluster" logs -n submariner-operator -l name=submariner-operator --tail=-1 | awk '/submariner-operator version/ { print $NF }')
     printf "Cluster %s is running operator version %s\n" "$cluster" "$opv"
     if [ "$opv" != "$VERSION" ]; then
         printf "Operator version mismatch: expected %s, got %s\n" "$VERSION" "$opv"