init

cmd/qliksense/export.go

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"github.com/qlik-oss/sense-installer/pkg/qliksense"
+	"github.com/spf13/cobra"
+)
+
+func exportCmd(q *qliksense.Qliksense) *cobra.Command {
+	filePath := q.QliksenseHome
+	c := &cobra.Command{
+		Use:     "export",
+		Short:   "export files for corresponding context",
+		Long:    `exports all context files in zip format`,
+		Example: `qliksense export <context_name>`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+
+			if len(args) != 0 {
+				context := args[0]
+				return q.ExportContext(context, filePath)
+			}
+			return nil
+		},
+	}
+	f := c.Flags()
+	f.StringVarP(&filePath, "output", "o", "", "Output Directory")
+	return c
+}

cmd/qliksense/preflight.go

@@ -3,26 +3,21 @@ package main
 import (
 	"fmt"
 
-	. "github.com/logrusorgru/aurora"
 	ansi "github.com/mattn/go-colorable"
 	"github.com/qlik-oss/sense-installer/pkg/preflight"
+	. "github.com/logrusorgru/aurora"
 
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
 	"github.com/spf13/cobra"
 )
 
 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
 }
 
@@ -49,7 +44,7 @@ func pfDnsCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 			if namespace == "" {
 				namespace = "default"
 			}
