wip

Author: roi-codefresh

venona/VERSION

@@ -1 +1 @@
-1.4.12
+1.4.13

venona/go.sum

@@ -151,6 +151,7 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6vRfwrJatElLBEf0I=
 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M=
 github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
 github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=

venonactl/VERSION

@@ -1 +1 @@
-1.4.12
+1.4.13

venonactl/cmd/install-runtime.go

@@ -28,6 +28,7 @@ import (
 var installRuntimeCmdOptions struct {
 	codefreshToken string
 	dryRun         bool
+	insecure       bool
 	kube           struct {
 		namespace    string
 		inCluster    bool
@@ -97,6 +98,7 @@ var installRuntimeCmd = &cobra.Command{
 			CodefreshToken:        installRuntimeCmdOptions.codefreshToken,
 			RuntimeEnvironment:    installRuntimeCmdOptions.runtimeEnvironmentName,
 			ClusterNamespace:      installRuntimeCmdOptions.kube.namespace,
+			Insecure:              installRuntimeCmdOptions.insecure,
 		}
 
 		if installRuntimeCmdOptions.kubernetesRunnerType {
@@ -168,6 +170,7 @@ func init() {
 	installRuntimeCmd.Flags().StringVar(&installRuntimeCmdOptions.storageClass, "storage-class", "", "Set a name of your custom storage class, note: this will not install volume provisioning components")
 	installRuntimeCmd.Flags().StringVar(&installRuntimeCmdOptions.dockerRegistry, "docker-registry", "", "The prefix for the container registry that will be used for pulling the required components images. Example: --docker-registry=\"docker.io\"")
 
+	installRuntimeCmd.Flags().BoolVar(&installRuntimeCmdOptions.insecure, "insecure", false, "Set to true to disable TLS when comunicating with the codefresh platform")
 	installRuntimeCmd.Flags().BoolVar(&installRuntimeCmdOptions.kube.inCluster, "in-cluster", false, "Set flag if venona is been installed from inside a cluster")
 	installRuntimeCmd.Flags().BoolVar(&installRuntimeCmdOptions.dryRun, "dry-run", false, "Set to true to simulate installation")
 	installRuntimeCmd.Flags().BoolVar(&installRuntimeCmdOptions.kubernetesRunnerType, "kubernetes-runner-type", false, "Set the runner type to kubernetes (alpha feature)")

venonactl/go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/Masterminds/semver v1.5.0
 	github.com/Masterminds/sprig v2.22.0+incompatible
 	github.com/briandowns/spinner v1.11.1
-	github.com/codefresh-io/go-sdk v0.18.0
+	github.com/codefresh-io/go-sdk v0.19.4
 	github.com/dustin/go-humanize v1.0.0
 	github.com/gophercloud/gophercloud v0.8.0 // indirect
 	github.com/huandu/xstrings v1.3.0 // indirect

venonactl/go.sum

@@ -77,6 +77,8 @@ 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/go-sdk v0.19.4 h1:f0r6lc+XuWQxN152qE80cRw6zWGll2aalo+MRgAfoHg=
+github.com/codefresh-io/go-sdk v0.19.4/go.mod h1:b6hK9euSW+MDXUDHU1+YgP8vzcij749I31ZIZSXed+I=
 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=
@@ -321,6 +323,7 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
 github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=

venonactl/hack/build.sh

@@ -6,6 +6,6 @@ go fmt ${PWD}/pkg/obj/kubeobj/kubeobj.go
 go fmt ${PWD}/pkg/templates/kubernetes/templates.go
 VERSION="$(cat VERSION)-$(git rev-parse --short HEAD)"
 echo "Setting up version $VERSION"
-go build -ldflags "-X github.com/codefresh-io/venona/venonactl/cmd.version=$VERSION" -o $OUTFILE main.go
+go build -ldflags "-X github.com/codefresh-io/venona/venonactl/cmd.version=$VERSION" -v -o $OUTFILE main.go
 
 chmod +x $OUTFILE

venonactl/pkg/codefresh/cfapi.go

@@ -18,7 +18,9 @@ package codefresh
 
 import (
 	"bytes"
+	"crypto/tls"
 	"fmt"
+	"net/http"
 
 	"archive/zip"
 
@@ -39,6 +41,7 @@ type (
 		ClusterNamespace      string
 		RegisterWithAgent     bool
 		MarkAsDefault         bool
+		Insecure              bool
 		StorageClass          string
 		IsDefaultStorageClass bool
 		KubernetesRunnerType  bool
@@ -73,13 +76,27 @@ type (
 
 // NewCodefreshAPI - creates new codefresh api
 func NewCodefreshAPI(opt *APIOptions) API {
+	httpClient := &http.Client{}
+	if opt.Insecure {
+		// #nosec
+		tr := http.Transport{
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify: true,
+			},
+		}
+		httpClient = &http.Client{
+			Transport: &tr,
+		}
+	}
+
 	return &api{
 		logger: opt.Logger,
 		codefresh: codefresh.New(&codefresh.ClientOptions{
 			Auth: codefresh.AuthOptions{
 				Token: opt.CodefreshToken,
 			},
-			Host: opt.CodefreshHost,
+			Host:   opt.CodefreshHost,
+			Client: httpClient,
 		}),
 		clustername:           opt.ClusterName,
 		clusternamespace:      opt.ClusterNamespace,
@@ -123,7 +140,7 @@ func (a *api) Sign() (*certs.ServerCert, error) {
 	respBodyReaderAt := bytes.NewReader(byteArray)
 	zipReader, err := zip.NewReader(respBodyReaderAt, int64(len(byteArray)))
 	if err != nil {
-		a.logger.Debug("Failed to create zip reader from given certificate " + fmt.Sprintf("%s",byteArray))
+		a.logger.Debug("Failed to create zip reader from given certificate " + fmt.Sprintf("%s", byteArray))
 		return nil, err
 	}
 	for _, zf := range zipReader.File {

venonactl/pkg/plugins/plugin.go

@@ -75,6 +75,7 @@ type (
 		RuntimeClusterName    string
 		RuntimeServiceAccount string
 		RestartAgent          bool
+		Insecure              bool
 	}
 
 	DeleteOptions struct {

venonactl/pkg/plugins/runtime-environment.go

@@ -60,6 +60,7 @@ func (u *runtimeEnvironmentPlugin) Install(opt *InstallOptions, v Values) (Value
 		KubernetesRunnerType:  opt.KubernetesRunnerType,
 		BuildNodeSelector:     opt.BuildNodeSelector,
 		Annotations:           opt.Annotations,
+		Insecure:              opt.Insecure,
 	}
 
 	// Set storage Class by backend
@@ -144,7 +145,7 @@ func (u *runtimeEnvironmentPlugin) Upgrade(_ *UpgradeOptions, v Values) (Values,
 func (u *runtimeEnvironmentPlugin) Migrate(opt *MigrateOptions, v Values) error {
 	return u.Delete(&DeleteOptions{
 		ClusterNamespace: opt.ClusterNamespace,
-		KubeBuilder: opt.KubeBuilder,
+		KubeBuilder:      opt.KubeBuilder,
 	}, v)
 }