From de87136720fa5f7d7ba89b5e6b18266540c03958 Mon Sep 17 00:00:00 2001
From: Prashant <prary2@gmail.com>
Date: Wed, 2 Oct 2019 21:22:26 +0530
Subject: [PATCH] Kaniko version

---
 Makefile                    |  2 +-
 cmd/executor/cmd/root.go    | 32 +++++++++++++++++---------------
 cmd/executor/cmd/version.go | 20 ++++++++++++++++++++
 3 files changed, 38 insertions(+), 16 deletions(-)
 create mode 100644 cmd/executor/cmd/version.go

diff --git a/Makefile b/Makefile
index e5633bf20..881c55a5d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,6 @@ VERSION_MINOR ?= 11
 VERSION_BUILD ?= 0
 
 VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
-VERSION_PACKAGE = $(REPOPATH/pkg/version)
 
 SHELL := /bin/bash
 GOOS ?= $(shell go env GOOS)
@@ -28,6 +27,7 @@ PROJECT := kaniko
 REGISTRY?=gcr.io/kaniko-project
 
 REPOPATH ?= $(ORG)/$(PROJECT)
+VERSION_PACKAGE = $(REPOPATH)/pkg/version
 
 GO_FILES := $(shell find . -type f -name '*.go' -not -path "./vendor/*")
 GO_LDFLAGS := '-extldflags "-static"
diff --git a/cmd/executor/cmd/root.go b/cmd/executor/cmd/root.go
index 0dd717f86..69a0addc3 100644
--- a/cmd/executor/cmd/root.go
+++ b/cmd/executor/cmd/root.go
@@ -54,21 +54,23 @@ func init() {
 var RootCmd = &cobra.Command{
 	Use: "executor",
 	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-		if err := util.ConfigureLogging(logLevel); err != nil {
-			return err
-		}
-		if !opts.NoPush && len(opts.Destinations) == 0 {
-			return errors.New("You must provide --destination, or use --no-push")
-		}
-		if err := cacheFlagsValid(); err != nil {
-			return errors.Wrap(err, "cache flags invalid")
-		}
-		if err := resolveSourceContext(); err != nil {
-			return errors.Wrap(err, "error resolving source context")
-		}
-		if err := resolveDockerfilePath(); err != nil {
-			return errors.Wrap(err, "error resolving dockerfile path")
-		}
+	    if cmd.Use == "executor" {
+            if err := util.ConfigureLogging(logLevel); err != nil {
+                return err
+            }
+            if !opts.NoPush && len(opts.Destinations) == 0 {
+                return errors.New("You must provide --destination, or use --no-push")
+            }
+            if err := cacheFlagsValid(); err != nil {
+                return errors.Wrap(err, "cache flags invalid")
+            }
+            if err := resolveSourceContext(); err != nil {
+                return errors.Wrap(err, "error resolving source context")
+            }
+            if err := resolveDockerfilePath(); err != nil {
+                return errors.Wrap(err, "error resolving dockerfile path")
+            }
+        }
 		return nil
 	},
 	Run: func(cmd *cobra.Command, args []string) {
diff --git a/cmd/executor/cmd/version.go b/cmd/executor/cmd/version.go
new file mode 100644
index 000000000..df1880e1a
--- /dev/null
+++ b/cmd/executor/cmd/version.go
@@ -0,0 +1,20 @@
+package cmd
+
+import (
+  "fmt"
+
+  "github.com/spf13/cobra"
+  "github.com/GoogleContainerTools/kaniko/pkg/version"
+)
+
+func init() {
+  RootCmd.AddCommand(versionCmd)
+}
+
+var versionCmd = &cobra.Command{
+  Use:   "version",
+  Short: "Print the version number of kaniko",
+  Run: func(cmd *cobra.Command, args []string) {
+    fmt.Print("Kaniko version : ", version.Version())
+  },
+}
\ No newline at end of file