-			if err = qp.CheckDns(namespace, kubeConfigContents, false); err != nil {
+			if err = qp.CheckDns(namespace, kubeConfigContents); err != nil {
 				fmt.Fprintf(out, "%s\n", Red("Preflight DNS check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
@@ -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 {
@@ -163,7 +163,7 @@ func pfDeploymentCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 			if namespace == "" {
 				namespace = "default"
 			}
-			if err = qp.CheckDeployment(namespace, kubeConfigContents, false); err != nil {
+			if err = qp.CheckDeployment(namespace, kubeConfigContents); err != nil {
 				fmt.Fprintf(out, "%s\n", Red("Preflight deployment check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
@@ -202,7 +202,7 @@ func pfServiceCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 			if namespace == "" {
 				namespace = "default"
 			}
-			if err = qp.CheckService(namespace, kubeConfigContents, false); err != nil {
+			if err = qp.CheckService(namespace, kubeConfigContents); err != nil {
 				fmt.Fprintf(out, "%s\n", Red("Preflight service check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
@@ -240,7 +240,7 @@ func pfPodCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 			if namespace == "" {
 				namespace = "default"
 			}
-			if err = qp.CheckPod(namespace, kubeConfigContents, false); err != nil {
+			if err = qp.CheckPod(namespace, kubeConfigContents); err != nil {
 				fmt.Fprintf(out, "%s\n", Red("Preflight pod check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
@@ -275,7 +275,7 @@ func pfCreateRoleCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
-			if err = qp.CheckCreateRole(namespace, false); err != nil {
+			if err = qp.CheckCreateRole(namespace); err != nil {
 				fmt.Fprintf(out, "%s\n", Red("Preflight role check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
@@ -310,7 +310,7 @@ func pfCreateRoleBindingCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
-			if err = qp.CheckCreateRoleBinding(namespace, false); err != nil {
+			if err = qp.CheckCreateRoleBinding(namespace); err != nil {
 				fmt.Fprintf(out, "%s\n", Red("Preflight rolebinding check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
@@ -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 {
@@ -345,7 +345,7 @@ func pfCreateServiceAccountCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
-			if err = qp.CheckCreateServiceAccount(namespace, false); err != nil {
+			if err = qp.CheckCreateServiceAccount(namespace); err != nil {
 				fmt.Fprintf(out, "%s\n", Red("Preflight ServiceAccount check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
@@ -417,7 +417,7 @@ func pfMongoCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 			if namespace == "" {
 				namespace = "default"
 			}
-			if err = qp.CheckMongo(kubeConfigContents, namespace, preflightOpts, false); err != nil {
+			if err = qp.CheckMongo(kubeConfigContents, namespace, preflightOpts); err != nil {
 				fmt.Fprintf(out, "%s\n", Red("Preflight mongo check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
@@ -429,45 +429,10 @@ 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
 }
-
-func pfCleanupCmd(q *qliksense.Qliksense) *cobra.Command {
-	out := ansi.NewColorableStdout()
-	preflightOpts := &preflight.PreflightOptions{
-		MongoOptions: &preflight.MongoOptions{},
-	}
-
-	var pfCleanCmd = &cobra.Command{
-		Use:     "clean",
-		Short:   "perform preflight clean",
-		Long:    `perform preflight clean to ensure that all resources are cleared up in the cluster`,
-		Example: `qliksense preflight clean`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts}
-
-			// Preflight clean
-			namespace, kubeConfigContents, err := preflight.InitPreflight()
-			if err != nil {
-				fmt.Fprintf(out, "%s\n", Red("Preflight cleanup FAILED"))
-				fmt.Printf("Error: %v\n", err)
-				return nil
-			}
-
-			if namespace == "" {
-				namespace = "default"
-			}
-			if err = qp.Cleanup(namespace, kubeConfigContents); err != nil {
-				fmt.Fprintf(out, "%s\n", Red("Preflight cleanup FAILED"))
-				fmt.Printf("Error: %v\n", err)
-				return nil
-			}
-			fmt.Fprintf(out, "%s\n", Green("Preflight cleanup complete"))
-			return nil
-		},
-	}
-	f := pfCleanCmd.Flags()
-	f.BoolVarP(&preflightOpts.Verbose, "verbose", "v", false, "verbose mode")
-	return pfCleanCmd
-}

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)
@@ -195,12 +195,16 @@ 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 uninstall command
 	cmd.AddCommand(uninstallCmd(p))
 
+	// add export command
+	cmd.AddCommand(exportCmd(p))
+
 	// add crds
 	cmd.AddCommand(crdsCmd)
 	crdsCmd.AddCommand(crdsViewCmd(p))
@@ -219,7 +223,6 @@ func rootCmd(p *qliksense.Qliksense) *cobra.Command {
 	preflightCmd.AddCommand(pfCreateRoleBindingCheckCmd(p))
 	preflightCmd.AddCommand(pfCreateServiceAccountCheckCmd(p))
 	preflightCmd.AddCommand(pfCreateAuthCheckCmd(p))
-	preflightCmd.AddCommand(pfCleanupCmd(p))
 
 	cmd.AddCommand(preflightCmd)
 	cmd.AddCommand(loadCrFile(p))

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

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
-
-```
+```

go.mod

@@ -16,7 +16,7 @@ replace (
 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
@@ -34,13 +34,15 @@ require (
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
+
 	github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381
+
 	github.com/mattn/go-colorable v0.1.4
 	github.com/mattn/go-tty v0.0.3
 	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 +53,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

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=
@@ -885,8 +883,6 @@ github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 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/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.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=

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)

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
 }
 

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) {

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()
 }

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

pkg/preflight/all_checks.go

@@ -3,9 +3,9 @@ package preflight
 import (
 	"fmt"
 
-	. "github.com/logrusorgru/aurora"
 	ansi "github.com/mattn/go-colorable"
 	"github.com/pkg/errors"
+	. "github.com/logrusorgru/aurora"
 )
 
 func (qp *QliksensePreflight) RunAllPreflightChecks(kubeConfigContents []byte, namespace string, preflightOpts *PreflightOptions) error {
@@ -24,7 +24,7 @@ func (qp *QliksensePreflight) RunAllPreflightChecks(kubeConfigContents []byte, n
 	totalCount++
 
 	// Preflight deployment check
-	if err := qp.CheckDeployment(namespace, kubeConfigContents, false); err != nil {
+	if err := qp.CheckDeployment(namespace, kubeConfigContents); err != nil {
 		fmt.Fprintf(out, "%s\n", Red("Preflight deployment check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {
@@ -34,7 +34,7 @@ func (qp *QliksensePreflight) RunAllPreflightChecks(kubeConfigContents []byte, n
 	totalCount++
 
 	// Preflight service check
-	if err := qp.CheckService(namespace, kubeConfigContents, false); err != nil {
+	if err := qp.CheckService(namespace, kubeConfigContents); err != nil {
 		fmt.Fprintf(out, "%s\n", Red("Preflight service check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {
@@ -44,7 +44,7 @@ func (qp *QliksensePreflight) RunAllPreflightChecks(kubeConfigContents []byte, n
 	totalCount++
 
 	// Preflight pod check
-	if err := qp.CheckPod(namespace, kubeConfigContents, false); err != nil {
+	if err := qp.CheckPod(namespace, kubeConfigContents); err != nil {
 		fmt.Fprintf(out, "%s\n", Red("Preflight pod check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {
@@ -54,7 +54,7 @@ func (qp *QliksensePreflight) RunAllPreflightChecks(kubeConfigContents []byte, n
 	totalCount++
 
 	// Preflight role check
-	if err := qp.CheckCreateRole(namespace, false); err != nil {
+	if err := qp.CheckCreateRole(namespace); err != nil {
 		fmt.Fprintf(out, "%s\n", Red("Preflight role check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {
@@ -64,7 +64,7 @@ func (qp *QliksensePreflight) RunAllPreflightChecks(kubeConfigContents []byte, n
 	totalCount++
 
 	// Preflight rolebinding check
-	if err := qp.CheckCreateRoleBinding(namespace, false); err != nil {
+	if err := qp.CheckCreateRoleBinding(namespace); err != nil {
 		fmt.Fprintf(out, "%s\n", Red(" Preflight rolebinding check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {
@@ -74,7 +74,7 @@ func (qp *QliksensePreflight) RunAllPreflightChecks(kubeConfigContents []byte, n
 	totalCount++
 
 	// Preflight serviceaccount check
-	if err := qp.CheckCreateServiceAccount(namespace, false); err != nil {
+	if err := qp.CheckCreateServiceAccount(namespace); err != nil {
 		fmt.Fprintf(out, "%s\n", Red(" Preflight serviceaccount check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {
@@ -84,7 +84,7 @@ func (qp *QliksensePreflight) RunAllPreflightChecks(kubeConfigContents []byte, n
 	totalCount++
 
 	// Preflight mongo check
-	if err := qp.CheckMongo(kubeConfigContents, namespace, preflightOpts, false); err != nil {
+	if err := qp.CheckMongo(kubeConfigContents, namespace, preflightOpts); err != nil {
 		fmt.Fprintf(out, "%s\n", Red(" Preflight mongo check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {
@@ -94,7 +94,7 @@ func (qp *QliksensePreflight) RunAllPreflightChecks(kubeConfigContents []byte, n
 	totalCount++
 
 	// Preflight DNS check
-	if err := qp.CheckDns(namespace, kubeConfigContents, false); err != nil {
+	if err := qp.CheckDns(namespace, kubeConfigContents); err != nil {
 		fmt.Fprintf(out, "%s\n", Red(" Preflight DNS check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {

pkg/preflight/deployability.go

@@ -6,7 +6,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 )
 
-func (qp *QliksensePreflight) CheckDeployment(namespace string, kubeConfigContents []byte, cleanup bool) error {
+func (qp *QliksensePreflight) CheckDeployment(namespace string, kubeConfigContents []byte) error {
 	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
 	if err != nil {
 		err = fmt.Errorf("Kube config error: %v\n", err)
@@ -14,80 +14,63 @@ func (qp *QliksensePreflight) CheckDeployment(namespace string, kubeConfigConten
 	}
 
 	// Deployment check
-	if !cleanup {
-		qp.P.LogVerboseMessage("Preflight deployment check: \n")
-		qp.P.LogVerboseMessage("--------------------------- \n")
-	}
-	err = qp.checkPfDeployment(clientset, namespace, cleanup)
+	qp.P.LogVerboseMessage("Preflight deployment check: \n")
+	qp.P.LogVerboseMessage("--------------------------- \n")
+	err = qp.checkPfDeployment(clientset, namespace, "deployment-preflight-check")
 	if err != nil {
 		qp.P.LogVerboseMessage("Preflight Deployment check: FAILED\n")
 		return err
 	}
-	if !cleanup {
-		qp.P.LogVerboseMessage("Completed preflight deployment check\n")
-	}
+	qp.P.LogVerboseMessage("Completed preflight deployment check\n")
 
 	return nil
 }
 
-func (qp *QliksensePreflight) CheckService(namespace string, kubeConfigContents []byte, cleanup bool) error {
+func (qp *QliksensePreflight) CheckService(namespace string, kubeConfigContents []byte) error {
 	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
 	if err != nil {
 		err = fmt.Errorf("unable to create a kubernetes client: %v\n", err)
 		return err
 	}
 	// Service check
-	if !cleanup {
-		qp.P.LogVerboseMessage("Preflight service check: \n")
-		qp.P.LogVerboseMessage("------------------------ \n")
-	}
-	err = qp.checkPfService(clientset, namespace, cleanup)
+	qp.P.LogVerboseMessage("Preflight service check: \n")
+	qp.P.LogVerboseMessage("------------------------ \n")
+	err = qp.checkPfService(clientset, namespace)
 	if err != nil {
 		qp.P.LogVerboseMessage("Preflight Service check: FAILED\n")
 		return err
 	}
-
-	if !cleanup {
-		qp.P.LogVerboseMessage("Completed preflight service check\n")
-	}
+	qp.P.LogVerboseMessage("Completed preflight service check\n")
 	return nil
 }
 
-func (qp *QliksensePreflight) CheckPod(namespace string, kubeConfigContents []byte, cleanup bool) error {
+func (qp *QliksensePreflight) CheckPod(namespace string, kubeConfigContents []byte) error {
 	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
 	if err != nil {
 		err = fmt.Errorf("error: unable to create a kubernetes client: %v\n", err)
 		return err
 	}
 	// Pod check
-	if !cleanup {
-		qp.P.LogVerboseMessage("Preflight pod check: \n")
-		qp.P.LogVerboseMessage("-------------------- \n")
-	}
-	err = qp.checkPfPod(clientset, namespace, cleanup)
+	qp.P.LogVerboseMessage("Preflight pod check: \n")
+	qp.P.LogVerboseMessage("-------------------- \n")
+	err = qp.checkPfPod(clientset, namespace)
 	if err != nil {
 		qp.P.LogVerboseMessage("Preflight Pod check: FAILED\n")
 		return err
 	}
-	if !cleanup {
-		qp.P.LogVerboseMessage("Completed preflight pod check\n")
-	}
+	qp.P.LogVerboseMessage("Completed preflight pod check\n")
 	return nil
 }
 
-func (qp *QliksensePreflight) checkPfPod(clientset *kubernetes.Clientset, namespace string, cleanup bool) error {
-	// delete the pod we are going to create, if it already exists in the cluster
+func (qp *QliksensePreflight) checkPfPod(clientset *kubernetes.Clientset, namespace string) error {
+	// create a pod
 	podName := "pod-pf-check"
-	qp.deletePod(clientset, namespace, podName)
-	if cleanup {
-		return nil
-	}
 	commandToRun := []string{}
+
 	imageName, err := qp.GetPreflightConfigObj().GetImageName(nginx, true)
 	if err != nil {
 		return err
 	}
-	// create a pod
 	pod, err := qp.createPreflightTestPod(clientset, namespace, podName, imageName, nil, commandToRun)
 	if err != nil {
 		err = fmt.Errorf("unable to create pod - %v\n", err)
@@ -104,14 +87,9 @@ func (qp *QliksensePreflight) checkPfPod(clientset *kubernetes.Clientset, namesp
 	return nil
 }
 
-func (qp *QliksensePreflight) checkPfService(clientset *kubernetes.Clientset, namespace string, cleanup bool) error {
-	// delete the service we are going to create, if it already exists in the cluster
-	serviceName := "svc-pf-check"
-	qp.deleteService(clientset, namespace, serviceName)
-	if cleanup {
-		return nil
-	}
+func (qp *QliksensePreflight) checkPfService(clientset *kubernetes.Clientset, namespace string) error {
 	// creating service
+	serviceName := "svc-pf-check"
 	pfService, err := qp.createPreflightTestService(clientset, namespace, serviceName)
 	if err != nil {
 		err = fmt.Errorf("unable to create service - %v\n", err)
@@ -128,14 +106,7 @@ func (qp *QliksensePreflight) checkPfService(clientset *kubernetes.Clientset, na
 	return nil
 }
 
-func (qp *QliksensePreflight) checkPfDeployment(clientset *kubernetes.Clientset, namespace string, cleanup bool) error {
-	// delete the deployment we are going to create, if it already exists in the cluster
-	depName := "deployment-preflight-check"
-	qp.deleteDeployment(clientset, namespace, depName)
-	if cleanup {
-		return nil
-	}
-
+func (qp *QliksensePreflight) checkPfDeployment(clientset *kubernetes.Clientset, namespace, depName string) error {
 	// check if we are able to create a deployment
 	imageName, err := qp.GetPreflightConfigObj().GetImageName(nginx, true)
 	if err != nil {

pkg/preflight/dns_check.go

@@ -3,8 +3,6 @@ package preflight
 import (
 	"fmt"
 	"strings"
-
-	"k8s.io/client-go/kubernetes"
 )
 
 const (
@@ -12,32 +10,21 @@ const (
 	netcat = "netcat"
 )
 
-func (qp *QliksensePreflight) CheckDns(namespace string, kubeConfigContents []byte, cleanup bool) error {
-	depName := "dep-dns-preflight-check"
-	serviceName := "svc-dns-pf-check"
-	podName := "pf-pod-1"
-
-	if !cleanup {
-		qp.P.LogVerboseMessage("Preflight DNS check: \n")
-		qp.P.LogVerboseMessage("------------------- \n")
-	}
+func (qp *QliksensePreflight) CheckDns(namespace string, kubeConfigContents []byte) error {
+	qp.P.LogVerboseMessage("Preflight DNS check: \n")
+	qp.P.LogVerboseMessage("------------------- \n")
 	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
 	if err != nil {
 		err = fmt.Errorf("unable to create a kubernetes client: %v\n", err)
 		return err
 	}
 
-	// delete the deployment we are going to create, if it already exists in the cluster
-	qp.runDNSCleanup(clientset, namespace, podName, serviceName, depName)
-	if cleanup {
-		return nil
-	}
 	// creating deployment
+	depName := "dep-dns-preflight-check"
 	nginxImageName, err := qp.GetPreflightConfigObj().GetImageName(nginx, true)
 	if err != nil {
 		return err
 	}
-
 	dnsDeployment, err := qp.createPreflightTestDeployment(clientset, namespace, depName, nginxImageName)
 	if err != nil {
 		err = fmt.Errorf("unable to create deployment: %v\n", err)
@@ -50,6 +37,7 @@ func (qp *QliksensePreflight) CheckDns(namespace string, kubeConfigContents []by
 	}
 
 	// creating service
+	serviceName := "svc-dns-pf-check"
 	dnsService, err := qp.createPreflightTestService(clientset, namespace, serviceName)
 	if err != nil {
 		err = fmt.Errorf("unable to create service : %s, %s\n", serviceName, err)
@@ -58,13 +46,13 @@ func (qp *QliksensePreflight) CheckDns(namespace string, kubeConfigContents []by
 	defer qp.deleteService(clientset, namespace, serviceName)
 
 	// create a pod
+	podName := "pf-pod-1"
 	commandToRun := []string{"sh", "-c", "sleep 10; nc -z -v -w 1 " + dnsService.Name + " 80"}
 	netcatImageName, err := qp.GetPreflightConfigObj().GetImageName(netcat, true)
 	if err != nil {
 		err = fmt.Errorf("unable to retrieve image : %v\n", err)
 		return err
 	}
-
 	dnsPod, err := qp.createPreflightTestPod(clientset, namespace, podName, netcatImageName, nil, commandToRun)
 	if err != nil {
 		err = fmt.Errorf("unable to create pod : %s, %s\n", podName, err)
@@ -95,16 +83,9 @@ func (qp *QliksensePreflight) CheckDns(namespace string, kubeConfigContents []by
 		err = fmt.Errorf("Expected response not found\n")
 		return err
 	}
-	if !cleanup {
-		qp.P.LogVerboseMessage("Completed preflight DNS check\n")
-		qp.P.LogVerboseMessage("Cleaning up resources...\n")
-	}
+
+	qp.P.LogVerboseMessage("Completed preflight DNS check\n")
+	qp.P.LogVerboseMessage("Cleaning up resources...\n")
 
 	return nil
 }
-
-func (qp *QliksensePreflight) runDNSCleanup(clientset *kubernetes.Clientset, namespace, podName, serviceName, depName string) {
-	qp.deleteDeployment(clientset, namespace, depName)
-	qp.deletePod(clientset, namespace, podName)
-	qp.deleteService(clientset, namespace, serviceName)
-}

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,108 +12,113 @@ 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 {
-	if !cleanup {
-		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 {
+func (qp *QliksensePreflight) CheckMongo(kubeConfigContents []byte, namespace string, preflightOpts *PreflightOptions) error {
+	qp.P.LogVerboseMessage("Preflight mongodb check: \n")
+	qp.P.LogVerboseMessage("------------------------ \n")
+
+	if preflightOpts.MongoOptions.MongodbUrl == "" {
 		// 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
-	}
-
-	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")
+		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 err := qp.mongoConnCheck(kubeConfigContents, namespace, preflightOpts, cleanup); err != nil {
+	qp.P.LogVerboseMessage("MongodbUrl: %s\n", preflightOpts.MongoOptions.MongodbUrl)
+	if err := qp.mongoConnCheck(kubeConfigContents, namespace, preflightOpts); err != nil {
 		return err
 	}
-
-	if !cleanup {
-		qp.P.LogVerboseMessage("Completed preflight mongodb check\n")
-	}
+	qp.P.LogVerboseMessage("Completed preflight mongodb check\n")
 	return nil
 }
 
-func (qp *QliksensePreflight) mongoConnCheck(kubeConfigContents []byte, namespace string, preflightOpts *PreflightOptions, cleanup bool) error {
-	caCertSecretName := "ca-certificates-crt"
-	mongoPodName := "pf-mongo-pod"
+func (qp *QliksensePreflight) mongoConnCheck(kubeConfigContents []byte, namespace string, preflightOpts *PreflightOptions) error {
+	var caCertSecretName, clientCertSecretName string
 	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
 	if err != nil {
 		err = fmt.Errorf("unable to create a kubernetes client: %v\n", err)
 		return err
 	}
-
-	// cleanup before starting check
-	qp.runMongoCleanup(clientset, namespace, mongoPodName, caCertSecretName)
-	if cleanup {
-		return nil
-	}
-	secrets := map[string]string{}
+	var secrets []string
 	if preflightOpts.MongoOptions.CaCertFile != "" {
+		caCertSecretName = "preflight-mongo-test-cacert"
 		caCertSecret, err := qp.createSecret(clientset, namespace, preflightOpts.MongoOptions.CaCertFile, caCertSecretName)
 		if err != nil {
 			err = fmt.Errorf("unable to create a ca cert kubernetes secret: %v\n", err)
 			return err
 		}
 
-		defer qp.deleteK8sSecret(clientset, namespace, caCertSecret.Name)
-		secrets[caCertSecretName] = caCertMountPath
+		defer qp.deleteK8sSecret(clientset, namespace, caCertSecret)
+		secrets = append(secrets, caCertSecretName)
+	}
+	if preflightOpts.MongoOptions.ClientCertFile != "" {
+		clientCertSecretName = "preflight-mongo-test-clientcert"
+		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)
+		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)
+	podName := "pf-mongo-pod"
+	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)
+	mongoPod, err := qp.createPreflightTestPod(clientset, namespace, podName, imageName, secrets, commandToRun)
 	if err != nil {
 		err = fmt.Errorf("unable to create pod : %v\n", err)
 		return err
 	}
-	defer qp.deletePod(clientset, namespace, mongoPodName)
+	defer qp.deletePod(clientset, namespace, podName)
 
 	if err := waitForPod(clientset, namespace, mongoPod); err != nil {
 		return err
@@ -133,14 +134,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 +144,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 +152,8 @@ 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) {
-	qp.deletePod(clientset, namespace, mongoPodName)
-	qp.deleteK8sSecret(clientset, namespace, caCertSecretName)
-}

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
 	}
 
@@ -283,6 +288,7 @@ func (qp *QliksensePreflight) deleteService(clientset *kubernetes.Clientset, nam
 	if err := retryOnError(func() (err error) {
 		return servicesClient.Delete(name, &deleteOptions)
 	}); err != nil {
+		fmt.Println(err)
 		return err
 	}
 	qp.P.LogVerboseMessage("Deleted service: %s\n", name)
@@ -309,7 +315,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 +338,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 +347,7 @@ func (qp *QliksensePreflight) createPreflightTestPod(clientset *kubernetes.Clien
 						Items: []apiv1.KeyToPath{
 							{
 								Key:  secretName,
-								Path: filepath.Base(mountPath),
+								Path: secretName,
 							},
 						},
 					},
@@ -350,7 +356,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 +471,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 +492,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 {
@@ -561,20 +568,18 @@ func (qp *QliksensePreflight) createPfRole(clientset *kubernetes.Clientset, name
 	return role, nil
 }
 
-func (qp *QliksensePreflight) deleteRole(clientset *kubernetes.Clientset, namespace string, roleName string) error {
+func (qp *QliksensePreflight) deleteRole(clientset *kubernetes.Clientset, namespace string, role *v1beta1.Role) {
 	rolesClient := clientset.RbacV1beta1().Roles(namespace)
 
 	deletePolicy := v1.DeletePropagationForeground
 	deleteOptions := v1.DeleteOptions{
 		PropagationPolicy: &deletePolicy,
 	}
-	err := rolesClient.Delete(roleName, &deleteOptions)
+	err := rolesClient.Delete(role.GetName(), &deleteOptions)
 	if err != nil {
-		log.Printf("Error: %v\n", err)
-		return err
+		log.Fatal(err)
 	}
-	qp.P.LogVerboseMessage("Deleted role: %s\n\n", roleName)
-	return nil
+	qp.P.LogVerboseMessage("Deleted role: %s\n\n", role.Name)
 }
 
 func (qp *QliksensePreflight) createPfRoleBinding(clientset *kubernetes.Clientset, namespace, roleBindingName string) (*v1beta1.RoleBinding, error) {
@@ -614,20 +619,18 @@ func (qp *QliksensePreflight) createPfRoleBinding(clientset *kubernetes.Clientse
 	return roleBinding, nil
 }
 
-func (qp *QliksensePreflight) deleteRoleBinding(clientset *kubernetes.Clientset, namespace string, roleBindingName string) error {
+func (qp *QliksensePreflight) deleteRoleBinding(clientset *kubernetes.Clientset, namespace string, roleBinding *v1beta1.RoleBinding) {
 	roleBindingClient := clientset.RbacV1beta1().RoleBindings(namespace)
 
 	deletePolicy := v1.DeletePropagationForeground
 	deleteOptions := v1.DeleteOptions{
 		PropagationPolicy: &deletePolicy,
 	}
-	err := roleBindingClient.Delete(roleBindingName, &deleteOptions)
+	err := roleBindingClient.Delete(roleBinding.GetName(), &deleteOptions)
 	if err != nil {
-		log.Printf("Error: %v\n", err)
-		return err
+		log.Fatal(err)
 	}
-	qp.P.LogVerboseMessage("Deleted RoleBinding: %s\n\n", roleBindingName)
-	return nil
+	qp.P.LogVerboseMessage("Deleted RoleBinding: %s\n\n", roleBinding.Name)
 }
 
 func (qp *QliksensePreflight) createPfServiceAccount(clientset *kubernetes.Clientset, namespace, serviceAccountName string) (*apiv1.ServiceAccount, error) {
@@ -654,20 +657,18 @@ func (qp *QliksensePreflight) createPfServiceAccount(clientset *kubernetes.Clien
 	return serviceAccount, nil
 }
 
-func (qp *QliksensePreflight) deleteServiceAccount(clientset *kubernetes.Clientset, namespace string, serviceAccountName string) error {
+func (qp *QliksensePreflight) deleteServiceAccount(clientset *kubernetes.Clientset, namespace string, serviceAccount *apiv1.ServiceAccount) {
 	serviceAccountClient := clientset.CoreV1().ServiceAccounts(namespace)
 
 	deletePolicy := v1.DeletePropagationForeground
 	deleteOptions := v1.DeleteOptions{
 		PropagationPolicy: &deletePolicy,
 	}
-	err := serviceAccountClient.Delete(serviceAccountName, &deleteOptions)
+	err := serviceAccountClient.Delete(serviceAccount.GetName(), &deleteOptions)
 	if err != nil {
-		log.Printf("Error: %v\n", err)
-		return err
+		log.Fatal(err)
 	}
-	qp.P.LogVerboseMessage("Deleted ServiceAccount: %s\n\n", serviceAccountName)
-	return nil
+	qp.P.LogVerboseMessage("Deleted ServiceAccount: %s\n\n", serviceAccount.Name)
 }
 
 func (qp *QliksensePreflight) createPreflightTestSecret(clientset *kubernetes.Clientset, namespace, secretName string, secretData []byte) (*apiv1.Secret, error) {
@@ -698,42 +699,16 @@ func (qp *QliksensePreflight) createPreflightTestSecret(clientset *kubernetes.Cl
 	return secret, nil
 }
 
-func (qp *QliksensePreflight) deleteK8sSecret(clientset *kubernetes.Clientset, namespace string, secretName string) error {
+func (qp *QliksensePreflight) deleteK8sSecret(clientset *kubernetes.Clientset, namespace string, k8sSecret *apiv1.Secret) {
 	secretClient := clientset.CoreV1().Secrets(namespace)
 
 	deletePolicy := v1.DeletePropagationForeground
 	deleteOptions := v1.DeleteOptions{
 		PropagationPolicy: &deletePolicy,
 	}
-	err := secretClient.Delete(secretName, &deleteOptions)
+	err := secretClient.Delete(k8sSecret.GetName(), &deleteOptions)
 	if err != nil {
-		return err
+		log.Fatal(err)
 	}
-	qp.P.LogVerboseMessage("Deleted Secret: %s\n", secretName)
-	return nil
-}
-
-func (qp *QliksensePreflight) Cleanup(namespace string, kubeConfigContents []byte) error {
-	qp.P.LogVerboseMessage("Preflight clean\n")
-	qp.P.LogVerboseMessage("----------------\n")
-
-	qp.P.LogVerboseMessage("Removing deployment...\n")
-	qp.CheckDeployment(namespace, kubeConfigContents, true)
-	qp.P.LogVerboseMessage("Removing service...\n")
-	qp.CheckService(namespace, kubeConfigContents, true)
-	qp.P.LogVerboseMessage("Removing pod...\n")
-	qp.CheckPod(namespace, kubeConfigContents, true)
-
-	qp.P.LogVerboseMessage("Removing role...\n")
-	qp.CheckCreateRole(namespace, true)
-	qp.P.LogVerboseMessage("Removing rolebinding...\n")
-	qp.CheckCreateRoleBinding(namespace, true)
-	qp.P.LogVerboseMessage("Removing serviceaccount...\n")
-	qp.CheckCreateServiceAccount(namespace, true)
-
-	qp.P.LogVerboseMessage("Removing DNS check components...\n")
-	qp.CheckDns(namespace, kubeConfigContents, true)
-	qp.P.LogVerboseMessage("Removing mongo check components...\n")
-	qp.CheckMongo(kubeConfigContents, namespace, &PreflightOptions{MongoOptions: &MongoOptions{}}, true)
-	return nil
+	qp.P.LogVerboseMessage("Deleted Secret: %s\n", k8sSecret.Name)
 }

pkg/preflight/role_check.go

@@ -11,59 +11,48 @@ import (
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
 )
 
-func (qp *QliksensePreflight) CheckCreateRole(namespace string, cleanup bool) error {
+var resultYamlBytes = []byte("")
+
+func (qp *QliksensePreflight) CheckCreateRole(namespace string) error {
 	// create a Role
-	if !cleanup {
-		qp.P.LogVerboseMessage("Preflight role check: \n")
-		qp.P.LogVerboseMessage("--------------------- \n")
-	}
-	err := qp.checkCreateEntity(namespace, "Role", cleanup)
+	qp.P.LogVerboseMessage("Preflight role check: \n")
+	qp.P.LogVerboseMessage("--------------------- \n")
+	err := qp.checkCreateEntity(namespace, "Role")
 	if err != nil {
 		return err
 	}
-	if !cleanup {
-		qp.P.LogVerboseMessage("Completed preflight role check\n")
-	}
+	qp.P.LogVerboseMessage("Completed preflight role check\n")
 	return nil
 }
 
-func (qp *QliksensePreflight) CheckCreateRoleBinding(namespace string, cleanup bool) error {
+func (qp *QliksensePreflight) CheckCreateRoleBinding(namespace string) error {
 	// create a RoleBinding
-	if !cleanup {
-		qp.P.LogVerboseMessage("Preflight rolebinding check: \n")
-		qp.P.LogVerboseMessage("---------------------------- \n")
-	}
-	err := qp.checkCreateEntity(namespace, "RoleBinding", cleanup)
+	qp.P.LogVerboseMessage("Preflight rolebinding check: \n")
+	qp.P.LogVerboseMessage("---------------------------- \n")
+	err := qp.checkCreateEntity(namespace, "RoleBinding")
 	if err != nil {
 		return err
 	}
-	if !cleanup {
-		qp.P.LogVerboseMessage("Completed preflight rolebinding check\n")
-	}
+	qp.P.LogVerboseMessage("Completed preflight rolebinding check\n")
 	return nil
 }
 
-func (qp *QliksensePreflight) CheckCreateServiceAccount(namespace string, cleanup bool) error {
+func (qp *QliksensePreflight) CheckCreateServiceAccount(namespace string) error {
 	// create a service account
-	if !cleanup {
-		qp.P.LogVerboseMessage("Preflight serviceaccount check: \n")
-		qp.P.LogVerboseMessage("------------------------------- \n")
-	}
-	err := qp.checkCreateEntity(namespace, "ServiceAccount", cleanup)
+	qp.P.LogVerboseMessage("Preflight serviceaccount check: \n")
+	qp.P.LogVerboseMessage("------------------------------- \n")
+	err := qp.checkCreateEntity(namespace, "ServiceAccount")
 	if err != nil {
 		return err
 	}
-	if !cleanup {
-		qp.P.LogVerboseMessage("Completed preflight serviceaccount check\n")
-	}
+	qp.P.LogVerboseMessage("Completed preflight serviceaccount check\n")
 	return nil
 }
-func (qp *QliksensePreflight) checkCreateEntity(namespace, entityToTest string, cleanup bool) error {
+func (qp *QliksensePreflight) checkCreateEntity(namespace, entityToTest string) error {
 	qConfig := qapi.NewQConfig(qp.Q.QliksenseHome)
 	var currentCR *qapi.QliksenseCR
 	mfroot := ""
 	kusDir := ""
-	resultYamlBytes := []byte("")
 	var err error
 	currentCR, err = qConfig.GetCurrentCR()
 	if err != nil {
@@ -100,12 +89,6 @@ func (qp *QliksensePreflight) checkCreateEntity(namespace, entityToTest string,
 	}
 	namespace = "" // namespace is handled when generating the manifests
 
-	// check if entity already exists in the cluster, if so - delete it
-	api.KubectlDeleteVerbose(sa, namespace, qp.P.Verbose)
-	if cleanup {
-		return nil
-	}
-
 	defer func() {
 		qp.P.LogVerboseMessage("Cleaning up resources...\n")
 		err := api.KubectlDeleteVerbose(sa, namespace, qp.P.Verbose)
@@ -130,7 +113,7 @@ func (qp *QliksensePreflight) CheckCreateRB(namespace string, kubeConfigContents
 	qp.P.LogVerboseMessage("Preflight createRole check: \n")
 	qp.P.LogVerboseMessage("--------------------------- \n")
 	errStr := strings.Builder{}
-	err1 := qp.checkCreateEntity(namespace, "Role", false)
+	err1 := qp.checkCreateEntity(namespace, "Role")
 	if err1 != nil {
 		errStr.WriteString(err1.Error())
 		errStr.WriteString("\n")
@@ -142,7 +125,7 @@ func (qp *QliksensePreflight) CheckCreateRB(namespace string, kubeConfigContents
 	// create a roleBinding
 	qp.P.LogVerboseMessage("Preflight rolebinding check: \n")
 	qp.P.LogVerboseMessage("---------------------------- \n")
-	err2 := qp.checkCreateEntity(namespace, "RoleBinding", false)
+	err2 := qp.checkCreateEntity(namespace, "RoleBinding")
 	if err2 != nil {
 		errStr.WriteString(err2.Error())
 		errStr.WriteString("\n")
@@ -154,7 +137,7 @@ func (qp *QliksensePreflight) CheckCreateRB(namespace string, kubeConfigContents
 	// create a service account
 	qp.P.LogVerboseMessage("Preflight serviceaccount check: \n")
 	qp.P.LogVerboseMessage("------------------------------- \n")
-	err3 := qp.checkCreateEntity(namespace, "ServiceAccount", false)
+	err3 := qp.checkCreateEntity(namespace, "ServiceAccount")
 	if err3 != nil {
 		errStr.WriteString(err3.Error())
 		errStr.WriteString("\n")

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
 						}

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,
 		},

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
 }

pkg/qliksense/docker_test.go

@@ -186,7 +186,7 @@ kind: Qliksense
 metadata:
   name: qlik-default
 spec:
-  opsRunner:
+  gitOps:
     image: some-gitops-image
 `)
 
@@ -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")
 	}

pkg/qliksense/export.go

@@ -0,0 +1,71 @@
+package qliksense
+
+import (
+	"archive/zip"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+func (q *Qliksense) ExportContext(context string, output string) error {
+	qliksenseContextsDir := filepath.Join(q.QliksenseHome, QliksenseContextsDir)
+	qliksenseContextFile := filepath.Join(qliksenseContextsDir, context)
+	qliksenseSecretsDir := filepath.Join(q.QliksenseHome, QliksenseSecretsDir, QliksenseContextsDir)
+	qliksenseSecretsFile := filepath.Join(qliksenseSecretsDir, context)
+	// files := []string{qliksenseContextFile, qliksenseSecretsFile}
+
+	fmt.Println(q.QliksenseHome)
+	fmt.Println(qliksenseSecretsFile)
+	fmt.Println(qliksenseContextFile)
+
+	filename := "result.zip"
+	destinationFile, err := os.Create(output + "/" + filename)
+	var folders []string
+	if err != nil {
+		return err
+	}
+	folders = append(folders, qliksenseContextFile, qliksenseSecretsFile)
+	if err := RecursiveZip(folders, destinationFile); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func RecursiveZip(pathToZip []string, destinationFile *os.File) error {
+s	myZip := zip.NewWriter(destinationFile)
+	for _, element := range pathToZip {
+		err := filepath.Walk(element, func(filePath string, info os.FileInfo, err error) error {
+			if info.IsDir() {
+				return nil
+			}
+			if err != nil {
+				return err
+			}
+			relPath := strings.TrimPrefix(filePath, element)
+			zipFile, err := myZip.Create(relPath)
+			if err != nil {
+				return err
+			}
+			fsFile, err := os.Open(filePath)
+			if err != nil {
+				return err
+			}
+			_, err = io.Copy(zipFile, fsFile)
+			if err != nil {
+				return err
+			}
+			return nil
+		})xs
+		if err != nil {
+			return err
+		}
+	}
+	err := myZip.Close()
+	if err != nil {
+		return err
+	}
+	return nil
+}

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
 }

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
 		}
 	}