minor fixes

tidied up go mod
removing previously used lib for color printing
2020-04-24 14:35:51 -04:00 · 2020-04-24 14:31:38 -04:00 · 2020-04-24 14:29:28 -04:00 · 2020-04-24 14:23:57 -04:00 · 2020-04-24 14:23:12 -04:00 · 2020-04-24 13:53:05 -04:00
22 changed files with 196 additions and 520 deletions
--- a/cmd/qliksense/context.go
+++ b/cmd/qliksense/context.go
@@ -220,27 +220,3 @@ func cleanConfigRepoPatchesCmd(q *qliksense.Qliksense) *cobra.Command {
 		},
 	}
 }
-
-func unsetCmd(q *qliksense.Qliksense) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "unset",
-		Short: "remove a key from a context or a secrets or a configs from the context",
-		Example: `
-# remove the key from CR
-qliksense config unset <key>
-
-# remove the key from service inside configs/secrets of CR
-qliksense config unset <service>.<key> 
-
-# remove the service from inside configs/secrets of CR
-qliksense config usnet <servcie> 
-
-all of the above supports space separated multiple arguments
-`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return q.UnsetCmd(args)
-		},
-		Args: cobra.MinimumNArgs(1),
-	}
-	return cmd
-}
--- a/cmd/qliksense/preflight.go
+++ b/cmd/qliksense/preflight.go
@@ -12,17 +12,12 @@ import (
 )

 func preflightCmd(q *qliksense.Qliksense) *cobra.Command {
-	preflightOpts := &preflight.PreflightOptions{
-		MongoOptions: &preflight.MongoOptions{},
-	}
 	var preflightCmd = &cobra.Command{
 		Use:     "preflight",
 		Short:   "perform preflight checks on the cluster",
 		Long:    `perform preflight checks on the cluster`,
 		Example: `qliksense preflight <preflight_check_to_run>`,
 	}
-	f := preflightCmd.Flags()
-	f.BoolVarP(&preflightOpts.Verbose, "verbose", "v", false, "verbose mode")
 	return preflightCmd
 }

@@ -136,7 +131,12 @@ func pfAllChecksCmd(q *qliksense.Qliksense) *cobra.Command {
 	f := preflightAllChecksCmd.Flags()
 	f.BoolVarP(&preflightOpts.Verbose, "verbose", "v", false, "verbose mode")
 	f.StringVarP(&preflightOpts.MongoOptions.MongodbUrl, "mongodb-url", "", "", "mongodbUrl to try connecting to")
+	f.StringVarP(&preflightOpts.MongoOptions.Username, "mongodb-username", "", "", "username to connect to mongodb")
+	f.StringVarP(&preflightOpts.MongoOptions.Password, "mongodb-password", "", "", "password to connect to mongodb")
 	f.StringVarP(&preflightOpts.MongoOptions.CaCertFile, "mongodb-ca-cert", "", "", "certificate to use for mongodb check")
+	f.StringVarP(&preflightOpts.MongoOptions.ClientCertFile, "mongodb-client-cert", "", "", "client-certificate to use for mongodb check")
+	f.BoolVar(&preflightOpts.MongoOptions.Tls, "mongodb-tls", false, "enable tls?")
+
 	return preflightAllChecksCmd
 }

@@ -147,7 +147,7 @@ func pfDeploymentCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 	}
 	var pfDeploymentCheckCmd = &cobra.Command{
 		Use:     "deployment",
-		Short:   "perform preflight deployment check",
+		Short:   "perform preflight deploymwnt check",
 		Long:    `perform preflight deployment check to ensure that we can create deployments in the cluster`,
 		Example: `qliksense preflight deployment`,
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -332,7 +332,7 @@ func pfCreateServiceAccountCheckCmd(q *qliksense.Qliksense) *cobra.Command {

 	var preflightServiceAccountCmd = &cobra.Command{
 		Use:     "serviceaccount",
-		Short:   "preflight create serviceaccount check",
+		Short:   "preflight create ServiceAccount check",
 		Long:    `perform preflight serviceaccount check to ensure we are able to create a service account in the cluster`,
 		Example: `qliksense preflight serviceaccount`,
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -429,7 +429,11 @@ func pfMongoCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 	f := preflightMongoCmd.Flags()
 	f.BoolVarP(&preflightOpts.Verbose, "verbose", "v", false, "verbose mode")
 	f.StringVarP(&preflightOpts.MongoOptions.MongodbUrl, "url", "", "", "mongodbUrl to try connecting to")
+	f.StringVarP(&preflightOpts.MongoOptions.Username, "username", "", "", "username to connect to mongodb")
+	f.StringVarP(&preflightOpts.MongoOptions.Password, "password", "", "", "password to connect to mongodb")
 	f.StringVarP(&preflightOpts.MongoOptions.CaCertFile, "ca-cert", "", "", "ca certificate to use for mongodb check")
+	f.StringVarP(&preflightOpts.MongoOptions.ClientCertFile, "client-cert", "", "", "client-certificate to use for mongodb check")
+	f.BoolVar(&preflightOpts.MongoOptions.Tls, "tls", false, "enable tls?")
 	return preflightMongoCmd
 }

--- a/cmd/qliksense/root.go
+++ b/cmd/qliksense/root.go
@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 	"strings"

-	. "github.com/logrusorgru/aurora"
 	ansi "github.com/mattn/go-colorable"
 	"github.com/mitchellh/go-homedir"
 	"github.com/qlik-oss/sense-installer/pkg"
@@ -16,6 +15,7 @@ import (
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	. "github.com/logrusorgru/aurora"
 )

 // To run this project in debug mode, run:
@@ -46,7 +46,7 @@ func initAndExecute() error {
 		log.Fatal(err)
 	}
 	// create dirs and appropriate files for setting up contexts
-	api.LogDebugMessage("QliksenseHomeDir: %s\n", qlikSenseHome)
+	api.LogDebugMessage("QliksenseHomeDir: %s", qlikSenseHome)

 	qliksenseClient := qliksense.New(qlikSenseHome)
 	cmd := rootCmd(qliksenseClient)
@@ -122,7 +122,6 @@ func getRootCmd(p *qliksense.Qliksense) *cobra.Command {
 				globalEulaPostRun(cmd, p)
 			}
 		},
-		SilenceUsage: true,
 	}
 	origHelpFunc := cmd.HelpFunc()
 	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
