diff --git a/Gopkg.lock b/Gopkg.lock
index 4b6c1c343af..5ef74389997 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -125,6 +125,18 @@
   ]
   revision = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
 
+[[projects]]
+  branch = "master"
+  name = "github.com/howeyc/gopass"
+  packages = ["."]
+  revision = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+
+[[projects]]
+  name = "github.com/imdario/mergo"
+  packages = ["."]
+  revision = "9d5f1277e9a8ed20c3684bda8fde67c05628518c"
+  version = "v0.3.4"
+
 [[projects]]
   name = "github.com/inconshreveable/mousetrap"
   packages = ["."]
@@ -363,8 +375,12 @@
     "pkg/version",
     "rest",
     "rest/watch",
+    "tools/auth",
     "tools/cache",
+    "tools/clientcmd",
     "tools/clientcmd/api",
+    "tools/clientcmd/api/latest",
+    "tools/clientcmd/api/v1",
     "tools/metrics",
     "tools/pager",
     "tools/reference",
@@ -372,6 +388,7 @@
     "util/buffer",
     "util/cert",
     "util/flowcontrol",
+    "util/homedir",
     "util/integer",
     "util/workqueue"
   ]
@@ -387,6 +404,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "071affe4f34c92407f2f6145d0d0d61d4e730789fe4f2d3dcf8b23271fb48ee9"
+  inputs-digest = "c79bcf7324a24288d72ab4f475131f384721c685be4b8d555696d34efac6ed40"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/pkg/k8sclient/client.go b/pkg/k8sclient/client.go
index fed639a84c7..db930f299e1 100644
--- a/pkg/k8sclient/client.go
+++ b/pkg/k8sclient/client.go
@@ -20,6 +20,7 @@ import (
 	"os"
 
 	"github.com/operator-framework/operator-sdk/pkg/util/k8sutil"
+
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -90,7 +91,7 @@ func apiResource(gvk schema.GroupVersionKind, restMapper *discovery.DeferredDisc
 func mustNewKubeClientAndConfig() (kubernetes.Interface, *rest.Config) {
 	var cfg *rest.Config
 	var err error
-	if os.Getenv(KubeConfigEnvVar) != "" {
+	if os.Getenv(k8sutil.KubeConfigEnvVar) != "" {
 		cfg, err = outOfClusterConfig()
 	} else {
 		cfg, err = inClusterConfig()