Merge branch 'SAAS-7677' of github.com:codefresh-io/venona into SAAS-7677

Author: oren-codefresh

venona/VERSION

@@ -1 +1 @@
-1.5.0
+1.4.11

venona/go.mod

@@ -3,22 +3,19 @@ module github.com/codefresh-io/go/venona
 go 1.14
 
 require (
+	github.com/codefresh-io/venona/venonactl v0.0.0-20200628143411-3135d91be7ee // indirect
 	github.com/gin-gonic/gin v1.6.3
 	github.com/go-playground/validator/v10 v10.3.0 // indirect
 	github.com/golang/protobuf v1.4.2 // indirect
 	github.com/inconshreveable/log15 v0.0.0-20200109203555-b30bc20e4fd1
 	github.com/json-iterator/go v1.1.10 // indirect
-	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.7.0
-	github.com/stretchr/objx v0.2.0 // indirect
 	github.com/stretchr/testify v1.5.1
-	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
 	golang.org/x/net v0.0.0-20200226121028-0de0cce0169b // indirect
 	golang.org/x/sys v0.0.0-20200610111108-226ff32320da // indirect
 	google.golang.org/protobuf v1.24.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/yaml.v2 v2.3.0
 	k8s.io/api v0.18.3
 	k8s.io/apimachinery v0.18.3

venona/go.sum

@@ -1 +1 @@
-1.5.0
+1.4.11

venonactl/VERSION

@@ -77,7 +77,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/codefresh-io/go-sdk v0.18.0 h1:tSP1m89l66qQ2PF5NvuUCL5dCorxQUGhyq7lyRKv35Q=
 github.com/codefresh-io/go-sdk v0.18.0/go.mod h1:b6hK9euSW+MDXUDHU1+YgP8vzcij749I31ZIZSXed+I=
-github.com/codefresh-io/venona v1.0.2 h1:fpQ2y4/DLgW8q/RNrrkc4aISvIIyXHT0jcr5F3eiSYs=
 github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko=
 github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
 github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=

venonactl/go.sum

@@ -13,7 +13,7 @@ import (
 type (
 	Kube interface {
 		BuildClient() (*kubernetes.Clientset, error)
-		BuildConfig() clientcmd.ClientConfig
+		BuildConfig() (*rest.Config, error)
 		EnsureNamespaceExists(cs *kubernetes.Clientset) error
 	}
 
@@ -47,7 +47,7 @@ func (k *kube) BuildClient() (*kubernetes.Clientset, error) {
 	if k.inCluster {
 		config, err = rest.InClusterConfig()
 	} else {
-		config, err = k.BuildConfig().ClientConfig()
+		config, err = k.BuildConfig()
 		if err != nil { // if cannot create from kubeConfigPath, try in-cluster config
 			config, err = rest.InClusterConfig()
 		}
@@ -71,7 +71,7 @@ func (k *kube) EnsureNamespaceExists(cs *kubernetes.Clientset) error {
 	return nil
 }
 
-func (k *kube) BuildConfig() clientcmd.ClientConfig {
+func (k *kube) BuildConfig() (*rest.Config, error) {
 	config := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
 		&clientcmd.ClientConfigLoadingRules{ExplicitPath: k.pathToKubeConfig},
 		&clientcmd.ConfigOverrides{
@@ -80,6 +80,12 @@ func (k *kube) BuildConfig() clientcmd.ClientConfig {
 				Namespace: k.namespace,
 			},
 		})
-	return config
+	cc, err := config.ClientConfig()
+
+	if err != nil { // if cannot create from kubeConfigPath, try in-cluster config
+		return rest.InClusterConfig()
+	}
+
+	return cc, nil
 
 }

venonactl/pkg/kube/kube.go

@@ -8,7 +8,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/tools/clientcmd"
+	"k8s.io/client-go/rest"
 )
 
 const (
@@ -59,7 +59,7 @@ type (
 		IsDefaultStorageClass bool
 		KubeBuilder           interface {
 			BuildClient() (*kubernetes.Clientset, error)
-			BuildConfig() clientcmd.ClientConfig
+			BuildConfig() (*rest.Config, error)
 			EnsureNamespaceExists(cs *kubernetes.Clientset) error
 		}
 		AgentKubeBuilder interface {

venonactl/pkg/plugins/plugin.go

@@ -36,7 +36,7 @@ const (
 
 func buildRuntimeConfig(opt *InstallOptions, v Values) (RuntimeConfiguration, error) {
 
-	config, err := opt.KubeBuilder.BuildConfig().ClientConfig()
+	config, err := opt.KubeBuilder.BuildConfig()
 	if err != nil {
 		return RuntimeConfiguration{}, fmt.Errorf("Failed to get client config on runtime cluster: %v", err)
 	}