@@ -196,13 +195,10 @@ func rootCmd(p *qliksense.Qliksense) *cobra.Command {

 	// add clean-config-repo-patches command as a sub-command to the app config sub-command
 	configCmd.AddCommand(cleanConfigRepoPatchesCmd(p))
+	

 	// open editor for config
 	configCmd.AddCommand(configEditCmd(p))
-
-	// add unset for config
-	configCmd.AddCommand((unsetCmd(p)))
-
 	// add uninstall command
 	cmd.AddCommand(uninstallCmd(p))

--- a/docs/command_reference.md
+++ b/docs/command_reference.md
@@ -23,12 +23,6 @@ Run the following command to execute a specific check
 qliksense preflight dns
 ```

-#### Running cleanup
-Run the following command to cleanup entities created for preflight checks that were left behind on the cluster.
-```
-qliksense preflight clean
-```
-
 ### qliksense load

 `qliksense load` command takes input from a file or from pipe
--- a/docs/preflight_checks.md
+++ b/docs/preflight_checks.md
@@ -16,29 +16,19 @@ Examples:
 qliksense preflight <preflight_check_to_run>

 Available Commands:
-  all            perform all checks
-  authcheck      preflight authcheck
-  clean          perform preflight clean
-  deployment     perform preflight deployment check
-  dns            perform preflight dns check
-  kube-version   check kubernetes version
-  mongo          preflight mongo OR preflight mongo --url=<url>
-  pod            perform preflight pod check
-  role           preflight create role check
-  rolebinding    preflight create rolebinding check
-  service        perform preflight service check
-  serviceaccount preflight create ServiceAccount check
+  all         perform all checks
+  dns         perform preflight dns check
+  k8s-version check k8s version

 Flags:
  -h, --help   help for preflight
-  -v, --verbose   verbose mode
 ```

 ### DNS check
 Run the following command to perform preflight DNS check. We setup a kubernetes deployment and try to reach it as part of establishing DNS connectivity in this check. 
 The expected output should be similar to the one shown below.
 ```shell
-$ qliksense preflight dns -v
+$ qliksense preflight dns

 Preflight DNS check
 ---------------------
@@ -61,7 +51,7 @@ Deleted deployment: dep-dns-preflight-check
 We check the version of the target kubernetes cluster and ensure that it falls in the valid range of kubernetes versions that are supported by qliksense. 
 The command to run this check and the expected similar output are as shown below:
 ```shell
-$ qliksense preflight k8s-version -v
+$ qliksense preflight k8s-version

 Preflight kubernetes minimum version check
 ------------------------------------------
@@ -76,7 +66,7 @@ Completed Preflight kubernetes minimum version check
 ### Service check
 We use the commmand below to test if we are able to create a service in the cluster.
 ```shell
-$ qliksense preflight service -v
+$ qliksense preflight service

 Preflight service check
 -----------------------
@@ -92,7 +82,7 @@ Completed preflight service check
 ### Deployment check
 We use the commmand below to test if we are able to create a deployment in the cluster. After the test exexutes, we wait until the created deployment terminates before we exit the command. 
 ```shell
-$ qliksense preflight deployment -v
+$ qliksense preflight deployment

 Preflight deployment check
 -----------------------
@@ -107,7 +97,7 @@ Completed preflight deployment check
 ### Pod check
 We use the commmand below to test if we are able to create a pod in the cluster.
 ```shell
-$ qliksense preflight pod -v
+$ qliksense preflight pod

 Preflight pod check
 --------------------
@@ -120,61 +110,61 @@ Deleted pod: pod-pf-check
 Completed preflight pod check
 ```

-### Role check
+### Create-Role check
 We use the command below to test if we are able to create a role in the cluster
 ```shell
-$ qliksense preflight role -v
-Preflight role check
+$ qliksense preflight create-role
+Preflight create-role check
 ---------------------------
-Preflight role check: 
+Preflight create-role check: 
 Created role: role-preflight-check
-Preflight role check: PASSED
+Preflight create-role check: PASSED
 Cleaning up resources...
 Deleted role: role-preflight-check

-Completed preflight role check
+Completed preflight create-role check
 ```

-### RoleBinding check
+### Create-RoleBinding check
 We use the command below to test if we are able to create a role binding in the cluster
 ```shell
-$ qliksense preflight rolebinding -v
+$ qliksense preflight createRoleBinding

-Preflight rolebinding check
+Preflight create roleBinding check
 ---------------------------
-Preflight rolebinding check: 
+Preflight createRoleBinding check: 
 Created RoleBinding: role-binding-preflight-check
-Preflight rolebinding check: PASSED
+Preflight createRoleBinding check: PASSED
 Cleaning up resources...
 Deleting RoleBinding: role-binding-preflight-check
 Deleted RoleBinding: role-binding-preflight-check

-Completed preflight rolebinding check
+Completed preflight createRoleBinding check
 ```

 ### Create-ServiceAccount check
 We use the command below to test if we are able to create a service account in the cluster
 ```shell
-$ qliksense preflight serviceaccount -v
+$ qliksense preflight createServiceAccount

-Preflight ServiceAccount check
+Preflight create ServiceAccount check
 -------------------------------------
-Preflight serviceaccount check: 
+Preflight createServiceAccount check: 
 Created Service Account: preflight-check-test-serviceaccount
-Preflight serviceaccount check: PASSED
+Preflight createServiceAccount check: PASSED
 Cleaning up resources...
 Deleting ServiceAccount: preflight-check-test-serviceaccount
 Deleted ServiceAccount: preflight-check-test-serviceaccount

-Completed preflight serviceaccount check
+Completed preflight createServiceAccount check
 ```

-### Auth check
+### CreateRB check
 We use the command below to combine creation of role, role binding, and service account tests
 ```shell
-$ qliksense preflight authcheck -v
+$ qliksense preflight createRB

-Preflight auth check
+Preflight createRB check
 -------------------------------------
 Preflight create-role check: 
 Created role: role-preflight-check
@@ -199,18 +189,18 @@ Cleaning up resources...
 Deleted ServiceAccount: preflight-check-test-serviceaccount

 Completed preflight createServiceAccount check
-Completed preflight auth check
+Completed preflight CreateRB check
 ```

 ### Mongodb check
 We can check if we are able to connect to an instance of mongodb on the cluster by either supplying the mongodbUri as part of the command or infer it from the current context.

 ```shell
-qliksense preflight mongo --url=<url> -v OR
-qliksense preflight mongo -v
-qliksense preflight mongo --url=<mongo-server url> --ca-cert=<path to ca-cert file> -v
-```
-```shell
+qliksense preflight mongo --url=<url> OR
+qliksense preflight mongo
+qliksense preflight mongo --url=<mongo-server url> --ca-cert=<path to ca-cert file>
+
+
 Preflight mongo check
 ---------------------
 Preflight mongodb check: 
@@ -226,35 +216,13 @@ Deleted pod: pf-mongo-pod
 Completed preflight mongodb check
 ```

-#### Mongodb check with mutual tls
-In order to perform mutual tls with mongo we need to:
- append client certificate to the beginning/end of CA certificate. Make sure to include the beginning and end tags on each certificate. 
-The CA certificate file should look like this in the end:
-```shell
-<existing contents of CA cert>
-...
-----BEGIN RSA PRIVATE KEY-----
-<private key>
-----END RSA PRIVATE KEY-----
-----BEGIN CERTIFICATE-----
-<public key>
-----END CERTIFICATE-----
-```
- Run the command below to set the ca certificate into the CR
-```shell
-cat <path_to_ca.crt> | base64 | qliksense config set-secrets qliksense.caCertificates --base64
-```

-Next, run: 
-```shell
-qliksense preflight mongo -v
-```

 ### Running all checks
 Run the command shown below to execute all preflight checks.
 ```shell
-$ qliksense preflight all --mongodb-url=<url> -v OR
-$ qliksense preflight all --mongodb-url=<mongo-server url> --mongodb-ca-cert=<path to ca-cert file> -v
+$ qliksense preflight all --mongodb-url=<url> OR
+$ qliksense preflight all --mongodb-url=<mongo-server url> --mongodb-ca-cert=<path to ca-cert file> 

 Running all preflight checks

@@ -285,23 +253,4 @@ Completed Preflight kubernetes minimum version check
 All preflight checks have PASSED
 Completed running all preflight checks

-```
-
-### Clean
-Run the command below to cleanup entities that were created for the purpose of running preflight checks and left behind in the cluster.
-```shell
-$ qliksense preflight clean -v
-
-Preflight clean
----------------
-Removing deployment...
-Removing service...
-Removing pod...
-Removing role...
-Removing rolebinding...
-Removing serviceaccount...
-Removing DNS check components...
-Removing mongo check components...
-Preflight cleanup complete
-
-```
+```
--- a/go.mod
+++ b/go.mod
@@ -10,13 +10,13 @@ replace (
 	k8s.io/client-go => k8s.io/client-go v0.17.0
 	k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191219154910-1528d4eea6dd

-	sigs.k8s.io/kustomize/api => github.com/qlik-oss/kustomize/api v0.3.3-0.20200514233516-4ac83864b7bd
+	sigs.k8s.io/kustomize/api => github.com/qlik-oss/kustomize/api v0.3.3-0.20200424070349-b0312eb71568
 )

 require (
 	cloud.google.com/go v0.52.0 // indirect
 	cloud.google.com/go/storage v1.5.0 // indirect
-	github.com/Masterminds/semver/v3 v3.1.0
+	github.com/Masterminds/semver/v3 v3.0.3
 	github.com/Shopify/ejson v1.2.1
 	github.com/aws/aws-sdk-go v1.28.9 // indirect
 	github.com/bugsnag/bugsnag-go v1.5.3 // indirect
@@ -40,7 +40,7 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/otiai10/copy v1.1.1
 	github.com/pkg/errors v0.9.1
-	github.com/qlik-oss/k-apis v0.1.2
+	github.com/qlik-oss/k-apis v0.1.1
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/rogpeppe/go-internal v1.5.2 // indirect
 	github.com/spf13/cobra v0.0.6
@@ -51,6 +51,7 @@ require (
 	golang.org/x/tools v0.0.0-20200312194400-c312e98713c2 // indirect
 	google.golang.org/genproto v0.0.0-20200128133413-58ce757ed39b // indirect
 	gopkg.in/yaml.v2 v2.2.8
+	gopkg.in/yaml.v3 v3.0.0-20190924164351-c8b7dadae555
 	k8s.io/api v0.17.2
 	k8s.io/apimachinery v0.17.2
 	k8s.io/client-go v11.0.0+incompatible
--- a/go.sum
+++ b/go.sum
@@ -72,8 +72,6 @@ github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RP
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver/v3 v3.0.3 h1:znjIyLfpXEDQjOIEWh+ehwpTU14UzUPub3c3sm36u14=
 github.com/Masterminds/semver/v3 v3.0.3/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
-github.com/Masterminds/semver/v3 v3.1.0 h1:Y2lUDsFKVRSYGojLJ1yLxSXdMmMYTYls0rCvoqmMUQk=
-github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Masterminds/sprig/v3 v3.0.2 h1:wz22D0CiSctrliXiI9ZO3HoNApweeRGftyDN+BQa3B8=
 github.com/Masterminds/sprig/v3 v3.0.2/go.mod h1:oesJ8kPONMONaZgtiHNzUShJbksypC5kWczhZAf6+aU=
 github.com/Masterminds/vcs v1.13.1/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA=
@@ -883,10 +881,10 @@ github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
 github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
 github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/qlik-oss/k-apis v0.1.2 h1:BBcrXl+NxdsvuRsZuJbvIFxMv5QIXqWBzhXOcr5KUX8=
-github.com/qlik-oss/k-apis v0.1.2/go.mod h1:yoYGgPJ/H0t9H3NSq64dWfyQY6QWi2L9c+hCJoVO03U=
-github.com/qlik-oss/kustomize/api v0.3.3-0.20200514233516-4ac83864b7bd h1:dYd6duTr54L7OqykGkd3Z+336frAvzsibWNYruYkYVc=
-github.com/qlik-oss/kustomize/api v0.3.3-0.20200514233516-4ac83864b7bd/go.mod h1:zh3yFgE5zFk1kreqzVyyj1eXyIxQJT53l4zSg8Wt4SA=
+github.com/qlik-oss/k-apis v0.1.1 h1:aZ4eTMB3mSn03Kuj7+RI0eFLkjK9+0qxADBioRb3qVA=
+github.com/qlik-oss/k-apis v0.1.1/go.mod h1:yoYGgPJ/H0t9H3NSq64dWfyQY6QWi2L9c+hCJoVO03U=
+github.com/qlik-oss/kustomize/api v0.3.3-0.20200424070349-b0312eb71568 h1:wHOUCGfnmgYqW3aCjuP3fXmB2T/uZXMvltO+F3us83E=
+github.com/qlik-oss/kustomize/api v0.3.3-0.20200424070349-b0312eb71568/go.mod h1:Yg8bqX8Mq/eSgXfcenxCxhZuSXg+NCsKq6NBdch/oUc=
 github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI=
 github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be h1:ta7tUOvsPHVHGom5hKW5VXNc2xZIkfCKP8iaqOyYtUQ=
 github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be/go.mod h1:MIDFMn7db1kT65GmV94GzpX9Qdi7N/pQlwb+AN8wh+Q=
--- a/pkg/api/apis.go
+++ b/pkg/api/apis.go
@@ -157,8 +157,6 @@ func (cr *QliksenseCR) GetFetchAccessToken(encryptionKey string) string {
 	if tok, err := cr.Spec.FetchSource.GetAccessToken(); err != nil {
 		fmt.Println(err)
 		return ""
-	} else if tok == "" {
-		return tok
 	} else {
 		by, _ := b64.StdEncoding.DecodeString(tok)
 		res, err := DecryptData(by, encryptionKey)
--- a/pkg/api/context_apis.go
+++ b/pkg/api/context_apis.go
@@ -96,7 +96,7 @@ func WriteToFile(content interface{}, targetFile string) error {
 		log.Println(err)
 		return err
 	}
-	LogDebugMessage("Wrote content into %s\n", targetFile)
+	LogDebugMessage("Wrote content into %s", targetFile)
 	return nil
 }

--- a/pkg/api/docker_registry_secret_test.go
+++ b/pkg/api/docker_registry_secret_test.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"

-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )

 func TestDockerConfigJsonSecret(t *testing.T) {
@@ -34,10 +34,10 @@ func TestDockerConfigJsonSecret(t *testing.T) {
 		t.Fatalf("error unmarshalling yaml string: %v, error: %v", string(dockerConfigJsonSecretYamlBytes), err)
 	} else if validYamlMap["apiVersion"] != "v1" ||
 		validYamlMap["kind"] != "Secret" ||
-		validYamlMap["metadata"].(map[interface {}]interface {})["name"] != dockerConfigJsonSecret.Name ||
+		validYamlMap["metadata"].(map[string]interface{})["name"] != dockerConfigJsonSecret.Name ||
 		validYamlMap["type"] != "kubernetes.io/dockerconfigjson" {
 		t.Fatalf("error verifying validity of secret yaml: %v", string(dockerConfigJsonSecretYamlBytes))
-	} else if dockerConfigJsonBytesBase64, ok := validYamlMap["data"].(map[interface {}]interface {})[".dockerconfigjson"]; !ok {
+	} else if dockerConfigJsonBytesBase64, ok := validYamlMap["data"].(map[string]interface{})[".dockerconfigjson"]; !ok {
 		t.Fatalf("no .dockerconfigjson data key in the secret yaml: %v", string(dockerConfigJsonSecretYamlBytes))
 	} else if dockerConfigJsonEncryptedBytes, err := base64.StdEncoding.DecodeString(dockerConfigJsonBytesBase64.(string)); err != nil {
 		t.Fatalf("error decoding dockerConfigJsonBytes from base64: %v", err)
@@ -45,14 +45,14 @@ func TestDockerConfigJsonSecret(t *testing.T) {
 		t.Fatalf("error decrypting dockerConfigJsonBytes: %v", err)
 	} else if err := json.Unmarshal(dockerConfigJsonBytes, &dockerConfigJsonMap); err != nil {
 		t.Fatalf("error unmarshalling dockerConfigJson from json: %v", err)
-	} else if dockerConfigJson, ok := dockerConfigJsonMap["auths"].(map[string]interface {})[dockerConfigJsonSecret.Uri]; !ok {
+	} else if dockerConfigJson, ok := dockerConfigJsonMap["auths"].(map[string]interface{})[dockerConfigJsonSecret.Uri]; !ok {
 		t.Fatalf("dockerConfigJson map does not contain data for the registry: %v", dockerConfigJsonSecret.Uri)
-	} else if dockerConfigJson.(map[string]interface {})["username"] != dockerConfigJsonSecret.Username ||
-		dockerConfigJson.(map[string]interface {})["password"] != dockerConfigJsonSecret.Password ||
-		dockerConfigJson.(map[string]interface {})["email"] != dockerConfigJsonSecret.Email {
+	} else if dockerConfigJson.(map[string]interface{})["username"] != dockerConfigJsonSecret.Username ||
+		dockerConfigJson.(map[string]interface{})["password"] != dockerConfigJsonSecret.Password ||
+		dockerConfigJson.(map[string]interface{})["email"] != dockerConfigJsonSecret.Email {
 		t.Fatal("dockerConfigJson map does not contain expected values")
 	} else {
-		authBase64 := dockerConfigJson.(map[string]interface {})["auth"]
+		authBase64 := dockerConfigJson.(map[string]interface{})["auth"]
 		if auth, err := base64.StdEncoding.DecodeString(authBase64.(string)); err != nil {
 			t.Fatal("error base64 decoding auth value")
 		} else if string(auth) != fmt.Sprintf("%s:%s", dockerConfigJsonSecret.Username, dockerConfigJsonSecret.Password) {
--- a/pkg/api/preflight_apis.go
+++ b/pkg/api/preflight_apis.go
@@ -17,9 +17,8 @@ type PreflightConfig struct {
 }

 type PreflightSpec struct {
-	MinK8sVersion   string            `json:"minK8sVersion,omitempty" yaml:"minK8sVersion,omitempty"`
-	MinMongoVersion string            `json:"minMongoVersion,omitempty" yaml:"minMongoVersion,omitempty"`
-	Images          map[string]string `json:"images,omitempty" yaml:"images,omitempty"`
+	MinK8sVersion string            `json:"minK8sVersion,omitempty" yaml:"minK8sVersion,omitempty"`
+	Images        map[string]string `json:"images,omitempty" yaml:"images,omitempty"`
 }

 //NewPreflightConfigEmpty create empty PreflightConfig object
@@ -75,13 +74,6 @@ func (p *PreflightConfig) AddMinK8sV(version string) {
 	p.Spec.MinK8sVersion = version
 }

-func (p *PreflightConfig) AddMinMongoV(version string) {
-	if p.Spec == nil {
-		p.Spec = &PreflightSpec{}
-	}
-	p.Spec.MinMongoVersion = version
-}
-
 func (p *PreflightConfig) AddImage(imageFor, imageName string) {
 	if p.Spec.Images == nil {
 		p.Spec.Images = make(map[string]string)
@@ -109,11 +101,6 @@ func (p *PreflightConfig) GetImageName(imageFor string, accountForImageRegistry
 func (p *PreflightConfig) GetMinK8sVersion() string {
 	return p.Spec.MinK8sVersion
 }
-
-func (p *PreflightConfig) GetMinMongoVersion() string {
-	return p.Spec.MinMongoVersion
-}
-
 func (p *PreflightConfig) IsExistOnDisk() bool {
 	if _, err := os.Lstat(p.GetConfigFilePath()); err != nil {
 		return false
@@ -130,9 +117,8 @@ func (p *PreflightConfig) Initialize() error {
 		return nil
 	}
 	p.AddMinK8sV("1.15")
-	p.AddMinMongoV("3.6")
 	p.AddImage("nginx", "nginx")
 	p.AddImage("netcat", "subfuzion/netcat")
-	p.AddImage("preflight-mongo", "qlik-docker-oss.bintray.io/preflight-mongo")
+	p.AddImage("mongo", "mongo")
 	return p.Write()
 }
--- a/pkg/api/utils.go
+++ b/pkg/api/utils.go
@@ -23,7 +23,7 @@ func checkExists(filename string) os.FileInfo {
 	if os.IsNotExist(err) {
 		return nil
 	}
-	LogDebugMessage("File exists\n")
+	LogDebugMessage("File exists")
 	return info
 }

@@ -73,7 +73,7 @@ func ProcessConfigArgs(args []string, base64Encoded bool) ([]*ServiceKeyValue, e
 	resultSvcKV := make([]*ServiceKeyValue, len(args))
 	// qliksense.mongodb=somethig
 	for i, arg := range args {
-		LogDebugMessage("Arg received: %s\n", arg)
+		LogDebugMessage("Arg received: %s", arg)
 		first := strings.SplitN(arg, "=", 2)
 		if len(first) != 2 {
 			return nil, notValidErr
--- a/pkg/preflight/mongo_check.go
+++ b/pkg/preflight/mongo_check.go
@@ -3,12 +3,8 @@ package preflight
 import (
 	"fmt"
 	"io/ioutil"
-	"os"
-	"path/filepath"
 	"strings"

-	"github.com/Masterminds/semver/v3"
-	"github.com/pkg/errors"
 	"github.com/qlik-oss/sense-installer/pkg/api"
 	qapi "github.com/qlik-oss/sense-installer/pkg/api"
 	apiv1 "k8s.io/api/core/v1"
@@ -16,8 +12,7 @@ import (
 )

 const (
-	preflight_mongo = "preflight-mongo"
-	caCertMountPath = "/etc/ssl/certs/ca-certificates.crt"
+	mongo = "mongo"
 )

 func (qp *QliksensePreflight) CheckMongo(kubeConfigContents []byte, namespace string, preflightOpts *PreflightOptions, cleanup bool) error {
@@ -25,51 +20,32 @@ func (qp *QliksensePreflight) CheckMongo(kubeConfigContents []byte, namespace st
 		qp.P.LogVerboseMessage("Preflight mongodb check: \n")
 		qp.P.LogVerboseMessage("------------------------ \n")
 	}
-	var currentCR *qapi.QliksenseCR
-	var err error
-	qConfig := qapi.NewQConfig(qp.Q.QliksenseHome)
-	qConfig.SetNamespace(namespace)
-	currentCR, err = qConfig.GetCurrentCR()
-	if err != nil {
-		qp.P.LogVerboseMessage("Unable to retrieve current CR: %v\n", err)
-		return err
-	}
-	decryptedCR, err := qConfig.GetDecryptedCr(currentCR)
-	if err != nil {
-		qp.P.LogVerboseMessage("An error occurred while retrieving mongodbUrl from current CR: %v\n", err)
-		return err
-	}
-	if preflightOpts.MongoOptions.MongodbUrl == "" && !cleanup {
+	if preflightOpts != nil && preflightOpts.MongoOptions.MongodbUrl == "" && !cleanup {
 		// infer mongoDbUrl from currentCR
 		qp.P.LogVerboseMessage("MongoDbUri is empty, infer from CR\n")
-		preflightOpts.MongoOptions.MongodbUrl = strings.TrimSpace(decryptedCR.Spec.GetFromSecrets("qliksense", "mongoDbUri"))
-	}
+		qConfig := qapi.NewQConfig(qp.Q.QliksenseHome)
+		var currentCR *qapi.QliksenseCR

-	if preflightOpts.MongoOptions.CaCertFile == "" && !cleanup {
-		caCertStr := decryptedCR.Spec.GetFromSecrets("qliksense", "caCertificates")
-		tmpDir := os.TempDir()
-		caCrtFile := filepath.Join(tmpDir, "rootCA.crt")
-		api.LogDebugMessage("received ca crt: %s\n", caCertStr)
-		if err := ioutil.WriteFile(caCrtFile, []byte(caCertStr), 0644); err != nil {
-			return fmt.Errorf("unable to write CA crt to file: %v", err)
+		var err error
+		qConfig.SetNamespace(namespace)
+		currentCR, err = qConfig.GetCurrentCR()
+		if err != nil {
+			qp.P.LogVerboseMessage("Unable to retrieve current CR: %v\n", err)
+			return err
 		}
-		preflightOpts.MongoOptions.CaCertFile = caCrtFile
+		decryptedCR, err := qConfig.GetDecryptedCr(currentCR)
+		if err != nil {
+			qp.P.LogVerboseMessage("An error occurred while retrieving mongodbUrl from current CR: %v\n", err)
+			return err
+		}
+		preflightOpts.MongoOptions.MongodbUrl = decryptedCR.Spec.GetFromSecrets("qliksense", "mongoDbUri")
 	}
-
 	if !cleanup {
 		qp.P.LogVerboseMessage("MongodbUrl: %s\n", preflightOpts.MongoOptions.MongodbUrl)
-
-		// if mongoDbUrl is empty, abort check
-		if preflightOpts.MongoOptions.MongodbUrl == "" {
-			qp.P.LogVerboseMessage("Mongodb Url is empty, hence aborting preflight check\n")
-			return errors.New("MongoDbUrl is empty")
-		}
 	}
-
 	if err := qp.mongoConnCheck(kubeConfigContents, namespace, preflightOpts, cleanup); err != nil {
 		return err
 	}
-
 	if !cleanup {
 		qp.P.LogVerboseMessage("Completed preflight mongodb check\n")
 	}
@@ -77,7 +53,8 @@ func (qp *QliksensePreflight) CheckMongo(kubeConfigContents []byte, namespace st
 }

 func (qp *QliksensePreflight) mongoConnCheck(kubeConfigContents []byte, namespace string, preflightOpts *PreflightOptions, cleanup bool) error {
-	caCertSecretName := "ca-certificates-crt"
+	caCertSecretName := "preflight-mongo-test-cacert"
+	clientCertSecretName := "preflight-mongo-test-clientcert"
 	mongoPodName := "pf-mongo-pod"
 	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
 	if err != nil {
@@ -86,11 +63,11 @@ func (qp *QliksensePreflight) mongoConnCheck(kubeConfigContents []byte, namespac
 	}

 	// cleanup before starting check
-	qp.runMongoCleanup(clientset, namespace, mongoPodName, caCertSecretName)
+	qp.runMongoCleanup(clientset, namespace, mongoPodName, caCertSecretName, clientCertSecretName)
 	if cleanup {
 		return nil
 	}
-	secrets := map[string]string{}
+	var secrets []string
 	if preflightOpts.MongoOptions.CaCertFile != "" {
 		caCertSecret, err := qp.createSecret(clientset, namespace, preflightOpts.MongoOptions.CaCertFile, caCertSecretName)
 		if err != nil {
@@ -99,19 +76,52 @@ func (qp *QliksensePreflight) mongoConnCheck(kubeConfigContents []byte, namespac
 		}

 		defer qp.deleteK8sSecret(clientset, namespace, caCertSecret.Name)
-		secrets[caCertSecretName] = caCertMountPath
+		secrets = append(secrets, caCertSecretName)
+	}
+	if preflightOpts.MongoOptions.ClientCertFile != "" {
+		clientCertSecret, err := qp.createSecret(clientset, namespace, preflightOpts.MongoOptions.ClientCertFile, clientCertSecretName)
+		if err != nil {
+			err = fmt.Errorf("unable to create a client cert kubernetes secret: %v\n", err)
+			return err
+		}
+
+		defer qp.deleteK8sSecret(clientset, namespace, clientCertSecret.Name)
+		secrets = append(secrets, clientCertSecretName)
 	}

-	commandToRun := []string{"./preflight-mongo", fmt.Sprintf(`-url="%s"`, preflightOpts.MongoOptions.MongodbUrl)}
+	mongoCommand := strings.Builder{}
+	mongoCommand.WriteString(fmt.Sprintf("sleep 10;mongo %s", preflightOpts.MongoOptions.MongodbUrl))
+	if preflightOpts.MongoOptions.Username != "" {
+		mongoCommand.WriteString(fmt.Sprintf(" --username %s", preflightOpts.MongoOptions.Username))
+		api.LogDebugMessage("Adding username: Mongo command: %s\n", mongoCommand.String())
+	}
+	if preflightOpts.MongoOptions.Password != "" {
+		mongoCommand.WriteString(fmt.Sprintf(" --password %s", preflightOpts.MongoOptions.Password))
+		api.LogDebugMessage("Adding username and password\n")
+	}
+	if preflightOpts.MongoOptions.Tls || preflightOpts.MongoOptions.CaCertFile != "" || preflightOpts.MongoOptions.ClientCertFile != "" {
+		mongoCommand.WriteString(" --tls")
+		api.LogDebugMessage("Adding --tls: Mongo command: %s\n", mongoCommand.String())
+	}
+	if preflightOpts.MongoOptions.CaCertFile != "" {
+		mongoCommand.WriteString(fmt.Sprintf(" --tlsCAFile=/etc/ssl/%s/%[1]s", caCertSecretName))
+		api.LogDebugMessage("Adding caCertFile:  Mongo command: %s\n", mongoCommand.String())
+	}
+	if preflightOpts.MongoOptions.ClientCertFile != "" {
+		mongoCommand.WriteString(fmt.Sprintf(" --tlsCertificateKeyFile=/etc/ssl/%s/%[1]s", clientCertSecretName))
+		api.LogDebugMessage("Adding clientCertFile:  Mongo command: %s\n", mongoCommand.String())
+	}
+	mongoCommand.WriteString(` --eval "print(\"connected to mongo\")"`)
+
+	commandToRun := []string{"sh", "-c", mongoCommand.String()}
 	api.LogDebugMessage("Mongo command: %s\n", strings.Join(commandToRun, " "))

 	// create a pod
-	imageName, err := qp.GetPreflightConfigObj().GetImageName(preflight_mongo, true)
+	imageName, err := qp.GetPreflightConfigObj().GetImageName(mongo, true)
 	if err != nil {
 		err = fmt.Errorf("unable to retrieve image : %v\n", err)
 		return err
 	}
-	api.LogDebugMessage("image name to be used: %s\n", imageName)
 	mongoPod, err := qp.createPreflightTestPod(clientset, namespace, mongoPodName, imageName, secrets, commandToRun)
 	if err != nil {
 		err = fmt.Errorf("unable to create pod : %v\n", err)
@@ -133,14 +143,7 @@ func (qp *QliksensePreflight) mongoConnCheck(kubeConfigContents []byte, namespac
 		return err
 	}

-	// check mongo server version
-	ok, err := qp.checkMongoVersion(logStr)
-	if !ok || err != nil {
-		return err
-	}
-
-	// check if connection succeeded
-	stringToCheck := "qlik - connection succeeded!!"
+	stringToCheck := "Implicit session:"
 	if strings.Contains(logStr, stringToCheck) {
 		qp.P.LogVerboseMessage("Preflight mongo check: PASSED\n")
 	} else {
@@ -150,43 +153,6 @@ func (qp *QliksensePreflight) mongoConnCheck(kubeConfigContents []byte, namespac
 	return nil
 }

-func (qp *QliksensePreflight) checkMongoVersion(logStr string) (bool, error) {
-	// check mongo server version
-	api.LogDebugMessage("Minimum required mongo version: %s\n", qp.GetPreflightConfigObj().GetMinMongoVersion())
-	mongoVersionStrToCheck := "qlik mongo server version:"
-	if strings.Contains(logStr, mongoVersionStrToCheck) {
-		logLines := strings.Split(logStr, "\n")
-		for _, eachline := range logLines {
-			if strings.Contains(eachline, mongoVersionStrToCheck) {
-				mongoVersionLog := strings.Split(eachline, ":")
-				if len(mongoVersionLog) < 2 {
-					continue
-				}
-				mongoVersionStr := strings.ReplaceAll(strings.TrimSpace(mongoVersionLog[1]), `"`, "")
-				api.LogDebugMessage("Extracted mongo version from pod log: %s\n", mongoVersionStr)
-				currentMongoVersionSemver, err := semver.NewVersion(mongoVersionStr)
-				if err != nil {
-					err = fmt.Errorf("Unable to convert minimum mongo version into semver version:%v\n", err)
-					return false, err
-				}
-				minMongoVersionSemver, err := semver.NewVersion(qp.GetPreflightConfigObj().GetMinMongoVersion())
-				if err != nil {
-					err = fmt.Errorf("Unable to convert required minimum mongo version into semver version:%v\n", err)
-					return false, err
-				}
-				if currentMongoVersionSemver.GreaterThan(minMongoVersionSemver) || currentMongoVersionSemver.Equal(minMongoVersionSemver) {
-					qp.P.LogVerboseMessage("Current mongodb server version %s is greater than or equal to minimum required mongodb version: %s\n", currentMongoVersionSemver, minMongoVersionSemver)
-					return true, nil
-				}
-				err = fmt.Errorf("Current mongodb server version %s is less than minimum required mongodb version: %s", currentMongoVersionSemver, minMongoVersionSemver)
-				return false, err
-			}
-		}
-	}
-	err := errors.New("Unable to infer mongodb server version")
-	return false, err
-}
-
 func (qp *QliksensePreflight) createSecret(clientset *kubernetes.Clientset, namespace, certFile, certSecretName string) (*apiv1.Secret, error) {
 	certBytes, err := ioutil.ReadFile(certFile)
 	if err != nil {
@@ -195,13 +161,14 @@ func (qp *QliksensePreflight) createSecret(clientset *kubernetes.Clientset, name

 	certSecret, err := qp.createPreflightTestSecret(clientset, namespace, certSecretName, certBytes)
 	if err != nil {
-		err = fmt.Errorf("unable to create secret with cert : %v\n", err)
+		err = fmt.Errorf("unable to create secret with ca cert : %v\n", err)
 		return nil, err
 	}
 	return certSecret, nil
 }

-func (qp *QliksensePreflight) runMongoCleanup(clientset *kubernetes.Clientset, namespace, mongoPodName, caCertSecretName string) {
+func (qp *QliksensePreflight) runMongoCleanup(clientset *kubernetes.Clientset, namespace, mongoPodName, caCertSecretName, clientCertSecretName string) {
 	qp.deletePod(clientset, namespace, mongoPodName)
 	qp.deleteK8sSecret(clientset, namespace, caCertSecretName)
+	qp.deleteK8sSecret(clientset, namespace, clientCertSecretName)
 }
--- a/pkg/preflight/preflight_utils.go
+++ b/pkg/preflight/preflight_utils.go
@@ -12,6 +12,7 @@ import (
 	"time"

 	"github.com/mitchellh/go-homedir"
+	"github.com/pkg/errors"
 	"github.com/qlik-oss/sense-installer/pkg/api"
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
 	appsv1 "k8s.io/api/apps/v1"
@@ -39,8 +40,12 @@ func (p *PreflightOptions) LogVerboseMessage(strMessage string, args ...interfac
 }

 type MongoOptions struct {
-	MongodbUrl string
-	CaCertFile string
+	MongodbUrl     string
+	Username       string
+	Password       string
+	CaCertFile     string
+	ClientCertFile string
+	Tls            bool
 }

 var gracePeriod int64 = 0
@@ -110,13 +115,13 @@ func getK8SClientSet(kubeconfig []byte, contextName string) (*kubernetes.Clients
 	if len(kubeconfig) == 0 {
 		clientConfig, err = rest.InClusterConfig()
 		if err != nil {
-			err = fmt.Errorf("Unable to load in-cluster kubeconfig: %w", err)
+			err = errors.Wrap(err, "Unable to load in-cluster kubeconfig")
 			return nil, nil, err
 		}
 	} else {
 		config, err := clientcmd.Load(kubeconfig)
 		if err != nil {
-			err = fmt.Errorf("Unable to load kubeconfig: %w", err)
+			err = errors.Wrap(err, "Unable to load kubeconfig")
 			return nil, nil, err
 		}
 		if contextName != "" {
@@ -124,13 +129,13 @@ func getK8SClientSet(kubeconfig []byte, contextName string) (*kubernetes.Clients
 		}
 		clientConfig, err = clientcmd.NewDefaultClientConfig(*config, &clientcmd.ConfigOverrides{}).ClientConfig()
 		if err != nil {
-			err = fmt.Errorf("Unable to create client config from config: %w", err)
+			err = errors.Wrap(err, "Unable to create client config from config")
 			return nil, nil, err
 		}
 	}
 	clientset, err := kubernetes.NewForConfig(clientConfig)
 	if err != nil {
-		err = fmt.Errorf("Unable to create clientset: %w", err)
+		err = errors.Wrap(err, "Unable to create clientset")
 		return nil, nil, err
 	}
 	return clientset, clientConfig, nil
@@ -181,7 +186,7 @@ func (qp *QliksensePreflight) createPreflightTestDeployment(clientset *kubernete
 		result, err = deploymentsClient.Create(deployment)
 		return err
 	}); err != nil {
-		err = fmt.Errorf("unable to create deployments in the %s namespace: %w", namespace, err)
+		err = errors.Wrapf(err, "unable to create deployments in the %s namespace", namespace)
 		return nil, err
 	}
 	qp.P.LogVerboseMessage("Created deployment %q\n", result.GetObjectMeta().GetName())
@@ -196,7 +201,7 @@ func getDeployment(clientset *kubernetes.Clientset, namespace, depName string) (
 		deployment, err = deploymentsClient.Get(depName, v1.GetOptions{})
 		return err
 	}); err != nil {
-		err = fmt.Errorf("unable to get deployments in the %s namespace: %w", namespace, err)
+		err = errors.Wrapf(err, "unable to get deployments in the %s namespace", namespace)
 		api.LogDebugMessage("%v\n", err)
 		return nil, err
 	}
@@ -266,7 +271,7 @@ func getService(clientset *kubernetes.Clientset, namespace, svcName string) (*ap
 		svc, err = servicesClient.Get(svcName, v1.GetOptions{})
 		return err
 	}); err != nil {
-		err = fmt.Errorf("unable to get services in the %s namespace: %w", namespace, err)
+		err = errors.Wrapf(err, "unable to get services in the %s namespace", namespace)
 		return nil, err
 	}

@@ -309,7 +314,7 @@ func (qp *QliksensePreflight) deletePod(clientset *kubernetes.Clientset, namespa
 	return nil
 }

-func (qp *QliksensePreflight) createPreflightTestPod(clientset *kubernetes.Clientset, namespace, podName, imageName string, secretNames map[string]string, commandToRun []string) (*apiv1.Pod, error) {
+func (qp *QliksensePreflight) createPreflightTestPod(clientset *kubernetes.Clientset, namespace, podName, imageName string, secretNames []string, commandToRun []string) (*apiv1.Pod, error) {
 	// build the pod definition we want to deploy
 	pod := &apiv1.Pod{
 		ObjectMeta: v1.ObjectMeta{
@@ -332,7 +337,7 @@ func (qp *QliksensePreflight) createPreflightTestPod(clientset *kubernetes.Clien
 		},
 	}
 	if len(secretNames) > 0 {
-		for secretName, mountPath := range secretNames {
+		for _, secretName := range secretNames {
 			pod.Spec.Volumes = append(pod.Spec.Volumes, apiv1.Volume{
 				Name: secretName,
 				VolumeSource: apiv1.VolumeSource{
@@ -341,7 +346,7 @@ func (qp *QliksensePreflight) createPreflightTestPod(clientset *kubernetes.Clien
 						Items: []apiv1.KeyToPath{
 							{
 								Key:  secretName,
-								Path: filepath.Base(mountPath),
+								Path: secretName,
 							},
 						},
 					},
@@ -350,7 +355,7 @@ func (qp *QliksensePreflight) createPreflightTestPod(clientset *kubernetes.Clien
 			if len(pod.Spec.Containers) > 0 {
 				pod.Spec.Containers[0].VolumeMounts = append(pod.Spec.Containers[0].VolumeMounts, apiv1.VolumeMount{
 					Name:      secretName,
-					MountPath: filepath.Dir(mountPath),
+					MountPath: "/etc/ssl/" + secretName,
 					ReadOnly:  true,
 				})
 			}
@@ -465,13 +470,13 @@ func waitForPod(clientset *kubernetes.Clientset, namespace string, pod *apiv1.Po
 	}
 	validateFunc := func(data interface{}) bool {
 		po := data.(*apiv1.Pod)
-		return po.Status.Phase == apiv1.PodRunning || po.Status.Phase == apiv1.PodSucceeded || po.Status.Phase == apiv1.PodFailed
+		return len(po.Status.ContainerStatuses) > 0 && po.Status.ContainerStatuses[0].Ready
 	}

 	if err := waitForResource(checkFunc, validateFunc); err != nil {
 		return err
 	}
-	if pod.Status.Phase != apiv1.PodRunning && pod.Status.Phase != apiv1.PodSucceeded && pod.Status.Phase != apiv1.PodFailed {
+	if len(pod.Status.ContainerStatuses) == 0 || !pod.Status.ContainerStatuses[0].Ready {
 		err = fmt.Errorf("container is taking much longer than expected")
 		return err
 	}
@@ -486,6 +491,7 @@ func waitForPodToDie(clientset *kubernetes.Clientset, namespace string, pod *api
 			err = fmt.Errorf("unable to retrieve %s pod by name", podName)
 			return nil, err
 		}
+		api.LogDebugMessage("pod status: %v\n", po.Status.Phase)
 		return po, nil
 	}
 	validateFunc := func(r interface{}) bool {
--- a/pkg/qliksense/context_configs.go
+++ b/pkg/qliksense/context_configs.go
@@ -18,12 +18,12 @@ import (

 	b64 "encoding/base64"

-	. "github.com/logrusorgru/aurora"
 	ansi "github.com/mattn/go-colorable"
 	"github.com/qlik-oss/sense-installer/pkg/api"
 	_ "gopkg.in/yaml.v2"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	. "github.com/logrusorgru/aurora"
 )

 const (
@@ -62,7 +62,7 @@ func (q *Qliksense) SetSecrets(args []string, isSecretSet bool, base64Encoded bo
 	}

 	// Metadata name in qliksense CR is the name of the current context
-	api.LogDebugMessage("Current context: %s\n", qliksenseCR.GetName())
+	api.LogDebugMessage("Current context: %s", qliksenseCR.GetName())
 	encryptionKey, err := qConfig.GetEncryptionKeyForCurrent()
 	if err != nil {
 		return err
@@ -72,7 +72,7 @@ func (q *Qliksense) SetSecrets(args []string, isSecretSet bool, base64Encoded bo
 		return err
 	}
 	for _, ra := range resultArgs {
-		api.LogDebugMessage("value args to be encrypted: %s\n", ra.Value)
+		api.LogDebugMessage("value args to be encrypted: %s", ra.Value)
 		if err := q.processSecret(ra, encryptionKey, qliksenseCR, isSecretSet); err != nil {
 			return err
 		}
@@ -213,8 +213,8 @@ func validateCR(key string, keySub string, value string, crSpec *api.QliksenseCR
 			}
 		} else {
 			switch key {
-			case "opsrunner":
-				crSpec.Spec.OpsRunner = &config.OpsRunner{}
+			case "gitops":
+				crSpec.Spec.GitOps = &config.GitOps{}
 			case "git":
 				crSpec.Spec.Git = &config.Repo{}
 			}
@@ -248,8 +248,8 @@ func (q *Qliksense) SetOtherConfigs(args []string) error {
 			if err := q.processSetGit(arg, qliksenseCR); err != nil {
 				return err
 			}
-		} else if strings.HasPrefix(arg, "opsRunner.") {
-			if err := q.processSetOpsRunner(arg, qliksenseCR); err != nil {
+		} else if strings.HasPrefix(arg, "gitOps.") {
+			if err := q.processSetGitOps(arg, qliksenseCR); err != nil {
 				return err
 			}
 		} else {
@@ -337,29 +337,27 @@ func (q *Qliksense) processSetGit(arg string, cr *api.QliksenseCR) error {
 	return nil
 }

-func (q *Qliksense) processSetOpsRunner(arg string, cr *api.QliksenseCR) error {
+func (q *Qliksense) processSetGitOps(arg string, cr *api.QliksenseCR) error {
 	args := strings.Split(arg, "=")
 	subs := strings.Split(args[0], ".")
-	if cr.Spec.OpsRunner == nil {
-		cr.Spec.OpsRunner = &config.OpsRunner{}
+	if cr.Spec.Git == nil {
+		cr.Spec.GitOps = &config.GitOps{}
 	}
 	switch subs[1] {
 	case "enabled":
 		if args[1] != "yes" && args[1] != "no" {
 			return errors.New("Please use yes or no for key enabled")
 		}
-		cr.Spec.OpsRunner.Enabled = args[1]
+		cr.Spec.GitOps.Enabled = args[1]
 	case "schedule":
 		if _, err := cron.ParseStandard(args[1]); err != nil {
 			return errors.New("Please enter string with standard cron scheduling syntax ")
 		}
-		cr.Spec.OpsRunner.Schedule = args[1]
+		cr.Spec.GitOps.Schedule = args[1]
 	case "watchBranch":
-		cr.Spec.OpsRunner.WatchBranch = args[1]
+		cr.Spec.GitOps.WatchBranch = args[1]
 	case "image":
-		cr.Spec.OpsRunner.Image = args[1]
-	case "crPvc":
-		cr.Spec.OpsRunner.CrPvc = args[1]
+		cr.Spec.GitOps.Image = args[1]
 	default:
 		return errors.New(arg + " does not match any cr spec")
 	}
@@ -413,7 +411,7 @@ func (q *Qliksense) DeleteContextConfig(args []string, flag bool) error {
 		out := ansi.NewColorableStdout()
 		switch args[0] {
 		case qliksenseConfig.Spec.CurrentContext:
-			fmt.Fprintln(out, Yellow("Please switch contexts to be able to delete this context."))
+			fmt.Fprintln(out,Yellow("Please switch contexts to be able to delete this context."))
 			err := fmt.Errorf(Red("Cannot delete current context - %s").String(), White(Bold(qliksenseConfig.Spec.CurrentContext)))
 			return err
 		case DefaultQliksenseContext:
@@ -454,7 +452,7 @@ func (q *Qliksense) DeleteContextConfig(args []string, flag bool) error {
 						if ans == true {
 							api.WriteToFile(&qliksenseConfig, qliksenseConfigFile)
 							fmt.Fprintln(out, Yellow(Underline("Warning: Active resources may still be running in-cluster")))
-							fmt.Fprintln(out, Green("Successfully deleted context: "), Bold(args[0]))
+							fmt.Fprintln(out, Green("Successfully deleted context: "),Bold(args[0]))
 						} else {
 							return nil
 						}
--- a/pkg/qliksense/context_configs_test.go
+++ b/pkg/qliksense/context_configs_test.go
@@ -244,7 +244,7 @@ func TestSetOtherConfigs(t *testing.T) {
 				q: &Qliksense{
 					QliksenseHome: testDir,
 				},
-				args: []string{"profile=minikube", "rotateKeys=yes", "storageClassName=efs", "opsRunner.enabled=yes", "opsRunner.schedule=30 * * * *", "git.repository=master", "git.userName=foo", "git.accessToken=1234"},
+				args: []string{"profile=minikube", "rotateKeys=yes", "storageClassName=efs", "gitOps.enabled=yes", "gitOps.schedule=30 * * * *", "git.repository=master", "git.userName=foo", "git.accessToken=1234"},
 			},
 			wantErr: false,
 		},
@@ -254,7 +254,7 @@ func TestSetOtherConfigs(t *testing.T) {
 				q: &Qliksense{
 					QliksenseHome: testDir,
 				},
-				args: []string{"someconfig=somevalue, opsRunner.schedule=bar", "opsRunner.enabled=bar", "git.foo=bar", "rotateKeys=bar"},
+				args: []string{"someconfig=somevalue, gitOps.schedule=bar", "gitOps.enabled=bar", "git.foo=bar", "rotateKeys=bar"},
 			},
 			wantErr: true,
 		},
--- a/pkg/qliksense/context_configs_unset.go
+++ b/pkg/qliksense/context_configs_unset.go
@@ -1,109 +0,0 @@
-package qliksense
-
-import (
-	"fmt"
-	"strings"
-
-	"reflect"
-
-	kconfig "github.com/qlik-oss/k-apis/pkg/config"
-	"github.com/qlik-oss/sense-installer/pkg/api"
-)
-
-func (q *Qliksense) UnsetCmd(args []string) error {
-	return unsetAll(q.QliksenseHome, args)
-}
-func unsetAll(qHome string, args []string) error {
-	qConfig := api.NewQConfig(qHome)
-
-	qcr, err := qConfig.GetCurrentCR()
-	if err != nil {
-		return err
-	}
-
-	// either delete all args or none
-	for _, arg := range args {
-		isRemoved := false
-		// delete if key present
-		if !strings.Contains(arg, ".") {
-			if isRemoved = unsetOnlyKey(arg, qcr); isRemoved {
-				//continue to the next arg
-				continue
-			} else if isRemoved = unsetServiceName(arg, qcr); isRemoved {
-				//continue to the next arg
-				continue
-			} else {
-				return fmt.Errorf("%s not found in the context", arg)
-			}
-		}
-		// delete key inside configs if present
-		// delete key inside secrets if present
-		if isRemoved = unsetServiceKey(arg, qcr); !isRemoved {
-			return fmt.Errorf("%s not found in the context", arg)
-		}
-	}
-
-	return qConfig.WriteCR(qcr)
-}
-func unsetOnlyKey(key string, qcr *api.QliksenseCR) bool {
-
-	v := reflect.ValueOf(qcr.Spec).Elem().FieldByName(strings.Title(key))
-	if v.IsValid() && v.CanSet() {
-		v.SetString("")
-		return true
-	}
-	return false
-}
-
-func unsetServiceName(svc string, qcr *api.QliksenseCR) bool {
-	if qcr.Spec.Configs != nil && qcr.Spec.Configs[svc] != nil {
-		delete(qcr.Spec.Configs, svc)
-		return true
-	}
-
-	if qcr.Spec.Secrets != nil && qcr.Spec.Secrets[svc] != nil {
-		delete(qcr.Spec.Secrets, svc)
-		return true
-	}
-	return false
-}
-
-func unsetServiceKey(svcKey string, qcr *api.QliksenseCR) bool {
-	sk := strings.Split(svcKey, ".")
-	svc := sk[0]
-	key := sk[1]
-
-	if qcr.Spec.Configs != nil && qcr.Spec.Configs[svc] != nil {
-		index := findIndex(key, qcr.Spec.Configs[svc])
-		if index > -1 {
-			qcr.Spec.Configs[svc][index] = qcr.Spec.Configs[svc][len(qcr.Spec.Configs[svc])-1]
-			qcr.Spec.Configs[svc] = qcr.Spec.Configs[svc][:len(qcr.Spec.Configs[svc])-1]
-			if len(qcr.Spec.Configs[svc]) == 0 {
-				delete(qcr.Spec.Configs, svc)
-			}
-			return true
-		}
-	}
-
-	if qcr.Spec.Secrets != nil && qcr.Spec.Secrets[svc] != nil {
-		index := findIndex(key, qcr.Spec.Secrets[svc])
-		if index > -1 {
-			qcr.Spec.Secrets[svc][index] = qcr.Spec.Secrets[svc][len(qcr.Spec.Secrets[svc])-1]
-			qcr.Spec.Secrets[svc] = qcr.Spec.Secrets[svc][:len(qcr.Spec.Secrets[svc])-1]
-			if len(qcr.Spec.Secrets[svc]) == 0 {
-				delete(qcr.Spec.Secrets, svc)
-			}
-			return true
-		}
-	}
-	return false
-}
-
-func findIndex(elem string, nvs kconfig.NameValues) int {
-	for i, nv := range nvs {
-		if nv.Name == elem {
-			return i
-		}
-	}
-	return -1
-}
--- a/pkg/qliksense/context_configs_unset_test.go
+++ b/pkg/qliksense/context_configs_unset_test.go
@@ -1,99 +0,0 @@
-package qliksense
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/qlik-oss/sense-installer/pkg/api"
-	_ "gopkg.in/yaml.v2"
-)
-
-func TestUnsetAll(t *testing.T) {
-	qHome, _ := ioutil.TempDir("", "")
-	testPepareDir(qHome)
-	defer os.RemoveAll(qHome)
-	//fmt.Print(qHome)
-	args := []string{"rotateKeys", "qliksense", "qliksense2.acceptEula3", "serviceA.acceptEula"}
-	if err := unsetAll(qHome, args); err != nil {
-		t.Log("error during unset", err)
-		t.FailNow()
-	}
-	qc := api.NewQConfig(qHome)
-	qcr, err := qc.GetCurrentCR()
-	if err != nil {
-		t.Log("error while getting current cr", err)
-		t.FailNow()
-	}
-	if qcr.Spec.RotateKeys != "" {
-		t.Log("Expected empty rotateKeys but got: " + qcr.Spec.RotateKeys)
-		t.Fail()
-	}
-
-	if qcr.Spec.Configs["qliksense"] != nil {
-		t.Log("qliksense in configs not deleted")
-		t.Fail()
-	}
-	if len(qcr.Spec.Configs["qliksense2"]) != 1 {
-		t.Log("qliksense2.acceptEula3 not deleted")
-		t.Fail()
-	}
-	if qcr.Spec.Configs["serviceA"] != nil {
-		t.Log("serviceA not deleted")
-		t.Fail()
-	}
-}
-
-func testPepareDir(qHome string) {
-
-	config :=
-		`
-apiVersion: config.qlik.com/v1
-kind: QliksenseConfig
-metadata:
-  name: qliksenseConfig
-spec:
-  contexts:
-  - name: qlik-default
-    crFile: contexts/qlik-default/qlik-default.yaml
-  currentContext: qlik-default
-`
-	configFile := filepath.Join(qHome, "config.yaml")
-	// tests/config.yaml exists
-	ioutil.WriteFile(configFile, []byte(config), 0777)
-
-	contextYaml :=
-		`
-apiVersion: qlik.com/v1
-kind: Qliksense
-metadata:
-  name: qlik-default
-spec:
-  profile: docker-desktop
-  rotateKeys: "yes"
-  configs:
-    qliksense:
-    - name: acceptEula
-      value: some
-    qliksense2:
-    - name: acceptEula2
-      value: some
-    - name: acceptEula3
-      value: some
-    serviceA:
-    - name: acceptEula
-      value: some
-`
-	qlikDefaultContext := "qlik-default"
-	// create contexts/qlik-default/ under tests/
-	contexts := "contexts"
-	contextsDir := filepath.Join(qHome, contexts, qlikDefaultContext)
-	if err := os.MkdirAll(contextsDir, 0777); err != nil {
-		err = fmt.Errorf("Not able to create directories")
-	}
-
-	contextFile := filepath.Join(contextsDir, qlikDefaultContext+".yaml")
-	ioutil.WriteFile(contextFile, []byte(contextYaml), 0777)
-}
--- a/pkg/qliksense/docker.go
+++ b/pkg/qliksense/docker.go
@@ -95,9 +95,9 @@ func (q *Qliksense) PullImagesForCurrentCR() error {
 	return nil
 }

-func (q *Qliksense) appendOpsRunnerImage(images *[]string, qcr *qapi.QliksenseCR) {
-	if qcr.Spec.OpsRunner != nil && qcr.Spec.OpsRunner.Image != "" {
-		*images = append(*images, qcr.Spec.OpsRunner.Image)
+func (q *Qliksense) appendGitOpsImage(images *[]string, qcr *qapi.QliksenseCR) {
+	if qcr.Spec.GitOps != nil && qcr.Spec.GitOps.Image != "" {
+		*images = append(*images, qcr.Spec.GitOps.Image)
 	}
 }

@@ -212,7 +212,7 @@ func (q *Qliksense) appendAdditionalImages(images *[]string, qcr *qapi.Qliksense
 	if err := q.appendOperatorImages(images); err != nil {
 		return err
 	}
-	q.appendOpsRunnerImage(images, qcr)
+	q.appendGitOpsImage(images, qcr)
 	q.appendPreflightImages(images)
 	return nil
 }
--- a/pkg/qliksense/docker_test.go
+++ b/pkg/qliksense/docker_test.go
@@ -186,7 +186,7 @@ kind: Qliksense
 metadata:
  name: qlik-default
 spec:
-  opsRunner:
+  gitOps:
    image: some-gitops-image
 `)

@@ -225,7 +225,7 @@ spec:
 		return false
 	}
 	if !haveMatchingImage(func(image string) bool {
-		return strings.Contains(image, "qlik-docker-oss.bintray.io/qliksense-operator:")
+		return strings.Contains(image, "qlik-docker-oss.bintray.io/qliksense-operator:v")
 	}) {
 		t.Fatal("expected to find the operator image in the list, but it wasn't there")
 	}
@@ -245,7 +245,7 @@ spec:
 		t.Fatal("expected to find the netcat Preflight image in the list, but it wasn't there")
 	}
 	if !haveMatchingImage(func(image string) bool {
-		return image == "qlik-docker-oss.bintray.io/preflight-mongo"
+		return image == "mongo"
 	}) {
 		t.Fatal("expected to find the mongo Preflight image in the list, but it wasn't there")
 	}
--- a/pkg/qliksense/install.go
+++ b/pkg/qliksense/install.go
@@ -53,7 +53,9 @@ func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions, kee
 	}
 	qConfig.WriteCurrentContextCR(qcr)

-	if err := applyImagePullSecret(qConfig); err != nil {
+	//if the docker pull secret exists on disk, install it in the cluster
+	//if it doesn't exist on disk, remove it in the cluster
+	if err := installOrRemoveImagePullSecret(qConfig); err != nil {
 		return err
 	}

@@ -130,13 +132,22 @@ func (q *Qliksense) getProcessedOperatorControllerString(qcr *qapi.QliksenseCR)
 	return operatorControllerString, nil
 }

-func applyImagePullSecret(qConfig *qapi.QliksenseConfig) error {
+func installOrRemoveImagePullSecret(qConfig *qapi.QliksenseConfig) error {
 	if pullDockerConfigJsonSecret, err := qConfig.GetPullDockerConfigJsonSecret(); err == nil {
 		if dockerConfigJsonSecretYaml, err := pullDockerConfigJsonSecret.ToYaml(""); err != nil {
 			return err
 		} else if err := qapi.KubectlApply(string(dockerConfigJsonSecretYaml), ""); err != nil {
 			return err
 		}
+	} else {
+		deleteDockerConfigJsonSecret := qapi.DockerConfigJsonSecret{
+			Name: pullSecretName,
+		}
+		if deleteDockerConfigJsonSecretYaml, err := deleteDockerConfigJsonSecret.ToYaml(""); err != nil {
+			return err
+		} else if err := qapi.KubectlDelete(string(deleteDockerConfigJsonSecretYaml), ""); err != nil {
+			qapi.LogDebugMessage("failed deleting %v, error: %v\n", pullSecretName, err)
+		}
 	}
 	return nil
 }
--- a/pkg/qliksense/kuz_test.go
+++ b/pkg/qliksense/kuz_test.go
@@ -22,7 +22,7 @@ import (
 	"sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"

-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"

 	"github.com/Shopify/ejson"
 	"github.com/qlik-oss/k-apis/pkg/config"
@@ -310,8 +310,8 @@ func Test_executeKustomizeBuild_onQlikConfig_regenerateKeys(t *testing.T) {
 			}
 			break
 		}
-		if resource["kind"].(string) == "Secret" && strings.Contains(resource["metadata"].(map[interface {}]interface {})["name"].(string), "users-secrets-") {
-			keyIdBase64 = resource["data"].(map[interface {}]interface {})["tokenAuthPrivateKeyId"].(string)
+		if resource["kind"].(string) == "Secret" && strings.Contains(resource["metadata"].(map[string]interface{})["name"].(string), "users-secrets-") {
+			keyIdBase64 = resource["data"].(map[string]interface{})["tokenAuthPrivateKeyId"].(string)
 			break
 		}
 	}
Author	SHA1	Message	Date
Ashwathi Shiva	339bb6f44a	minor fixes	2020-04-24 14:35:51 -04:00
Ashwathi Shiva	443092dd2f	tidied up go mod	2020-04-24 14:31:38 -04:00
Ashwathi Shiva	9b633b1088	removing previously used lib for color printing	2020-04-24 14:29:28 -04:00
Ashwathi Shiva	f0110294fc	commit go.mod and go.sum files	2020-04-24 14:23:57 -04:00
Ashwathi Shiva	28372e81c9	Merge branch 'master' into preflight_cleanup_cmd # Conflicts: # cmd/qliksense/preflight.go # pkg/preflight/all_checks.go	2020-04-24 14:23:12 -04:00
Ashwathi Shiva	a8133ed3f7	Added verbose logs in appropriate places	2020-04-24 13:53:05 -04:00
Ashwathi Shiva	f5a9ecd071	preflight clean working	2020-04-24 00:25:32 -04:00
Ashwathi Shiva	3b7db7aae6	Preflight cleanup individual checks working	2020-04-23 16:38:44 -04:00