add dry-run for debugging purpose

Signed-off-by: Foysal Iqbal <mqb@qlik.com>
2020-06-02 11:05:41 -04:00 · 2020-06-02 10:27:44 -04:00 · 2020-06-02 09:42:33 -04:00 · 2020-05-28 22:41:57 -04:00
67 changed files with 1786 additions and 4258 deletions
--- a/.github/workflows/mkdocs.yml
+++ b/.github/workflows/mkdocs.yml
@@ -16,6 +16,6 @@ jobs:
        uses: actions/checkout@v1

      - name: Deploy docs
-        uses: mhausenblas/mkdocs-deploy-gh-pages@1.12
+        uses: mhausenblas/mkdocs-deploy-gh-pages@1.11
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/cmd/qliksense/about.go
+++ b/cmd/qliksense/about.go
@@ -19,7 +19,7 @@ func about(q *qliksense.Qliksense) *cobra.Command {

 	c := &cobra.Command{
 		Use:   "about ref",
-		Short: "Displays information pertaining to qliksense on Kubernetes",
+		Short: "Displays information pertaining to Qliksense on Kubernetes",
 		Long:  "Gives the version of QLik Sense on Kubernetes and versions of images.",
 		Example: `
 qliksense about 1.0.0
--- a/cmd/qliksense/apply.go
+++ b/cmd/qliksense/apply.go
@@ -1,44 +1,74 @@
 package main

 import (
+	"bytes"
+	"errors"
+	"fmt"
+
+	qapi "github.com/qlik-oss/sense-installer/pkg/api"
+
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
 	"github.com/spf13/cobra"
 )

 func applyCmd(q *qliksense.Qliksense) *cobra.Command {
-	opts := &qliksense.InstallCommandOptions{
-		CleanPatchFiles: true,
-	}
+	opts := &qliksense.InstallCommandOptions{}
 	filePath := ""
+	keepPatchFiles, pull, push := false, false, false
 	c := &cobra.Command{
 		Use:     "apply",
 		Short:   "install qliksense based on provided cr file",
 		Long:    `install qliksense based on provided cr file`,
 		Example: `qliksense apply -f file_name or cat cr_file | qliksense apply -f -`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return apply(q, cmd, opts)
+			return runLoadOrApplyCommandE(cmd, func(crBytes []byte) error {
+				if cr, crBytesWithEula, err := getCrWithEulaInserted(crBytes); err != nil {
+					return err
+				} else if err := validatePullPushFlagsOnApply(cr, pull, push); err != nil {
+					return err
+				} else {
+					return q.ApplyCRFromReader(bytes.NewReader(crBytesWithEula), opts, keepPatchFiles, true, pull, push)
+				}
+			})
 		},
 	}

 	f := c.Flags()
 	f.StringVarP(&filePath, "file", "f", "", "Install from a CR file")
+	c.MarkFlagRequired("file")
 	f.StringVarP(&opts.StorageClass, "storageClass", "s", "", "Storage class for qliksense")
 	f.StringVarP(&opts.MongodbUri, "mongodbUri", "m", "", "mongodbUri for qliksense (i.e. mongodb://qlik-default-mongodb:27017/qliksense?ssl=false)")
-	f.BoolVar(&opts.CleanPatchFiles, cleanPatchFilesFlagName, opts.CleanPatchFiles, cleanPatchFilesFlagUsage)
-	f.BoolVarP(&opts.Pull, pullFlagName, pullFlagShorthand, opts.Pull, pullFlagUsage)
-	f.BoolVarP(&opts.Push, pushFlagName, pushFlagShorthand, opts.Push, pushFlagUsage)
-	f.StringVarP(&opts.AcceptEULA, "acceptEULA", "a", opts.AcceptEULA, "Accept EULA for qliksense")
+	f.StringVarP(&opts.RotateKeys, "rotateKeys", "r", "", "Rotate JWT keys for qliksense (yes:rotate keys/ no:use exising keys from cluster/ None: use default EJSON_KEY from env")
+	f.BoolVar(&keepPatchFiles, keepPatchFilesFlagName, keepPatchFiles, keepPatchFilesFlagUsage)
+	f.BoolVarP(&pull, pullFlagName, pullFlagShorthand, pull, pullFlagUsage)
+	f.BoolVarP(&push, pushFlagName, pushFlagShorthand, push, pushFlagUsage)
+
+	eulaPreRunHooks.addValidator(fmt.Sprintf("%v %v", rootCommandName, c.Name()), loadOrApplyCommandEulaPreRunHook)

-	if err := c.MarkFlagRequired("file"); err != nil {
-		panic(err)
-	}
 	return c
 }

-func apply(q *qliksense.Qliksense, cmd *cobra.Command, opts *qliksense.InstallCommandOptions) error {
-	if crBytes, err := getCrBytesFromFileFlag(cmd); err != nil {
-		return err
+func validatePullPushFlagsOnApply(cr *qapi.QliksenseCR, pull, push bool) error {
+	if pull && !push {
+		fmt.Printf("WARNING: pulling images without pushing them")
+	}
+	if push {
+		if registry := cr.Spec.GetImageRegistry(); registry == "" {
+			return errors.New("no image registry set in the CR; to set it use: qliksense config set-image-registry")
+		}
+	}
+	return nil
+}
+
+func getCrWithEulaInserted(crBytes []byte) (*qapi.QliksenseCR, []byte, error) {
+	if cr, err := qapi.CreateCRObjectFromString(string(crBytes)); err != nil {
+		return nil, nil, err
 	} else {
-		return q.ApplyCRFromBytes(crBytes, opts, true)
+		cr.SetEULA("yes")
+		if crBytesWithEula, err := qapi.K8sToYaml(cr); err != nil {
+			return nil, nil, err
+		} else {
+			return cr, crBytesWithEula, nil
+		}
 	}
 }
--- a/cmd/qliksense/crds.go
+++ b/cmd/qliksense/crds.go
@@ -12,35 +12,31 @@ var crdsCmd = &cobra.Command{
 }

 func crdsViewCmd(q *qliksense.Qliksense) *cobra.Command {
-	opts := &qliksense.CrdCommandOptions{
-		All: true,
-	}
+	opts := &qliksense.CrdCommandOptions{}
 	c := &cobra.Command{
 		Use:   "view",
-		Short: "View CRDs for qliksense application. Use view --all=false to exclude the operator CRD",
-		Long:  "View CRDs for qliksense application. Use view --all=false to exclude the operator CRD",
+		Short: "View CRDs for qliksense application. use view --all to see opearator crd as well ",
+		Long:  `View CRDs for qliksense application. use view --all to see opearator crd as well`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return q.ViewCrds(opts)
 		},
 	}
 	f := c.Flags()
-	f.BoolVarP(&opts.All, "all", "", opts.All, "If set to false, then the operator CRD is excluded")
+	f.BoolVarP(&opts.All, "all", "", false, "Include All CRDs")
 	return c
 }

 func crdsInstallCmd(q *qliksense.Qliksense) *cobra.Command {
-	opts := &qliksense.CrdCommandOptions{
-		All: true,
-	}
+	opts := &qliksense.CrdCommandOptions{}
 	c := &cobra.Command{
 		Use:   "install",
-		Short: "Install CRDs for qliksense application. Use install --all=false to exclude the operator CRD",
-		Long:  "Install CRDs for qliksense application. Use install --all=false to exclude the operator CRD",
+		Short: "Install CRDs fro Qliksense application. Use install --all to include operator crd",
+		Long:  `Install CRDs fro Qliksense application. Use install --all to include operator crd`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return q.InstallCrds(opts)
 		},
 	}
 	f := c.Flags()
-	f.BoolVarP(&opts.All, "all", "", opts.All, "If set to false, then the operator CRD is excluded")
+	f.BoolVarP(&opts.All, "all", "", false, "Include All CRDs")
 	return c
 }
--- a/cmd/qliksense/eula.go
+++ b/cmd/qliksense/eula.go
@@ -0,0 +1,106 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/mattn/go-tty"
+	qapi "github.com/qlik-oss/sense-installer/pkg/api"
+	"github.com/qlik-oss/sense-installer/pkg/qliksense"
+	"github.com/spf13/cobra"
+)
+
+type eulaPreRunHooksT struct {
+	validators              map[string]func(cmd *cobra.Command, q *qliksense.Qliksense) (bool, error)
+	postValidationArtifacts map[string]interface{}
+}
+
+func (e *eulaPreRunHooksT) addValidator(command string, validator func(cmd *cobra.Command, q *qliksense.Qliksense) (bool, error)) {
+	e.validators[command] = validator
+}
+
+func (e *eulaPreRunHooksT) getValidator(command string) func(cmd *cobra.Command, q *qliksense.Qliksense) (bool, error) {
+	if validator, ok := e.validators[command]; ok {
+		return validator
+	}
+	return nil
+}
+
+func (e *eulaPreRunHooksT) addPostValidationArtifact(artifactName string, artifact interface{}) {
+	e.postValidationArtifacts[artifactName] = artifact
+}
+
+func (e *eulaPreRunHooksT) getPostValidationArtifact(artifactName string) interface{} {
+	if artifact, ok := e.postValidationArtifacts[artifactName]; ok {
+		return artifact
+	}
+	return nil
+}
+
+var eulaEnforced = os.Getenv("QLIKSENSE_EULA_ENFORCE") == "true"
+var eulaText = "Please read the end user license agreement at: https://www.qlik.com/us/legal/license-terms"
+var eulaPrompt = "Do you accept our EULA? (y/n): "
+var eulaErrorInstruction = `You must enter "y" to continue`
+var eulaPreRunHooks = eulaPreRunHooksT{
+	validators:              make(map[string]func(cmd *cobra.Command, q *qliksense.Qliksense) (bool, error)),
+	postValidationArtifacts: make(map[string]interface{}),
+}
+
+func commandAlwaysRequiresEulaAcceptance(commandName string) bool {
+	return commandName == fmt.Sprintf("%v install", rootCommandName) ||
+		commandName == fmt.Sprintf("%v apply", rootCommandName)
+}
+
+func globalEulaPreRun(cmd *cobra.Command, q *qliksense.Qliksense) {
+	if isEulaEnforced(cmd.CommandPath()) {
+		if strings.TrimSpace(strings.ToLower(cmd.Flag("acceptEULA").Value.String())) != "yes" {
+			if eulaPreRunHook := eulaPreRunHooks.getValidator(cmd.CommandPath()); eulaPreRunHook != nil {
+				if eulaAccepted, err := eulaPreRunHook(cmd, q); err != nil {
+					panic(err)
+				} else if !eulaAccepted {
+					doEnforceEula()
+				}
+			} else if qConfig, err := qapi.NewQConfigE(q.QliksenseHome); err != nil {
+				doEnforceEula()
+			} else if qcr, err := qConfig.GetCurrentCR(); err != nil || !qcr.IsEULA() {
+				doEnforceEula()
+			}
+		}
+	}
+}
+
+func globalEulaPostRun(cmd *cobra.Command, q *qliksense.Qliksense) {
+	if isEulaEnforced(cmd.CommandPath()) {
+		if err := q.SetEulaAccepted(); err != nil {
+			panic(err)
+		}
+	}
+}
+
+func isEulaEnforced(commandName string) bool {
+	return eulaEnforced || commandAlwaysRequiresEulaAcceptance(commandName)
+}
+
+func doEnforceEula() {
+	fmt.Println(eulaText)
+	fmt.Print(eulaPrompt)
+	answer := readRuneFromTty()
+	if strings.ToLower(answer) != "y" {
+		fmt.Println(eulaErrorInstruction)
+		os.Exit(1)
+	}
+}
+
+func readRuneFromTty() string {
+	t, err := tty.Open()
+	if err != nil {
+		panic(err)
+	}
+	defer t.Close()
+	answer, err := t.ReadString()
+	if err != nil {
+		panic(err)
+	}
+	return answer
+}
--- a/cmd/qliksense/install.go
+++ b/cmd/qliksense/install.go
@@ -1,15 +1,19 @@
 package main

 import (
+	"bytes"
+	"fmt"
+
+	qapi "github.com/qlik-oss/sense-installer/pkg/api"
+
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
 	"github.com/spf13/cobra"
 )

 func installCmd(q *qliksense.Qliksense) *cobra.Command {
-	opts := &qliksense.InstallCommandOptions{
-		CleanPatchFiles: true,
-	}
+	opts := &qliksense.InstallCommandOptions{}
 	filePath := ""
+	keepPatchFiles, pull, push := false, false, false
 	c := &cobra.Command{
 		Use:   "install",
 		Short: "install a qliksense release",
@@ -18,35 +22,76 @@ func installCmd(q *qliksense.Qliksense) *cobra.Command {
 		# qliksense install -f file_name or cat cr_file | qliksense install -f -
 		`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			version := ""
-			if len(args) != 0 {
-				version = args[0]
-			}
-
 			if filePath != "" {
-				if err := apply(q, cmd, opts); err != nil {
-					return err
-				}
+				return runLoadOrApplyCommandE(cmd, func(crBytes []byte) error {
+					if cr, crBytesWithEula, err := getCrWithEulaInserted(crBytes); err != nil {
+						return err
+					} else if err := validatePullPushFlagsOnApply(cr, pull, push); err != nil {
+						return err
+					} else {
+						return q.ApplyCRFromReader(bytes.NewReader(crBytesWithEula), opts, keepPatchFiles, true, pull, push)
+					}
+				})
 			} else {
-				if err := q.InstallQK8s(version, opts); err != nil {
+				version := ""
+				if len(args) != 0 {
+					version = args[0]
+				}
+				if err := validatePullPushFlagsOnInstall(q, pull, push); err != nil {
 					return err
 				}
+				if pull {
+					fmt.Println("Pulling images...")
+					if err := q.PullImages(version, ""); err != nil {
+						return err
+					}
+				}
+				if push {
+					fmt.Println("Pushing images...")
+					if err := q.PushImagesForCurrentCR(); err != nil {
+						return err
+					}
+				}
+				return q.InstallQK8s(version, opts, keepPatchFiles)
 			}
-			postflightChecksCmd := AllPostflightChecks(q)
-			postflightChecksCmd.DisableFlagParsing = true
-			return postflightChecksCmd.Execute()
 		},
 	}

+	eulaPreRunHooks.addValidator(fmt.Sprintf("%v %v", rootCommandName, c.Name()), func(cmd *cobra.Command, q *qliksense.Qliksense) (b bool, err error) {
+		if filePath != "" {
+			return loadOrApplyCommandEulaPreRunHook(cmd, q)
+		} else if qConfig, err := qapi.NewQConfigE(q.QliksenseHome); err != nil {
+			return false, err
+		} else if qcr, err := qConfig.GetCurrentCR(); err != nil {
+			return false, err
+		} else {
+			return qcr.IsEULA(), nil
+		}
+	})
+
 	f := c.Flags()
-	f.StringVarP(&filePath, "file", "f", "", "Install from a CR file")
 	f.StringVarP(&opts.StorageClass, "storageClass", "s", "", "Storage class for qliksense")
 	f.StringVarP(&opts.MongodbUri, "mongodbUri", "m", "", "mongodbUri for qliksense (i.e. mongodb://qlik-default-mongodb:27017/qliksense?ssl=false)")
-	f.BoolVar(&opts.CleanPatchFiles, cleanPatchFilesFlagName, opts.CleanPatchFiles, cleanPatchFilesFlagUsage)
-	f.BoolVarP(&opts.Pull, pullFlagName, pullFlagShorthand, opts.Pull, pullFlagUsage)
-	f.BoolVarP(&opts.Push, pushFlagName, pushFlagShorthand, opts.Push, pushFlagUsage)
-	f.StringVarP(&opts.AcceptEULA, "acceptEULA", "a", opts.AcceptEULA, "Accept EULA for qliksense")
+	f.StringVarP(&opts.RotateKeys, "rotateKeys", "r", "", "Rotate JWT keys for qliksense (yes:rotate keys/ no:use exising keys from cluster/ None: use default EJSON_KEY from env")
+	f.BoolVar(&keepPatchFiles, keepPatchFilesFlagName, keepPatchFiles, keepPatchFilesFlagUsage)
+	f.StringVarP(&filePath, "file", "f", "", "Install from a CR file")
+
 	f.BoolVarP(&opts.DryRun, "dry-run", "", false, "Dry run will generate the patches without rotating keys")

+	f.BoolVarP(&pull, pullFlagName, pullFlagShorthand, pull, pullFlagUsage)
+	f.BoolVarP(&push, pushFlagName, pushFlagShorthand, push, pushFlagUsage)
+
 	return c
 }
+
+func validatePullPushFlagsOnInstall(q *qliksense.Qliksense, pull, push bool) error {
+	if pull && !push {
+		fmt.Printf("WARNING: pulling images without pushing them")
+	}
+	if push {
+		if err := ensureImageRegistrySetInCR(q); err != nil {
+			return err
+		}
+	}
+	return nil
+}
--- a/cmd/qliksense/keys.go
+++ b/cmd/qliksense/keys.go
@@ -1,31 +0,0 @@
-package main
-
-import (
-	"github.com/qlik-oss/sense-installer/pkg/qliksense"
-	"github.com/spf13/cobra"
-)
-
-var keysCmd = &cobra.Command{
-	Use:   "keys",
-	Short: "keys for qliksense",
-}
-
-func keysRotateCmd(q *qliksense.Qliksense) *cobra.Command {
-	c := &cobra.Command{
-		Use:   "rotate",
-		Short: "Rotate qliksense application keys",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := q.InstallQK8s("", &qliksense.InstallCommandOptions{
-				CleanPatchFiles: true,
-				RotateKeys:      true,
-			}); err != nil {
-				return err
-			} else {
-				postFlightChecksCmd := AllPostflightChecks(q)
-				postFlightChecksCmd.DisableFlagParsing = true
-				return postFlightChecksCmd.Execute()
-			}
-		},
-	}
-	return c
-}
--- a/cmd/qliksense/load.go
+++ b/cmd/qliksense/load.go
@@ -1,6 +1,8 @@
 package main

 import (
+	"bytes"
+	"fmt"
 	"io/ioutil"
 	"os"

@@ -18,48 +20,69 @@ func loadCrFile(q *qliksense.Qliksense) *cobra.Command {
 		Long:    `load a CR a file and create necessary structure for future use`,
 		Example: `qliksense load -f file_name or cat cr_file | qliksense load -f -`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if crBytes, err := getCrBytesFromFileFlag(cmd); err != nil {
-				return err
-			} else {
-				return q.LoadCr(crBytes, overwriteExistingContext)
-			}
+			return runLoadOrApplyCommandE(cmd, func(buffer []byte) error {
+				return q.LoadCr(bytes.NewReader(buffer), overwriteExistingContext)
+			})
 		},
 	}
 	f := c.Flags()
 	f.StringVarP(&filePath, "file", "f", "", "File to load CR from")
+	c.MarkFlagRequired("file")
 	f.BoolVarP(&overwriteExistingContext, "overwrite", "o", overwriteExistingContext, "Overwrite any existing contexts with the same name")

-	if err := c.MarkFlagRequired("file"); err != nil {
-		panic(err)
-	}
+	eulaPreRunHooks.addValidator(fmt.Sprintf("%v %v", rootCommandName, c.Name()), loadOrApplyCommandEulaPreRunHook)
 	return c
 }

-func isInputFromPipe() bool {
-	fileInfo, _ := os.Stdin.Stat()
-	return fileInfo.Mode()&os.ModeCharDevice == 0
-}
-
 func getCrFileFromFlag(cmd *cobra.Command, flagName string) (*os.File, error) {
 	filePath := cmd.Flag(flagName).Value.String()
 	if filePath == "-" {
 		if !isInputFromPipe() {
 			return nil, errors.New("No input pipe present")
-		} else {
-			return os.Stdin, nil
 		}
-	} else if file, err := os.Open(filePath); err != nil {
-		return nil, errors.Wrapf(err, "unable to read the file %s", filePath)
+		return os.Stdin, nil
+	}
+	file, e := os.Open(filePath)
+	if e != nil {
+		return nil, errors.Wrapf(e,
+			"unable to read the file %s", filePath)
+	}
+	return file, nil
+}
+
+func isInputFromPipe() bool {
+	fileInfo, _ := os.Stdin.Stat()
+	return fileInfo.Mode()&os.ModeCharDevice == 0
+}
+
+func loadOrApplyCommandEulaPreRunHook(cmd *cobra.Command, q *qliksense.Qliksense) (bool, error) {
+	file, err := getCrFileFromFlag(cmd, "file")
+	if err != nil {
+		return false, err
+	}
+	defer file.Close()
+
+	if crBytes, err := ioutil.ReadAll(file); err != nil {
+		return false, err
 	} else {
-		return file, nil
+		eulaPreRunHooks.addPostValidationArtifact("CR", crBytes)
+		return q.IsEulaAcceptedInCrFile(bytes.NewBuffer(crBytes))
 	}
 }

-func getCrBytesFromFileFlag(cmd *cobra.Command) ([]byte, error) {
-	if file, err := getCrFileFromFlag(cmd, "file"); err != nil {
-		return nil, err
+func runLoadOrApplyCommandE(cmd *cobra.Command, callBack func(buffer []byte) error) error {
+	if crBytes := eulaPreRunHooks.getPostValidationArtifact("CR"); crBytes != nil {
+		return callBack(crBytes.([]byte))
 	} else {
+		file, err := getCrFileFromFlag(cmd, "file")
+		if err != nil {
+			return err
+		}
 		defer file.Close()
-		return ioutil.ReadAll(file)
+		if crBytes, err := ioutil.ReadAll(file); err != nil {
+			return err
+		} else {
+			return callBack(crBytes)
+		}
 	}
 }
--- a/cmd/qliksense/postflight.go
+++ b/cmd/qliksense/postflight.go
@@ -1,96 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	. "github.com/logrusorgru/aurora"
-	ansi "github.com/mattn/go-colorable"
-	"github.com/qlik-oss/sense-installer/pkg/api"
-	postflight "github.com/qlik-oss/sense-installer/pkg/postflight"
-	"github.com/qlik-oss/sense-installer/pkg/qliksense"
-	"github.com/spf13/cobra"
-)
-
-func postflightCmd(q *qliksense.Qliksense) *cobra.Command {
-	postflightOpts := &postflight.PostflightOptions{}
-	var postflightCmd = &cobra.Command{
-		Use:     "postflight",
-		Short:   "perform postflight checks on the cluster",
-		Long:    `perform postflight checks on the cluster`,
-		Example: `qliksense postflight <postflight_check_to_run>`,
-	}
-	f := postflightCmd.Flags()
-	f.BoolVarP(&postflightOpts.Verbose, "verbose", "v", false, "verbose mode")
-	return postflightCmd
-}
-
-func postflightMigrationCheck(q *qliksense.Qliksense) *cobra.Command {
-	out := ansi.NewColorableStdout()
-	postflightOpts := &postflight.PostflightOptions{}
-	var postflightMigrationCmd = &cobra.Command{
-		Use:     "db-migration-check",
-		Short:   "check mongodb migration status on the cluster",
-		Long:    `check mongodb migration status on the cluster`,
-		Example: `qliksense postflight db-migration-check`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			pf := &postflight.QliksensePostflight{Q: q, P: postflightOpts, CG: &api.ClientGoUtils{Verbose: postflightOpts.Verbose}}
-
-			// Postflight db_migration_check
-			namespace, kubeConfigContents, err := pf.CG.LoadKubeConfigAndNamespace()
-			if err != nil {
-				fmt.Fprintf(out, "%s\n", Red("Postflight db_migration_check FAILED"))
-				fmt.Printf("Error: %v\n", err)
-				return nil
-			}
-			if namespace == "" {
-				namespace = "default"
-			}
-			if err = pf.DbMigrationCheck(namespace, kubeConfigContents); err != nil {
-				fmt.Fprintf(out, "%s\n", Red("Postflight db_migration_check FAILED"))
-				fmt.Printf("Error: %v\n", err)
-				return nil
-			}
-			fmt.Fprintf(out, "%s\n", Green("Postflight db_migration_check completed"))
-			return nil
-		},
-	}
-	f := postflightMigrationCmd.Flags()
-	f.BoolVarP(&postflightOpts.Verbose, "verbose", "v", false, "verbose mode")
-	return postflightMigrationCmd
-}
-
-func AllPostflightChecks(q *qliksense.Qliksense) *cobra.Command {
-	out := ansi.NewColorableStdout()
-	postflightOpts := &postflight.PostflightOptions{}
-	var postflightAllChecksCmd = &cobra.Command{
-		Use:     "all",
-		Short:   "perform all checks",
-		Long:    `perform all postflight checks`,
-		Example: `qliksense postflight all`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			pf := &postflight.QliksensePostflight{Q: q, P: postflightOpts, CG: &api.ClientGoUtils{Verbose: postflightOpts.Verbose}}
-
-			// run all postflight checks
-			fmt.Printf("Running all postflight checks...\n\n")
-			namespace, kubeConfigContents, err := pf.CG.LoadKubeConfigAndNamespace()
-			if err != nil {
-				fmt.Fprintf(out, "%s\n", Red("Unable to run all postflight checks"))
-				fmt.Printf("Error: %v\n", err)
-				return nil
-			}
-			if namespace == "" {
-				namespace = "default"
-			}
-			if err = pf.RunAllPostflightChecks(namespace, kubeConfigContents, postflightOpts); err != nil {
-				fmt.Fprintf(out, "%s\n", Red("1 or more preflight checks have FAILED"))
-				fmt.Printf("Completed running all postflight checks")
-				return nil
-			}
-			fmt.Fprintf(out, "%s\n", Green("All postflight checks have PASSED"))
-			return nil
-		},
-	}
-	f := postflightAllChecksCmd.Flags()
-	f.BoolVarP(&postflightOpts.Verbose, "verbose", "v", false, "verbose mode")
-	return postflightAllChecksCmd
-}
--- a/cmd/qliksense/preflight.go
+++ b/cmd/qliksense/preflight.go
@@ -5,7 +5,6 @@ import (

 	. "github.com/logrusorgru/aurora"
 	ansi "github.com/mattn/go-colorable"
-	"github.com/qlik-oss/sense-installer/pkg/api"
 	"github.com/qlik-oss/sense-installer/pkg/preflight"

 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
@@ -38,12 +37,12 @@ func pfDnsCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 		Long:    `perform preflight dns check to check DNS connectivity status in the cluster`,
 		Example: `qliksense preflight dns`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts, CG: &api.ClientGoUtils{Verbose: preflightOpts.Verbose}}
+			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts}

 			// Preflight DNS check
-			namespace, kubeConfigContents, err := qp.CG.LoadKubeConfigAndNamespace()
+			namespace, kubeConfigContents, err := preflight.InitPreflight()
 			if err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight DNS check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
@@ -51,11 +50,11 @@ func pfDnsCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 				namespace = "default"
 			}
 			if err = qp.CheckDns(namespace, kubeConfigContents, false); err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight DNS check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
-			fmt.Fprintf(out, "%s\n", Green("PASSED"))
+			fmt.Fprintf(out, "%s\n", Green("Preflight DNS check PASSED"))
 			return nil
 		},
 	}
@@ -71,26 +70,26 @@ func pfK8sVersionCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 	}

 	var preflightCheckK8sVersionCmd = &cobra.Command{
-		Use:     "k8s-version",
+		Use:     "kube-version",
 		Short:   "check kubernetes version",
 		Long:    `check minimum valid kubernetes version on the cluster`,
-		Example: `qliksense preflight k8s-version`,
+		Example: `qliksense preflight kube-version`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts, CG: &api.ClientGoUtils{Verbose: preflightOpts.Verbose}}
+			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts}

 			// Preflight Kubernetes minimum version check
-			namespace, kubeConfigContents, err := qp.CG.LoadKubeConfigAndNamespace()
+			namespace, kubeConfigContents, err := preflight.InitPreflight()
 			if err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight kubernetes minimum version check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
 			if err = qp.CheckK8sVersion(namespace, kubeConfigContents); err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight kubernetes minimum version check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
-			fmt.Fprintf(out, "%s\n", Green("PASSED"))
+			fmt.Fprintf(out, "%s\n", Green("Preflight kubernetes minimum version check PASSED"))
 			return nil
 		},
 	}
@@ -112,11 +111,11 @@ func pfAllChecksCmd(q *qliksense.Qliksense) *cobra.Command {
 		Long:    `perform all preflight checks on the target cluster`,
 		Example: `qliksense preflight all`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts, CG: &api.ClientGoUtils{Verbose: preflightOpts.Verbose}}
+			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts}

 			// Preflight run all checks
 			fmt.Printf("Running all preflight checks...\n\n")
-			namespace, kubeConfigContents, err := qp.CG.LoadKubeConfigAndNamespace()
+			namespace, kubeConfigContents, err := preflight.InitPreflight()
 			if err != nil {
 				fmt.Fprintf(out, "%s\n", Red("Unable to run the preflight checks suite"))
 				fmt.Printf("Error: %v\n", err)
@@ -152,12 +151,12 @@ func pfDeploymentCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 		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 {
-			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts, CG: &api.ClientGoUtils{Verbose: preflightOpts.Verbose}}
+			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts}

 			// Preflight deployments check
-			namespace, kubeConfigContents, err := qp.CG.LoadKubeConfigAndNamespace()
+			namespace, kubeConfigContents, err := preflight.InitPreflight()
 			if err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight deployment check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
@@ -165,11 +164,11 @@ func pfDeploymentCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 				namespace = "default"
 			}
 			if err = qp.CheckDeployment(namespace, kubeConfigContents, false); err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight deployment check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
-			fmt.Fprintf(out, "%s\n", Green("PASSED"))
+			fmt.Fprintf(out, "%s\n", Green("Preflight deployment check PASSED"))
 			return nil
 		},
 	}
@@ -190,12 +189,12 @@ func pfServiceCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 		Long:    `perform preflight service check to ensure that we are able to create services in the cluster`,
 		Example: `qliksense preflight service`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts, CG: &api.ClientGoUtils{Verbose: preflightOpts.Verbose}}
+			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts}

 			// Preflight service check
-			namespace, kubeConfigContents, err := qp.CG.LoadKubeConfigAndNamespace()
+			namespace, kubeConfigContents, err := preflight.InitPreflight()
 			if err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight service check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
@@ -204,11 +203,11 @@ func pfServiceCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 				namespace = "default"
 			}
 			if err = qp.CheckService(namespace, kubeConfigContents, false); err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight service check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
-			fmt.Fprintf(out, "%s\n", Green("PASSED"))
+			fmt.Fprintf(out, "%s\n", Green("Preflight service check PASSED"))
 			return nil
 		},
 	}
@@ -229,12 +228,12 @@ func pfPodCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 		Long:    `perform preflight pod check to ensure we can create pods in the cluster`,
 		Example: `qliksense preflight pod`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts, CG: &api.ClientGoUtils{Verbose: preflightOpts.Verbose}}
+			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts}

 			// Preflight pod check
-			namespace, kubeConfigContents, err := qp.CG.LoadKubeConfigAndNamespace()
+			namespace, kubeConfigContents, err := preflight.InitPreflight()
 			if err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight pod check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
@@ -242,11 +241,11 @@ func pfPodCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 				namespace = "default"
 			}
 			if err = qp.CheckPod(namespace, kubeConfigContents, false); err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight pod check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
-			fmt.Fprintf(out, "%s\n", Green("PASSED"))
+			fmt.Fprintf(out, "%s\n", Green("Preflight pod check PASSED"))
 			return nil
 		},
 	}
@@ -267,21 +266,21 @@ func pfCreateRoleCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 		Long:    `perform preflight role check to ensure we are able to create a role in the cluster`,
 		Example: `qliksense preflight createRole`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts, CG: &api.ClientGoUtils{Verbose: preflightOpts.Verbose}}
+			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts}

 			// Preflight role check
-			namespace, _, err := qp.CG.LoadKubeConfigAndNamespace()
+			namespace, _, err := preflight.InitPreflight()
 			if err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight role check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
 			if err = qp.CheckCreateRole(namespace, false); err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight role check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
-			fmt.Fprintf(out, "%s\n", Green("PASSED"))
+			fmt.Fprintf(out, "%s\n", Green("Preflight role check PASSED"))
 			return nil
 		},
 	}
@@ -302,21 +301,21 @@ func pfCreateRoleBindingCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 		Long:    `perform preflight rolebinding check to ensure we are able to create a rolebinding in the cluster`,
 		Example: `qliksense preflight rolebinding`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts, CG: &api.ClientGoUtils{Verbose: preflightOpts.Verbose}}
+			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts}

 			// Preflight createRoleBinding check
-			namespace, _, err := qp.CG.LoadKubeConfigAndNamespace()
+			namespace, _, err := preflight.InitPreflight()
 			if err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight rolebinding check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
 			if err = qp.CheckCreateRoleBinding(namespace, false); err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight rolebinding check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
-			fmt.Fprintf(out, "%s\n", Green("PASSED"))
+			fmt.Fprintf(out, "%s\n", Green("Preflight rolebinding check PASSED"))
 			return nil
 		},
 	}
@@ -337,21 +336,21 @@ func pfCreateServiceAccountCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 		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 {
-			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts, CG: &api.ClientGoUtils{Verbose: preflightOpts.Verbose}}
+			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts}

 			// Preflight createServiceAccount check
-			namespace, _, err := qp.CG.LoadKubeConfigAndNamespace()
+			namespace, _, err := preflight.InitPreflight()
 			if err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight ServiceAccount check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
 			if err = qp.CheckCreateServiceAccount(namespace, false); err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight ServiceAccount check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
-			fmt.Fprintf(out, "%s\n", Green("PASSED"))
+			fmt.Fprintf(out, "%s\n", Green("Preflight ServiceAccount check PASSED"))
 			return nil
 		},
 	}
@@ -371,21 +370,21 @@ func pfCreateAuthCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 		Long:    `perform preflight authcheck that combines the role, rolebinding and serviceaccount checks`,
 		Example: `qliksense preflight authcheck`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts, CG: &api.ClientGoUtils{Verbose: preflightOpts.Verbose}}
+			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts}

 			// Preflight authcheck
-			namespace, kubeConfigContents, err := qp.CG.LoadKubeConfigAndNamespace()
+			namespace, kubeConfigContents, err := preflight.InitPreflight()
 			if err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight authcheck FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
 			if err = qp.CheckCreateRB(namespace, kubeConfigContents); err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight authcheck FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
-			fmt.Fprintf(out, "%s\n", Green("PASSED"))
+			fmt.Fprintf(out, "%s\n", Green("Preflight authcheck PASSED"))
 			return nil
 		},
 	}
@@ -406,12 +405,12 @@ func pfMongoCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 		Long:    `perform preflight mongo check to ensure we are able to connect to a mongodb instance in the cluster`,
 		Example: `qliksense preflight mongo OR preflight mongo --url=<url>`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts, CG: &api.ClientGoUtils{Verbose: preflightOpts.Verbose}}
+			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts}

 			// Preflight mongo check
-			namespace, kubeConfigContents, err := qp.CG.LoadKubeConfigAndNamespace()
+			namespace, kubeConfigContents, err := preflight.InitPreflight()
 			if err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight mongo check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
@@ -419,11 +418,11 @@ func pfMongoCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 				namespace = "default"
 			}
 			if err = qp.CheckMongo(kubeConfigContents, namespace, preflightOpts, false); err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
+				fmt.Fprintf(out, "%s\n", Red("Preflight mongo check FAILED"))
 				fmt.Printf("Error: %v\n", err)
 				return nil
 			}
-			fmt.Fprintf(out, "%s\n", Green("PASSED"))
+			fmt.Fprintf(out, "%s\n", Green("Preflight mongo check PASSED"))
 			return nil
 		},
 	}
@@ -446,10 +445,10 @@ func pfCleanupCmd(q *qliksense.Qliksense) *cobra.Command {
 		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, CG: &api.ClientGoUtils{Verbose: preflightOpts.Verbose}}
+			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts}

 			// Preflight clean
-			namespace, kubeConfigContents, err := qp.CG.LoadKubeConfigAndNamespace()
+			namespace, kubeConfigContents, err := preflight.InitPreflight()
 			if err != nil {
 				fmt.Fprintf(out, "%s\n", Red("Preflight cleanup FAILED"))
 				fmt.Printf("Error: %v\n", err)
@@ -472,42 +471,3 @@ func pfCleanupCmd(q *qliksense.Qliksense) *cobra.Command {
 	f.BoolVarP(&preflightOpts.Verbose, "verbose", "v", false, "verbose mode")
 	return pfCleanCmd
 }
-
-func pfVerifyCAChainCmd(q *qliksense.Qliksense) *cobra.Command {
-	out := ansi.NewColorableStdout()
-	preflightOpts := &preflight.PreflightOptions{
-		MongoOptions: &preflight.MongoOptions{},
-	}
-
-	var pfVerifyCAChainCmd = &cobra.Command{
-		Use:     "verify-ca-chain",
-		Short:   "verify-ca-chain using openssl verify",
-		Long:    `verify the CA chain using openssl verify to ensure that mongodb certificate is valid`,
-		Example: `qliksense preflight verify-ca-chain`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q, P: preflightOpts, CG: &api.ClientGoUtils{Verbose: preflightOpts.Verbose}}
-
-			// Preflight service check
-			namespace, kubeConfigContents, err := qp.CG.LoadKubeConfigAndNamespace()
-			if err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
-				fmt.Printf("Error: %v\n", err)
-				return nil
-			}
-
-			if namespace == "" {
-				namespace = "default"
-			}
-			if err = qp.VerifyCAChain(kubeConfigContents, namespace, preflightOpts, false); err != nil {
-				fmt.Fprintf(out, "%s\n", Red("FAILED"))
-				fmt.Printf("Error: %v\n", err)
-				return nil
-			}
-			fmt.Fprintf(out, "%s\n", Green("PASSED"))
-			return nil
-		},
-	}
-	f := pfVerifyCAChainCmd.Flags()
-	f.BoolVarP(&preflightOpts.Verbose, "verbose", "v", false, "verbose mode")
-	return pfVerifyCAChainCmd
-}
--- a/cmd/qliksense/pull_push.go
+++ b/cmd/qliksense/pull_push.go
@@ -1,6 +1,9 @@
 package main

 import (
+	"errors"
+
+	qapi "github.com/qlik-oss/sense-installer/pkg/api"
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
 	"github.com/spf13/cobra"
 )
@@ -31,8 +34,22 @@ func pushQliksenseImages(q *qliksense.Qliksense) *cobra.Command {
 		Short:   "Push docker images for offline install",
 		Example: `qliksense push`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return q.PushImagesForCurrentCR()
+			if err := ensureImageRegistrySetInCR(q); err != nil {
+				return err
+			} else {
+				return q.PushImagesForCurrentCR()
+			}
 		},
 	}
 	return cmd
 }
+
+func ensureImageRegistrySetInCR(q *qliksense.Qliksense) error {
+	qConfig := qapi.NewQConfig(q.QliksenseHome)
+	if qcr, err := qConfig.GetCurrentCR(); err != nil {
+		return err
+	} else if registry := qcr.Spec.GetImageRegistry(); registry == "" {
+		return errors.New("no image registry set in the CR; to set it use: qliksense config set-image-registry")
+	}
+	return nil
+}
--- a/cmd/qliksense/root.go
+++ b/cmd/qliksense/root.go
@@ -2,6 +2,7 @@ package main

 import (
 	"fmt"
+	"io"
 	"log"
 	"os"
 	"path/filepath"
@@ -22,17 +23,17 @@ import (
 // qliksense <command>

 const (
-	qlikSenseHomeVar         = "QLIKSENSE_HOME"
-	qlikSenseDirVar          = ".qliksense"
-	cleanPatchFilesFlagName  = "clean"
-	cleanPatchFilesFlagUsage = "Set --clean=false to keep any prior config repo file changes on install (for debugging)"
-	pullFlagName             = "pull"
-	pullFlagShorthand        = "d"
-	pullFlagUsage            = "If using private docker registry, pull (download) all required qliksense images before install"
-	pushFlagName             = "push"
-	pushFlagShorthand        = "u"
-	pushFlagUsage            = "If using private docker registry, push (upload) all downloaded qliksense images to that registry before install"
-	rootCommandName          = "qliksense"
+	qlikSenseHomeVar        = "QLIKSENSE_HOME"
+	qlikSenseDirVar         = ".qliksense"
+	keepPatchFilesFlagName  = "keep-config-repo-patches"
+	keepPatchFilesFlagUsage = "Keep config repo patch files (for debugging)"
+	pullFlagName            = "pull"
+	pullFlagShorthand       = "d"
+	pullFlagUsage           = "If using private docker registry, pull (download) all required Qliksense images before install"
+	pushFlagName            = "push"
+	pushFlagShorthand       = "u"
+	pushFlagUsage           = "If using private docker registry, push (upload) all downloaded Qliksense images to that registry before install"
+	rootCommandName         = "qliksense"
 )

 func initAndExecute() error {
@@ -100,11 +101,12 @@ func commandUsesContext(commandName string) bool {
 func getRootCmd(p *qliksense.Qliksense) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   rootCommandName,
-		Short: "qliksense cli tool",
+		Short: "Qliksense cli tool",
 		Long:  `qliksense cli tool provides functionality to perform operations on qliksense-k8s, qliksense operator, and kubernetes cluster`,
 		Args:  cobra.ArbitraryArgs,
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			if commandUsesContext(cmd.CommandPath()) {
+				globalEulaPreRun(cmd, p)
 				if err := p.SetUpQliksenseDefaultContext(); err != nil {
 					panic(err)
 				}
@@ -112,10 +114,25 @@ func getRootCmd(p *qliksense.Qliksense) *cobra.Command {
 				if err := pf.Initialize(); err != nil {
 					panic(err)
 				}
+				globalEulaPostRun(cmd, p)
+			}
+		},
+		PersistentPostRun: func(cmd *cobra.Command, args []string) {
+			if commandUsesContext(cmd.CommandPath()) {
+				globalEulaPostRun(cmd, p)
 			}
 		},
 		SilenceUsage: true,
 	}
+	origHelpFunc := cmd.HelpFunc()
+	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		if !commandUsesContext(cmd.CommandPath()) {
+			cmd.Flags().MarkHidden("acceptEULA")
+		}
+		origHelpFunc(cmd, args)
+	})
+	accept := ""
+	cmd.PersistentFlags().StringVarP(&accept, "acceptEULA", "a", "", "Accept EULA for qliksense")
 	cmd.Flags().SetInterspersed(false)
 	return cmd
 }
@@ -151,9 +168,7 @@ func rootCmd(p *qliksense.Qliksense) *cobra.Command {
 	// add config command
 	configCmd := configCmd(p)
 	cmd.AddCommand(configCmd)
-	/** disabling for now
 	configCmd.AddCommand(configApplyCmd(p))
-	**/
 	configCmd.AddCommand(configViewCmd(p))

 	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
@@ -196,7 +211,7 @@ func rootCmd(p *qliksense.Qliksense) *cobra.Command {
 	crdsCmd.AddCommand(crdsViewCmd(p))
 	crdsCmd.AddCommand(crdsInstallCmd(p))

-	// add preflight commands
+	// add preflight command
 	preflightCmd := preflightCmd(p)
 	preflightCmd.AddCommand(pfDnsCheckCmd(p))
 	preflightCmd.AddCommand(pfK8sVersionCheckCmd(p))
@@ -209,26 +224,42 @@ func rootCmd(p *qliksense.Qliksense) *cobra.Command {
 	preflightCmd.AddCommand(pfCreateRoleBindingCheckCmd(p))
 	preflightCmd.AddCommand(pfCreateServiceAccountCheckCmd(p))
 	preflightCmd.AddCommand(pfCreateAuthCheckCmd(p))
-	preflightCmd.AddCommand(pfVerifyCAChainCmd(p))
 	preflightCmd.AddCommand(pfCleanupCmd(p))

 	cmd.AddCommand(preflightCmd)
 	cmd.AddCommand(loadCrFile(p))
 	cmd.AddCommand((applyCmd(p)))
-
-	// add postflight command
-	postflightCmd := postflightCmd(p)
-	postflightCmd.AddCommand(postflightMigrationCheck(p))
-	postflightCmd.AddCommand(AllPostflightChecks(p))
-
-	cmd.AddCommand(postflightCmd)
-
-	// add keys command
-	cmd.AddCommand(keysCmd)
-	keysCmd.AddCommand(keysRotateCmd(p))
 	return cmd
 }

+func copy(src, dst string) (int64, error) {
+	var (
+		source, destination *os.File
+		sourceFileStat      os.FileInfo
+		err                 error
+		nBytes              int64
+	)
+	if sourceFileStat, err = os.Stat(src); err != nil {
+		return 0, err
+	}
+
+	if !sourceFileStat.Mode().IsRegular() {
+		return 0, fmt.Errorf("%s is not a regular file", src)
+	}
+
+	if source, err = os.Open(src); err != nil {
+		return 0, err
+	}
+	defer source.Close()
+
+	if destination, err = os.Create(dst); err != nil {
+		return 0, err
+	}
+	defer destination.Close()
+	nBytes, err = io.Copy(destination, source)
+	return nBytes, err
+}
+
 func levenstein(cmd *cobra.Command) {
 	cmd.SuggestionsMinimumDistance = 2
 	if len(os.Args) > 1 {
--- a/docs/command_reference.md
+++ b/docs/command_reference.md
@@ -4,7 +4,7 @@

 Preflight checks provide pre-installation cluster conformance testing and validation before we install qliksense on the cluster. We gather a suite of conformance tests that can be easily written and run on the target cluster to verify that cluster-specific requirements are met.

-We support a couple of tests at the moment as part of preflight checks, and the range of the suite will be expanded in future.
+We support the following tests at the moment as part of preflight checks, and the range of the suite will be expanded in future.

 Run the following command to view help about the commands supported by preflight at any moment:
 ```
@@ -29,14 +29,6 @@ Run the following command to cleanup entities created for preflight checks that
 qliksense preflight clean
 ```

-### qliksense postflight
-Postflight checks are performed after qliksense is installed on the cluster and during normal operating mode of the product. Such checks can range from validating certain conditions to checking the status of certain operations or entities.
-
-Run the following command to view help about the commands supported by postflight at any moment:
-```
-qliksense postflight
-```
-
 ### qliksense load

 `qliksense load` command takes input from a file or from pipe
@@ -74,6 +66,7 @@ spec:
    - name: mongodbUri
      value: mongodb://qlik-test-mongodb:27017/qliksense?ssl=false
  profile: docker-desktop
+  rotateKeys: "yes"
 ```

 `qliksense apply` does everything `qliksense load` does but will install Qlik Sense into the cluster as well
@@ -129,6 +122,7 @@ In this case, the result of `qliksense about` command would display information

 It supports the following flags:

+- `qliksense config apply` - generate the patches and apply manifests to K8s
 - `qliksense config list-contexts` - get and list contexts
 - `qliksense config set` - configure a key-value pair into the current context
 - `qliksense config set-configs` - set configurations into qliksense context as key-value pairs
--- a/docs/concepts.md
+++ b/docs/concepts.md
@@ -1,6 +1,6 @@
 # How CLI works

-At the initialization, `qliksense` cli creates few files in the director `~/.qliksense` and it contains following files:
+At the initialization, `qliksense` cli creates few files in the director `~/.qliksene` and it contains following files:

 ```console
 .qliksense
@@ -25,6 +25,7 @@ spec:
    qliksense:
    - name: mongodbUri
      value: mongodb://qlik-default-mongodb:27017/qliksense?ssl=false
+  rotateKeys: "yes"
  releaseName: qlik-default
 ```

@@ -49,7 +50,7 @@ In this mode `qliksense` CLI downloads the specified version from [qliksense-k8s

 The qliksense cli creates a CR for the QlikSense operator and all config operations are performed to edit the CR.

-`qliksense install` will generate patches in local file system (i.e `~/.qliksense/contexts/<context-name>/qlik-k8s`) and
+`qliksense install` or `qliksense config apply` will generate patches in local file system (i.e `~/.qliksense/contexts/<context-name>/qlik-k8s`) and

 - Install those manifests into the cluster 
 - Create a custom resource (CR) for the `qliksene operator`.
@@ -67,7 +68,7 @@ qliksense config set git.repository="https://github.com/my-org/qliksense-k8s"
 qliksense config set git.accessToken="<mySecretToken>"
 ```

-When you perform `qliksense install`, qliksense operator performs these tasks:
+When you perform `qliksense install` or `qliksene config apply`, qliksense operator performs these tasks:

 - Download corresponding version of manifests from the your git repo
 - Generate kustomize patches
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -1,162 +1,53 @@
 # Getting started

-To get familiar with the Qlik Sense on Kubernetes Operator Command Line Interface (CLI), we will install Qlik Sense on Kubernetes on docker desktop. In subsequent sections we will enhance this configuration to include an Identity Provider (keycloak) and demonstrate air gapped capabilities as well.
-
 ## Requirements

 - Kubernetes cluster (Docker Desktop with enabled Kubernetes)
- `kubectl` installed, configured and able to communicate with kubernetes cluster. _`qliksense` CLI uses `kubectl` to perform some operations on cluster_
+- `kubectl` installed, configured and able to communicate with kubernetes cluster. _`qliksense` CLI uses `kubectl` under the hood to perform operations on cluster_

 ## Installing `qliksense` CLI

 Download the executable for your platform from [releases page](https://github.com/qlik-oss/sense-installer/releases) and rename it to `qliksense`

-=== "Linux"
+??? tldr "Linux"

    ``` bash
-    # bash
-
-    curl -LOJ https://storage.googleapis.com/kubernetes-release/release/v1.16.8/bin/linux/amd64/kubectl
-    curl -LOJ https://github.com/qlik-oss/sense-installer/releases/latest/download/qliksense-linux-amd64
-    sudo mv qliksense-linux-amd64 kubectl /usr/local/bin
-    sudo chmod ugo+x /usr/local/bin/qliksense-linux-amd64 /usr/local/bin/kubectl
-    sudo ln -s /usr/local/bin/qliksense-linux-amd64 /usr/local/bin/qliksense
-    sudo ln -s /usr/local/bin/qliksense-linux-amd64 /usr/local/bin/kubectl-qliksense
+    curl -Lo qliksense https://github.com/qlik-oss/sense-installer/releases/download/v0.7.0/qliksense-linux-amd64
+    chmod +x qliksense
+    sudo mv qliksense /usr/local/bin
    ```

-=== "MacOS"
+??? tldr "MacOS"

    ``` bash
-    # bash
-
-    curl -LOJ https://storage.googleapis.com/kubernetes-release/release/v1.16.8/bin/darwin/amd64/kubectl
-    curl -LOJ https://github.com/qlik-oss/sense-installer/releases/latest/download/qliksense-darwin-amd64
-    sudo mv qliksense-darwin-amd64 kubectl /usr/local/bin
-    sudo chmod ugo+x /usr/local/bin/qliksense-darwin-amd64 /usr/local/bin/kubectl
-    sudo ln -s /usr/local/bin/qliksense-darwin-amd64 /usr/local/bin/qliksense
-    sudo ln -s /usr/local/bin/qliksense-darwin-amd64 /usr/local/bin/kubectl-qliksense
+    curl -Lo qliksense https://github.com/qlik-oss/sense-installer/releases/download/v0.7.0/qliksense-darwin-amd64
+    chmod +x qliksense
+    sudo mv qliksense /usr/local/bin
    ```

-=== "Windows"
+??? tldr "Windows"
+    Download Windows executable and add it in your `PATH` as `qliksense.exe`

-    ``` powershell
-    # powershell
+    [https://github.com/qlik-oss/sense-installer/releases/download/v0.7.0/qliksense-windows-amd64.exe](https://github.com/qlik-oss/sense-installer/releases/download/v0.7.0/qliksense-windows-amd64.exe)
+    

-    Invoke-WebRequest https://storage.googleapis.com/kubernetes-release/release/v1.16.8/bin/windows/amd64/kubectl.exe -O C:\bin\kubectl.exe
-    Invoke-WebRequest https://github.com/qlik-oss/sense-installer/releases/latest/download/qliksense-windows-amd64.exe -O C:\bin\qliksense.exe
-    Copy-Item C:\bin\qliksense.exe C:\bin\kubectl-qliksense.exe
-    # Add C:\bin to current Path
-    $Env:Path += ";C:\bin"
-    # Save Path to User environment scope
-    [Environment]::SetEnvironmentVariable("Path",[Environment]::GetEnvironmentVariable("Path", [EnvironmentVariableTarget]::User) + ";C:\bin",[EnvironmentVariableTarget]::User)
-    ```

 ## Quick start

-### Setting the contexts
-
-By default a `qlik-default` configuration context is provided and can be used, as is.  In effect, this is the name of the Qlik Sense instance in the target cluster. All resources installed into the target namespace will be prefixed with `qlik-default`.  The name of the Qlik Sense application will correspondingly be `qliksense`.
-
-Ex.: To change this to `qliksense-dev`:
+- To download the version `v0.0.2` from qliksense-k8s [releases](https://github.com/qlik-oss/qliksense-k8s/releases).

 ```shell
-qliksense config set-context qliksense-dev
+qliksense fetch v0.0.2
 ```

-!!! info ""
-    For the purposes of the Quick Start we will be using `qlik-default`
-
-The target namespace is determined by the kubectl connection context.
-
-ex. Ensure a connection to cluster to change the configuration context's target namespace with kubectl to `qliksense`
+- To install CRDs for QSEoK and qliksense operator into the kubernetes cluster.

 ```shell
-kubectl config set-context --current --namespace=qliksense
+qliksense crds install --all
 ```

-!!! info ""
-    For the purposes of the Quick Start we will be using the default namespace. (`default`)
-
-### Downloading a version of Qlik Sense on Kubernetes
-
-To download the latest version of Qlik Sense on Kubernetes from qliksense-k8s
+- To install QSEoK into a namespace in the kubernetes cluster where `kubectl` is pointing to.

 ```shell
-qliksense fetch
-```
-
-#### More Options
-
- To download a specific version `v1.59.20` from qliksense-k8s [releases](https://github.com/qlik-oss/qliksense-k8s/releases)
-```shell
-qliksense fetch v1.58.20
-```
- To download from a GitHub repository fork of the `qliksense-k8s` repository (master branch)
-```shell
-qliksense fetch --url https://github.com/bkuschel/qliksense-k8s.git master
-```
-
-### Deployment Profiles
-
-Deployment profiles are a sets components that require sets of key/value pairs to satisfy the requirements for the generation of a Qlik Sense on Kubernetes manifest. Along with the profile name, sets of key/value pairs are provided through the Qlik Sense custom application resources (see here).
-
-Profiles can be developed and added to the qliksense-k8s repo but is considered an advanced topic (see here) not covered here.
-
-#### Default Profile: Docker Desktop
-
-By default, the `docker-desktop` profile is associated with the configuration context when initially created. This profile is guaranteed to work on Docker Desktop but can generally be used on other types of Kubernetes clusters, provided that the required configuration tweaks are provided specific to the hosting requirements (Ex. storage class).
-
-The docker-desktop profile does not have any scaling characteristics and is generally set up to have the ability to work on a reasonably powerful computer (16GB, 4 cores minimum, greater is better). It also includes a self-contained mongodb instance for non-production purposes.
-
-Generally it doesn't require any extra configuration to work except an acceptance of the Qlik User License Agreement (QULA), which is prompted on install but can also be set in advance (having read the QULA)
-
-```shell
-qliksense config set-configs qliksense.acceptEULA="yes"
-```
-
-More information on the possible configuration parameters for docker-desktop here (see here).
-
-!!! Info
-    To access an installation of the docker desktop profile in docker desktop, the host `elastic.example` needs to be added to the system host file as an alias to `127.0.0.1`
-
-    ```
-    127.0.0.1 elastic.example
-    ```
-
-    File location:
-
-    - Linux - `/etc/hosts`
-    - MacOS - `/etc/hosts`
-    - Windows - `C:\Windows\System32\drivers\etc\hosts`
-
-### Installing Qlik Sense on Kubernetes
-
-#### Custom Resource Definitions (CRDs)
-
-Besides the CLI, a Kubernetes operator (read here) is a core component of the Qlik Sense Operator. Additionally, there are other Kubernetes operators in Qlik Sense on Kubernetes that provide other types functionality (ex. scaling). Depending on the profile chosen [(see Deployment profiles)](#deployment-profiles), additional CRDs can also be installed for third-party components (see gke-demo).
-
-Kubernetes operators require Custom resource definitions (CRD) (read here), which are YAML schemas for custom resources (CR). The Qlik Sense application instance, corresponding to the name of the configuration context, corresponds to a CR (ex. `qlik-default`).
-
-CRDs require cluster scope permissions and are shared cluster-wide across namespaces. These need to be installed first (if not done previously).
-
-To install CRDs for Qlik Sense on Kubernetes into the Kubernetes cluster.
-
-```shell
-qliksense crds install
-```
-
-#### Preflight Checks
-
-To check that your environment fullfills Qlik Sense requirements
-
-```shell
-qliksense preflight all
-```
-
-#### Qlik Sense
-
-To install Qlik Sense into a namespace in the Kubernetes cluster where `kubectl` is pointing to
-
-```shell
-qliksense install
+qliksense install --acceptEULA="yes"
 ```
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,22 +1,15 @@
 # Overview

-The Qlik Sense on Kubernetes Operator CLI (`qliksense`)  facilitates:
+The Qlik Sense on Kubernetes CLI (`qliksense`) provides an imperative interface to many of the configurations that need to be applied against the declarative structure described in [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s).
+
+The CLI facilitates:

 - Installation of QSEoK
- Installation of Qliksense operator to manage the QSEoK installation
+- Installation of qliksense operator to manage QSEoK
 - Air gapped installation of QSEoK
- Cluster configuration management
- Pre-flight and Post-flight environment and configuration checks
-
-The Qlik Sense on Kubernetes Operator CLI provides an imperative interface to many of the configurations that need to be applied against the declarative structure described in the [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s) repository
-
-To get start quickly go to the [Getting Started page](getting_started.md).
-
-To learn more about the internal workings of the Qlik Sense on Kubernetes Operator, go to [How CLI works](concepts.md).

 !!! info ""
    This is a technology preview that uses Qlik modified [kustomize](https://github.com/qlik-oss/kustomize) for Kubernetes manifests on [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s) repository

-
 !!! info ""
    See QlikSense [edge releases on qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s/releases) repository
--- a/docs/postflight_checks.md
+++ b/docs/postflight_checks.md
@@ -1,51 +0,0 @@
-# Postflight checks
-Postflight checks are performed after qliksense is installed on the cluster and during normal operating mode of the product. Such checks can range from validating certain conditions to checking the status of certain operations or entities on the kubernetes cluster.
-
-Run the following command to view help about the commands supported by postflight at any moment:
-```
-$ qliksense postflight
-perform postflight checks on the cluster
-
-Usage:
-  qliksense postflight [command]
-
-Examples:
-qliksense postflight <postflight_check_to_run>
-
-Available Commands:
-  db-migration-check check mongodb migration status on the cluster
-
-Flags:
-  -h, --help      help for postflight
-  -v, --verbose   verbose mode
-```
-
-### Run all postflight checks
-This command runs all the postflight checks available.
-
-```shell
-$ qliksense postflight all  
-Running all postflight checks...
-
-Postflight db migration check... 
-Logs from pod: qliksense-users-6977cb7788-qlgmv
-{"caller":"main.go:39","environment":"qseok","error":"error parsing uri: scheme must be \"mongodb\" or \"mongodb+srv\"","level":"error","message":"failed to connect to ","timestamp":"2020-06-17T04:10:11.7891913Z","version":""}
-To view more logs in this context, please run the command: kubectl logs -n test_ns qliksense-users-6977cb7788-qlgmv migration
-PASSED
-
-All postflight checks have PASSED
-```
-
-### DB migration check
-This command checks init containers for successful database migrarion completions, and reports failure, if any to the user.
-
-An example run of this check produces an output as shown below:
-
-```shell
-$ qliksense postflight db-migration-check   
-Logs from pod: qliksense-users-6977cb7788-cxxwh
-{"caller":"main.go:39","environment":"qseok","error":"error parsing uri: scheme must be \"mongodb\" or \"mongodb+srv\"","level":"error","message":"failed to connect to ","timestamp":"2020-06-01T01:07:18.4170507Z","version":""}
-To view more logs in this context, please run the command: kubectl logs -n test_ns qliksense-users-6977cb7788-qlgmv migration
-PASSED
-Postflight db_migration_check completed
-```
--- a/docs/preflight_checks.md
+++ b/docs/preflight_checks.md
@@ -2,7 +2,7 @@

 Preflight checks provide pre-installation cluster conformance testing and validation before we install qliksense on the cluster. We gather a suite of conformance tests that can be easily written and run on the target cluster to verify that cluster-specific requirements are met.

-We support a couple of tests at the moment as part of preflight checks, and the range of the suite will be expanded in future.
+We support the following tests at the moment as part of preflight checks, and the range of the suite will be expanded in future.

 Run the following command to view help about the commands supported by preflight at any moment:
 ```shell
@@ -21,7 +21,7 @@ Available Commands:
  clean          perform preflight clean
  deployment     perform preflight deployment check
  dns            perform preflight dns check
-  k8s-version   check kubernetes version
+  kube-version   check kubernetes version
  mongo          preflight mongo OR preflight mongo --url=<url>
  pod            perform preflight pod check
  role           preflight create role check
@@ -305,21 +305,3 @@ Removing mongo check components...
 Preflight cleanup complete

 ```
-
-### Verify-ca-chain check
-We use the command below to verify the ca certificate chain and server certificate. We run this check over mongodbUrl and discoveryUrl we inferred from idpconfigs in the CR.
-```shell
-$ qliksense preflight preflight verify-ca-chain -v
-
-Preflight verify-ca-chain check... 
----------------------------------- 
-Openssl verify mongodbUrl:
-Mongodb url inferred form CR: <mongodbUrl_from_CR>
-Host: <host extracted from mongodbUrl>
-
-Openssl verify discoveryUrl:
-Discovery url: <discoveryUrl_from_CR>
-Host: <host extracted from discoveryUrl>
-Completed preflight verify-CA-chain check
-PASSED
-```
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ 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.20200612023448-4c1f2f38ea9b
+	sigs.k8s.io/kustomize/api => github.com/qlik-oss/kustomize/api v0.3.3-0.20200514233516-4ac83864b7bd
 )

 require (
@@ -22,7 +22,7 @@ require (
 	github.com/bugsnag/bugsnag-go v1.5.3 // indirect
 	github.com/containers/image/v5 v5.1.0
 	github.com/docker/go-metrics v0.0.1 // indirect
-	github.com/go-git/go-git/v5 v5.1.0
+	github.com/go-git/go-git/v5 v5.0.0
 	github.com/gobuffalo/envy v1.9.0 // indirect
 	github.com/gobuffalo/logger v1.0.3 // indirect
 	github.com/gobuffalo/packd v1.0.0 // indirect
@@ -40,22 +40,20 @@ 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.16
+	github.com/qlik-oss/k-apis v0.1.4
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/rogpeppe/go-internal v1.5.2 // indirect
 	github.com/spf13/cobra v0.0.6
 	github.com/spf13/viper v1.6.1
 	golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4 // indirect
 	golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a // indirect
-	golang.org/x/net v0.0.0-20200528225125-3c3fba18258b
+	golang.org/x/net v0.0.0-20200301022130-244492dfa37a
 	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
 	k8s.io/api v0.17.2
-	k8s.io/apiextensions-apiserver v0.17.2
 	k8s.io/apimachinery v0.17.2
 	k8s.io/client-go v11.0.0+incompatible
-	k8s.io/kubectl v0.17.2
 	sigs.k8s.io/kustomize/api v0.3.2
 	sigs.k8s.io/yaml v1.1.0
 )
--- a/go.sum
+++ b/go.sum
@@ -298,7 +298,6 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME
 github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
-github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/go-critic/go-critic v0.3.5-0.20190904082202-d79a9f0c64db/go.mod h1:+sE8vrLDS2M0pZkBk0wy6+nLdKexVDrl/jBqQOTDThA=
 github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
@@ -309,8 +308,6 @@ github.com/go-git/go-git-fixtures/v4 v4.0.1 h1:q+IFMfLx200Q3scvt2hN79JsEzy4AmBTp
 github.com/go-git/go-git-fixtures/v4 v4.0.1/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw=
 github.com/go-git/go-git/v5 v5.0.0 h1:k5RWPm4iJwYtfWoxIJy4wJX9ON7ihPeZZYC1fLYDnpg=
 github.com/go-git/go-git/v5 v5.0.0/go.mod h1:oYD8y9kWsGINPFJoLdaScGCN6dlKg23blmClfZwtUVA=
-github.com/go-git/go-git/v5 v5.1.0 h1:HxJn9g/E7eYvKW3Fm7Jt4ee8LXfPOm/H1cdDu8vEssk=
-github.com/go-git/go-git/v5 v5.1.0/go.mod h1:ZKfuPUoY1ZqIG4QG9BDBh3G4gLM5zvPuSJAozQrZuyM=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
@@ -371,7 +368,6 @@ github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2K
 github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4=
@@ -473,6 +469,10 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
+github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
+github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
+github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-replayers/grpcreplay v0.1.0 h1:eNb1y9rZFmY4ax45uEEECSa8fsxGRU+8Bil52ASAwic=
 github.com/google/go-replayers/grpcreplay v0.1.0/go.mod h1:8Ig2Idjpr6gifRd6pNVggX6TC1Zw6Jx74AKp7QNH2QE=
 github.com/google/go-replayers/httpreplay v0.1.0 h1:AX7FUb4BjrrzNvblr/OlgwrmFiep6soj5K2QSDW7BGk=
@@ -622,8 +622,6 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
 github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ=
 github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg=
-github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
@@ -885,10 +883,12 @@ 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.16 h1:R3gCZs4A3EHPNx4B7p1idWD+OhyaU/bAlGYBWc0ZNz4=
-github.com/qlik-oss/k-apis v0.1.16/go.mod h1:AkNa/kaZHpGVs9l+pHe6nvz99Sp9WO1f9ylBES95o+I=
-github.com/qlik-oss/kustomize/api v0.3.3-0.20200612023448-4c1f2f38ea9b h1:RDh3OZJOriy/ap1NUHVKsPG07N4DALaCzaqXFFK57T0=
-github.com/qlik-oss/kustomize/api v0.3.3-0.20200612023448-4c1f2f38ea9b/go.mod h1:zh3yFgE5zFk1kreqzVyyj1eXyIxQJT53l4zSg8Wt4SA=
+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/k-apis v0.1.4 h1:YXnjKXm/yhPblzYYyVCtD0dNbIkLPLlDdBKnjeYW0IY=
+github.com/qlik-oss/k-apis v0.1.4/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/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=
@@ -1051,7 +1051,6 @@ go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
 go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-go.mongodb.org/mongo-driver v1.1.2 h1:jxcFYjlkl8xaERsgLo+RNquI0epW6zuy/ZRQs6jnrFA=
 go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
@@ -1166,12 +1165,12 @@ golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8ou
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200528225125-3c3fba18258b h1:IYiJPiJfzktmDAO1HQiwjMjwjlYKHAL7KzeD544RJPs=
-golang.org/x/net v0.0.0-20200528225125-3c3fba18258b/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 h1:Wo7BWFiOk0QRFMLYMqJGFMd9CgUAcGx7V+qEg/h5IBI=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,13 +1,11 @@
 site_name: Qlik Sense on Kubernetes CLI
 repo_url: 'https://github.com/qlik-oss/sense-installer'
 strict: true
-
 theme:
  name: "material"
  palette:
    primary: 'green'
    accent: 'indigo'
-
 markdown_extensions:
  - toc:
      permalink: true
@@ -16,8 +14,6 @@ markdown_extensions:
  - pymdownx.inlinehilite
  - pymdownx.superfences
  - pymdownx.details
-  - pymdownx.tabbed
-
 nav:
  - Overview: index.md
  - getting_started.md
--- a/pkg/api/apis.go
+++ b/pkg/api/apis.go
@@ -144,17 +144,17 @@ func (cr *QliksenseCR) IsRepoExist() bool {
 }

 func (cr *QliksenseCR) GetFetchUrl() string {
-	if cr.Spec.Git == nil || cr.Spec.Git.Repository == "" {
+	if cr.Spec.FetchSource == nil || cr.Spec.FetchSource.Repository == "" {
 		return QLIK_GIT_REPO
 	}
-	return cr.Spec.Git.Repository
+	return cr.Spec.FetchSource.Repository
 }

 func (cr *QliksenseCR) GetFetchAccessToken(encryptionKey string) string {
-	if cr.Spec.Git == nil {
+	if cr.Spec.FetchSource == nil {
 		return ""
 	}
-	if tok, err := cr.Spec.Git.GetAccessToken(); err != nil {
+	if tok, err := cr.Spec.FetchSource.GetAccessToken(); err != nil {
 		fmt.Println(err)
 		return ""
 	} else if tok == "" {
@@ -171,29 +171,29 @@ func (cr *QliksenseCR) GetFetchAccessToken(encryptionKey string) string {
 }

 func (cr *QliksenseCR) SetFetchUrl(url string) {
-	if cr.Spec.Git == nil {
-		cr.Spec.Git = &config.Repo{}
+	if cr.Spec.FetchSource == nil {
+		cr.Spec.FetchSource = &config.Repo{}
 	}
-	cr.Spec.Git.Repository = url
+	cr.Spec.FetchSource.Repository = url
 }

 func (cr *QliksenseCR) SetFetchAccessToken(token, encryptionKey string) error {
-	if cr.Spec.Git == nil {
-		cr.Spec.Git = &config.Repo{}
+	if cr.Spec.FetchSource == nil {
+		cr.Spec.FetchSource = &config.Repo{}
 	}
 	res, err := EncryptData([]byte(token), encryptionKey)
 	if err != nil {
 		return err
 	}
-	cr.Spec.Git.AccessToken = b64.StdEncoding.EncodeToString(res)
+	cr.Spec.FetchSource.AccessToken = b64.StdEncoding.EncodeToString(res)
 	return nil
 }

 func (cr *QliksenseCR) SetFetchAccessSecretName(sec string) {
-	if cr.Spec.Git == nil {
-		cr.Spec.Git = &config.Repo{}
+	if cr.Spec.FetchSource == nil {
+		cr.Spec.FetchSource = &config.Repo{}
 	}
-	cr.Spec.Git.SecretName = sec
+	cr.Spec.FetchSource.SecretName = sec
 }

 //DeleteRepo delete the manifest repo and unset manifestsRoot
@@ -524,9 +524,9 @@ func (qc *QliksenseConfig) GetDecryptedCr(cr *QliksenseCR) (*QliksenseCR, error)
 	}
 	newCr.Spec.Secrets = finalSecrets

-	if newCr.Spec.Git != nil && newCr.Spec.Git.AccessToken != "" {
+	if newCr.Spec.FetchSource != nil && newCr.Spec.FetchSource.AccessToken != "" {
 		decData := cr.GetFetchAccessToken(encryptionKey)
-		newCr.Spec.Git.AccessToken = decData
+		newCr.Spec.FetchSource.AccessToken = decData
 	}
 	return newCr, nil
 }
--- a/pkg/api/apis_test.go
+++ b/pkg/api/apis_test.go
@@ -127,7 +127,7 @@ func TestGetDecryptedCr(t *testing.T) {
 	if decryptedValue == orignalValue {
 		t.Fail()
 	}
-	if newCr.Spec.Git.AccessToken != "mytoken" {
+	if newCr.Spec.FetchSource.AccessToken != "mytoken" {
 		t.Fail()
 	}
 	td()
--- a/pkg/api/clientgo_utils.go
+++ b/pkg/api/clientgo_utils.go
@@ -1,727 +0,0 @@
-package api
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"time"
-
-	"github.com/mitchellh/go-homedir"
-	appsv1 "k8s.io/api/apps/v1"
-	apiv1 "k8s.io/api/core/v1"
-	k8serrors "k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/client-go/util/retry"
-)
-
-var gracePeriod int64 = 0
-
-var waitTimeout = 2 * time.Minute
-
-type ClientGoUtils struct {
-	Verbose bool
-}
-
-func (p *ClientGoUtils) LogVerboseMessage(strMessage string, args ...interface{}) {
-	if p.Verbose || os.Getenv("QLIKSENSE_DEBUG") == "true" {
-		fmt.Printf(strMessage, args...)
-	}
-}
-
-func int32Ptr(i int32) *int32 { return &i }
-
-func (p *ClientGoUtils) LoadKubeConfigAndNamespace() (string, []byte, error) {
-	LogDebugMessage("Reading .kube/config file...")
-
-	homeDir, err := homedir.Dir()
-	if err != nil {
-		err = fmt.Errorf("Unable to deduce home dir")
-		return "", nil, err
-	}
-	LogDebugMessage("Kube config location: %s\n\n", filepath.Join(homeDir, ".kube", "config"))
-
-	kubeConfig := filepath.Join(homeDir, ".kube", "config")
-	kubeConfigContents, err := ioutil.ReadFile(kubeConfig)
-	if err != nil {
-		err = fmt.Errorf("Unable to deduce home dir")
-		return "", nil, err
-	}
-
-	// retrieve namespace
-	namespace := GetKubectlNamespace()
-	// if namespace comes back empty, we will run checks in the default namespace
-	if namespace == "" {
-		namespace = "default"
-	}
-
-	return namespace, kubeConfigContents, nil
-}
-
-func (p *ClientGoUtils) RetryOnError(mf func() error) error {
-	return retry.OnError(wait.Backoff{
-		Duration: 1 * time.Second,
-		Factor:   1,
-		Jitter:   0.1,
-		Steps:    5,
-	}, func(err error) bool {
-		return k8serrors.IsConflict(err) || k8serrors.IsGone(err) || k8serrors.IsServerTimeout(err) ||
-			k8serrors.IsServiceUnavailable(err) || k8serrors.IsTimeout(err) || k8serrors.IsTooManyRequests(err)
-	}, mf)
-}
-
-func (p *ClientGoUtils) GetK8SClientSet(kubeconfig []byte, contextName string) (*kubernetes.Clientset, *rest.Config, error) {
-	var clientConfig *rest.Config
-	var err error
-	if len(kubeconfig) == 0 {
-		clientConfig, err = rest.InClusterConfig()
-		if err != nil {
-			err = fmt.Errorf("Unable to load in-cluster kubeconfig: %w", err)
-			return nil, nil, err
-		}
-	} else {
-		config, err := clientcmd.Load(kubeconfig)
-		if err != nil {
-			err = fmt.Errorf("Unable to load kubeconfig: %w", err)
-			return nil, nil, err
-		}
-		if contextName != "" {
-			config.CurrentContext = contextName
-		}
-		clientConfig, err = clientcmd.NewDefaultClientConfig(*config, &clientcmd.ConfigOverrides{}).ClientConfig()
-		if err != nil {
-			err = fmt.Errorf("Unable to create client config from config: %w", err)
-			return nil, nil, err
-		}
-	}
-	clientset, err := kubernetes.NewForConfig(clientConfig)
-	if err != nil {
-		err = fmt.Errorf("Unable to create clientset: %w", err)
-		return nil, nil, err
-	}
-	return clientset, clientConfig, nil
-}
-
-func (p *ClientGoUtils) CreatePreflightTestDeployment(clientset kubernetes.Interface, namespace string, depName string, imageName string) (*appsv1.Deployment, error) {
-	deploymentsClient := clientset.AppsV1().Deployments(namespace)
-	deployment := &appsv1.Deployment{
-		ObjectMeta: v1.ObjectMeta{
-			Name: depName,
-		},
-		Spec: appsv1.DeploymentSpec{
-			Replicas: int32Ptr(1),
-			Selector: &v1.LabelSelector{
-				MatchLabels: map[string]string{
-					"app": "preflight-check",
-				},
-			},
-			Template: apiv1.PodTemplateSpec{
-				ObjectMeta: v1.ObjectMeta{
-					Labels: map[string]string{
-						"app":   "preflight-check",
-						"label": "preflight-check-label",
-					},
-				},
-				Spec: apiv1.PodSpec{
-					Containers: []apiv1.Container{
-						{
-							Name:  "dep",
-							Image: imageName,
-							Ports: []apiv1.ContainerPort{
-								{
-									Name:          "http",
-									Protocol:      apiv1.ProtocolTCP,
-									ContainerPort: 80,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	// Create Deployment
-	var result *appsv1.Deployment
-	if err := p.RetryOnError(func() (err error) {
-		result, err = deploymentsClient.Create(deployment)
-		return err
-	}); err != nil {
-		err = fmt.Errorf("unable to create deployments in the %s namespace: %w", namespace, err)
-		return nil, err
-	}
-	p.LogVerboseMessage("Created deployment %q\n", result.GetObjectMeta().GetName())
-
-	return deployment, nil
-}
-
-func (p *ClientGoUtils) getDeployment(clientset kubernetes.Interface, namespace, depName string) (*appsv1.Deployment, error) {
-	deploymentsClient := clientset.AppsV1().Deployments(namespace)
-	var deployment *appsv1.Deployment
-	if err := p.RetryOnError(func() (err error) {
-		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)
-		LogDebugMessage("%v\n", err)
-		return nil, err
-	}
-	return deployment, nil
-}
-
-func (p *ClientGoUtils) DeleteDeployment(clientset kubernetes.Interface, namespace, name string) error {
-	deploymentsClient := clientset.AppsV1().Deployments(namespace)
-	// Create Deployment
-	deletePolicy := v1.DeletePropagationForeground
-	deleteOptions := v1.DeleteOptions{
-		PropagationPolicy:  &deletePolicy,
-		GracePeriodSeconds: &gracePeriod,
-	}
-
-	if err := p.RetryOnError(func() (err error) {
-		return deploymentsClient.Delete(name, &deleteOptions)
-	}); err != nil {
-		return err
-	}
-	if err := p.WaitForDeploymentToDelete(clientset, namespace, name); err != nil {
-		return err
-	}
-	p.LogVerboseMessage("Deleted deployment: %s\n", name)
-	return nil
-}
-
-func (p *ClientGoUtils) CreatePreflightTestService(clientset kubernetes.Interface, namespace string, svcName string) (*apiv1.Service, error) {
-	iptr := int32Ptr(80)
-	servicesClient := clientset.CoreV1().Services(namespace)
-	service := &apiv1.Service{
-		ObjectMeta: v1.ObjectMeta{
-			Name:      svcName,
-			Namespace: namespace,
-			Labels: map[string]string{
-				"app": "preflight-check",
-			},
-		},
-		Spec: apiv1.ServiceSpec{
-			Ports: []apiv1.ServicePort{
-				{Name: "port1",
-					Port: *iptr,
-				},
-			},
-			Selector: map[string]string{
-				"app": "preflight-check",
-			},
-			ClusterIP: "",
-		},
-	}
-	var result *apiv1.Service
-	if err := p.RetryOnError(func() (err error) {
-		result, err = servicesClient.Create(service)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-	p.LogVerboseMessage("Created service %q\n", result.GetObjectMeta().GetName())
-
-	return service, nil
-}
-
-func (p *ClientGoUtils) GetService(clientset kubernetes.Interface, namespace, svcName string) (*apiv1.Service, error) {
-	servicesClient := clientset.CoreV1().Services(namespace)
-	var svc *apiv1.Service
-	if err := p.RetryOnError(func() (err error) {
-		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)
-		return nil, err
-	}
-
-	return svc, nil
-}
-
-func (p *ClientGoUtils) DeleteService(clientset kubernetes.Interface, namespace, name string) error {
-	servicesClient := clientset.CoreV1().Services(namespace)
-	// Create Deployment
-	deletePolicy := v1.DeletePropagationForeground
-	deleteOptions := v1.DeleteOptions{
-		PropagationPolicy: &deletePolicy,
-	}
-	if err := p.RetryOnError(func() (err error) {
-		return servicesClient.Delete(name, &deleteOptions)
-	}); err != nil {
-		return err
-	}
-	p.LogVerboseMessage("Deleted service: %s\n", name)
-	return nil
-}
-
-func (p *ClientGoUtils) DeletePod(clientset kubernetes.Interface, namespace, name string) error {
-
-	podsClient := clientset.CoreV1().Pods(namespace)
-	deletePolicy := v1.DeletePropagationForeground
-	deleteOptions := v1.DeleteOptions{
-		PropagationPolicy:  &deletePolicy,
-		GracePeriodSeconds: &gracePeriod,
-	}
-	if err := p.RetryOnError(func() (err error) {
-		return podsClient.Delete(name, &deleteOptions)
-	}); err != nil {
-		return err
-	}
-	if err := p.waitForPodToDelete(clientset, namespace, name); err != nil {
-		return err
-	}
-	p.LogVerboseMessage("Deleted pod: %s\n", name)
-	return nil
-}
-
-func (p *ClientGoUtils) CreatePreflightTestPod(clientset kubernetes.Interface, namespace, podName, imageName string, secretNames map[string]string, commandToRun []string) (*apiv1.Pod, error) {
-	// build the pod definition we want to deploy
-	pod := &apiv1.Pod{
-		ObjectMeta: v1.ObjectMeta{
-			Name:      podName,
-			Namespace: namespace,
-			Labels: map[string]string{
-				"app": "preflight",
-			},
-		},
-		Spec: apiv1.PodSpec{
-			RestartPolicy: apiv1.RestartPolicyNever,
-			Containers: []apiv1.Container{
-				{
-					Name:            "cnt",
-					Image:           imageName,
-					ImagePullPolicy: apiv1.PullIfNotPresent,
-					Command:         commandToRun,
-				},
-			},
-		},
-	}
-	if len(secretNames) > 0 {
-		for secretName, mountPath := range secretNames {
-			pod.Spec.Volumes = append(pod.Spec.Volumes, apiv1.Volume{
-				Name: secretName,
-				VolumeSource: apiv1.VolumeSource{
-					Secret: &apiv1.SecretVolumeSource{
-						SecretName: secretName,
-						Items: []apiv1.KeyToPath{
-							{
-								Key:  secretName,
-								Path: filepath.Base(mountPath),
-							},
-						},
-					},
-				},
-			})
-			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),
-					ReadOnly:  true,
-				})
-			}
-		}
-	}
-
-	// now create the pod in kubernetes cluster using the clientset
-	if err := p.RetryOnError(func() (err error) {
-		pod, err = clientset.CoreV1().Pods(namespace).Create(pod)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-	p.LogVerboseMessage("Created pod: %s\n", pod.Name)
-	return pod, nil
-}
-
-func (p *ClientGoUtils) getPod(clientset kubernetes.Interface, namespace, podName string) (*apiv1.Pod, error) {
-	LogDebugMessage("Fetching pod: %s\n", podName)
-	var pod *apiv1.Pod
-	if err := p.RetryOnError(func() (err error) {
-		pod, err = clientset.CoreV1().Pods(namespace).Get(podName, v1.GetOptions{})
-		return err
-	}); err != nil {
-		LogDebugMessage("%v\n", err)
-		return nil, err
-	}
-	return pod, nil
-}
-
-func (p *ClientGoUtils) GetPodLogs(clientset kubernetes.Interface, pod *apiv1.Pod) (string, error) {
-	return p.GetPodContainerLogs(clientset, pod, "")
-}
-
-func (p *ClientGoUtils) GetPodContainerLogs(clientset kubernetes.Interface, pod *apiv1.Pod, container string) (string, error) {
-	podLogOpts := apiv1.PodLogOptions{}
-	if container != "" {
-		podLogOpts.Container = container
-	}
-
-	LogDebugMessage("Retrieving logs for pod: %s   namespace: %s\n", pod.GetName(), pod.Namespace)
-	req := clientset.CoreV1().Pods(pod.Namespace).GetLogs(pod.Name, &podLogOpts)
-	podLogs, err := req.Stream()
-	if err != nil {
-		return "", err
-	}
-	defer podLogs.Close()
-	buf := new(bytes.Buffer)
-	_, err = io.Copy(buf, podLogs)
-	if err != nil {
-		return "", err
-	}
-	LogDebugMessage("Log from pod: %s\n", buf.String())
-	return buf.String(), nil
-}
-
-func (p *ClientGoUtils) waitForResource(checkFunc func() (interface{}, error), validateFunc func(interface{}) bool) error {
-	timeout := time.NewTicker(waitTimeout)
-	defer timeout.Stop()
-OUT:
-	for {
-		r, err := checkFunc()
-		if err != nil {
-			return err
-		}
-		select {
-		case <-timeout.C:
-			break OUT
-		default:
-			if validateFunc(r) {
-				break OUT
-			}
-		}
-		time.Sleep(5 * time.Second)
-	}
-	return nil
-}
-
-func (p *ClientGoUtils) WaitForDeployment(clientset kubernetes.Interface, namespace string, pfDeployment *appsv1.Deployment) error {
-	var err error
-	depName := pfDeployment.GetName()
-	checkFunc := func() (interface{}, error) {
-		pfDeployment, err = p.getDeployment(clientset, namespace, depName)
-		if err != nil {
-			err = fmt.Errorf("unable to retrieve deployment: %s\n", depName)
-			return nil, err
-		}
-		return pfDeployment, nil
-	}
-	validateFunc := func(data interface{}) bool {
-		d := data.(*appsv1.Deployment)
-		return int(d.Status.ReadyReplicas) > 0
-	}
-	if err := p.waitForResource(checkFunc, validateFunc); err != nil {
-		return err
-	}
-	if int(pfDeployment.Status.ReadyReplicas) == 0 {
-		err = fmt.Errorf("deployment took longer than expected to spin up pods")
-		return err
-	}
-	return nil
-}
-
-func (p *ClientGoUtils) WaitForPod(clientset kubernetes.Interface, namespace string, pod *apiv1.Pod) error {
-	var err error
-	if len(pod.Spec.Containers) == 0 {
-		err = fmt.Errorf("there are no containers in the pod")
-		return err
-	}
-	podName := pod.Name
-	checkFunc := func() (interface{}, error) {
-		pod, err = p.getPod(clientset, namespace, podName)
-		if err != nil {
-			err = fmt.Errorf("unable to retrieve %s pod by name", podName)
-			return nil, err
-		}
-		return pod, nil
-	}
-	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
-	}
-
-	if err := p.waitForResource(checkFunc, validateFunc); err != nil {
-		return err
-	}
-	if pod.Status.Phase != apiv1.PodRunning && pod.Status.Phase != apiv1.PodSucceeded && pod.Status.Phase != apiv1.PodFailed {
-		err = fmt.Errorf("container is taking much longer than expected")
-		return err
-	}
-	return nil
-}
-
-func (p *ClientGoUtils) WaitForPodToDie(clientset kubernetes.Interface, namespace string, pod *apiv1.Pod) error {
-	podName := pod.Name
-	checkFunc := func() (interface{}, error) {
-		po, err := p.getPod(clientset, namespace, podName)
-		if err != nil {
-			err = fmt.Errorf("unable to retrieve %s pod by name", podName)
-			return nil, err
-		}
-		return po, nil
-	}
-	validateFunc := func(r interface{}) bool {
-		po := r.(*apiv1.Pod)
-		return po.Status.Phase == apiv1.PodFailed || po.Status.Phase == apiv1.PodSucceeded
-	}
-	if err := p.waitForResource(checkFunc, validateFunc); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (p *ClientGoUtils) waitForPodToDelete(clientset kubernetes.Interface, namespace, podName string) error {
-	checkFunc := func() (interface{}, error) {
-		po, err := p.getPod(clientset, namespace, podName)
-		if err != nil {
-			return nil, err
-		}
-		return po, nil
-	}
-	validateFunc := func(po interface{}) bool {
-		return false
-	}
-	if err := p.waitForResource(checkFunc, validateFunc); err != nil {
-		return nil
-	}
-	err := fmt.Errorf("delete pod is taking unusually long")
-	return err
-}
-
-func (p *ClientGoUtils) WaitForDeploymentToDelete(clientset kubernetes.Interface, namespace, deploymentName string) error {
-	checkFunc := func() (interface{}, error) {
-		dep, err := p.getDeployment(clientset, namespace, deploymentName)
-		if err != nil {
-			return nil, err
-		}
-		return dep, nil
-	}
-	validateFunc := func(po interface{}) bool {
-		return false
-	}
-	if err := p.waitForResource(checkFunc, validateFunc); err != nil {
-		return nil
-	}
-	err := fmt.Errorf("delete deployment is taking unusually long")
-	return err
-}
-
-func (p *ClientGoUtils) CreatePreflightTestSecret(clientset kubernetes.Interface, namespace, secretName string, secretData []byte) (*apiv1.Secret, error) {
-	var secret *apiv1.Secret
-	var err error
-	// build the secret defination we want to create
-	secretSpec := &apiv1.Secret{
-		ObjectMeta: v1.ObjectMeta{
-			Name:      secretName,
-			Namespace: namespace,
-			Labels: map[string]string{
-				"app": "preflight",
-			},
-		},
-		Data: map[string][]byte{
-			secretName: secretData,
-		},
-	}
-
-	// now create the secret in kubernetes cluster using the clientset
-	if err = p.RetryOnError(func() (err error) {
-		secret, err = clientset.CoreV1().Secrets(namespace).Create(secretSpec)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-	p.LogVerboseMessage("Created Secret: %s\n", secret.Name)
-	return secret, nil
-}
-
-func (p *ClientGoUtils) DeleteK8sSecret(clientset kubernetes.Interface, namespace string, secretName string) error {
-	secretClient := clientset.CoreV1().Secrets(namespace)
-
-	deletePolicy := v1.DeletePropagationForeground
-	deleteOptions := v1.DeleteOptions{
-		PropagationPolicy: &deletePolicy,
-	}
-	err := secretClient.Delete(secretName, &deleteOptions)
-	if err != nil {
-		return err
-	}
-	p.LogVerboseMessage("Deleted Secret: %s\n", secretName)
-	return nil
-}
-
-func (p *ClientGoUtils) CreateStatefulSet(clientset kubernetes.Interface, namespace string, statefulSetName string, imageName string) (*appsv1.StatefulSet, error) {
-	statefulSetsClient := clientset.AppsV1().StatefulSets(namespace)
-	statefulset := &appsv1.StatefulSet{
-		ObjectMeta: v1.ObjectMeta{
-			Name: statefulSetName,
-		},
-		Spec: appsv1.StatefulSetSpec{
-			Replicas: int32Ptr(1),
-			Selector: &v1.LabelSelector{
-				MatchLabels: map[string]string{
-					"app": "postflight-check",
-				},
-			},
-			Template: apiv1.PodTemplateSpec{
-				ObjectMeta: v1.ObjectMeta{
-					Labels: map[string]string{
-						"app":   "postflight-check",
-						"label": "postflight-check-label",
-					},
-				},
-				Spec: apiv1.PodSpec{
-					InitContainers: []apiv1.Container{
-						{
-							Name:            "migration",
-							Image:           "ubuntu",
-							ImagePullPolicy: apiv1.PullIfNotPresent,
-							// Command:         []string{"bash", "-c", "for i in {1..10}; do echo \"from init container...\"; sleep 1; done"},
-							Command: []string{"bash", "-c", "for i in {1..10}; do echo \"from init container...\"; sleep 1; exit 1; done"},
-						},
-					},
-					Containers: []apiv1.Container{
-						{
-							Name:  "statefulset",
-							Image: imageName,
-							Ports: []apiv1.ContainerPort{
-								{
-									Name:          "http",
-									Protocol:      apiv1.ProtocolTCP,
-									ContainerPort: 80,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	// Create Statefulset
-	var result *appsv1.StatefulSet
-	if err := p.RetryOnError(func() (err error) {
-		result, err = statefulSetsClient.Create(statefulset)
-		return err
-	}); err != nil {
-		err = fmt.Errorf("unable to create statefulsets in the %s namespace: %w", namespace, err)
-		return nil, err
-	}
-	LogDebugMessage("Created statefulset %q\n", result.GetObjectMeta().GetName())
-
-	return statefulset, nil
-}
-
-func (p *ClientGoUtils) waitForStatefulSet(clientset kubernetes.Interface, namespace string, pfStatefulset *appsv1.StatefulSet) error {
-	var err error
-	statefulsetName := pfStatefulset.GetName()
-	checkFunc := func() (interface{}, error) {
-		pfStatefulset, err = p.getStatefulset(clientset, namespace, statefulsetName)
-		if err != nil {
-			err = fmt.Errorf("unable to retrieve stateful set: %s\n", statefulsetName)
-			return nil, err
-		}
-		return pfStatefulset, nil
-	}
-	validateFunc := func(data interface{}) bool {
-		s := data.(*appsv1.StatefulSet)
-		return int(s.Status.ReadyReplicas) > 0
-	}
-	if err := p.waitForResource(checkFunc, validateFunc); err != nil {
-		return err
-	}
-	if int(pfStatefulset.Status.ReadyReplicas) == 0 {
-		err = fmt.Errorf("deployment took longer than expected to spin up pods")
-		return err
-	}
-	return nil
-}
-
-func (p *ClientGoUtils) getStatefulset(clientset kubernetes.Interface, namespace, statefulsetName string) (*appsv1.StatefulSet, error) {
-	statefulsetsClient := clientset.AppsV1().StatefulSets(namespace)
-	var statefulset *appsv1.StatefulSet
-	if err := p.RetryOnError(func() (err error) {
-		statefulset, err = statefulsetsClient.Get(statefulsetName, v1.GetOptions{})
-		return err
-	}); err != nil {
-		err = fmt.Errorf("unable to get statefulsets in the %s namespace: %w", namespace, err)
-		fmt.Printf("%v\n", err)
-		return nil, err
-	}
-	return statefulset, nil
-}
-
-func (p *ClientGoUtils) deleteStatefulSet(clientset kubernetes.Interface, namespace, name string) error {
-	statefulsetClient := clientset.AppsV1().StatefulSets(namespace)
-
-	deletePolicy := v1.DeletePropagationForeground
-	deleteOptions := v1.DeleteOptions{
-		PropagationPolicy:  &deletePolicy,
-		GracePeriodSeconds: &gracePeriod,
-	}
-
-	if err := p.RetryOnError(func() (err error) {
-		return statefulsetClient.Delete(name, &deleteOptions)
-	}); err != nil {
-		return err
-	}
-	if err := p.waitForStatefulsetToDelete(clientset, namespace, name); err != nil {
-		return err
-	}
-	LogDebugMessage("Deleted statefulset: %s\n", name)
-	return nil
-}
-
-func (p *ClientGoUtils) waitForStatefulsetToDelete(clientset kubernetes.Interface, namespace, statefulsetName string) error {
-	checkFunc := func() (interface{}, error) {
-		statefulset, err := p.getStatefulset(clientset, namespace, statefulsetName)
-		if err != nil {
-			return nil, err
-		}
-		return statefulset, nil
-	}
-	validateFunc := func(po interface{}) bool {
-		return false
-	}
-	if err := p.waitForResource(checkFunc, validateFunc); err != nil {
-		return nil
-	}
-	err := fmt.Errorf("delete statefulset is taking unusually long")
-	return err
-}
-
-func (p *ClientGoUtils) GetPodsAndPodLogsFromFailedInitContainer(clientset kubernetes.Interface, lbls map[string]string, namespace, containerName string) (map[string]string, error) {
-	set := labels.Set(lbls)
-	listOptions := v1.ListOptions{LabelSelector: set.AsSelector().String()}
-	podList, err := clientset.CoreV1().Pods(namespace).List(listOptions)
-	if err != nil {
-		err = fmt.Errorf("unable to get podlist: %v", err)
-		fmt.Printf("%s\n", err)
-	}
-	LogDebugMessage("%d Pods retrieved\n ", len(podList.Items))
-
-	// var logs map[string]string
-	logs := map[string]string{}
-	for _, pod := range podList.Items {
-		LogDebugMessage("pod: %v\n", pod.GetName())
-		LogDebugMessage("%d init containers retrieved\n", len(pod.Spec.InitContainers))
-		for _, cs := range pod.Status.InitContainerStatuses {
-			if cs.Name == containerName && ((cs.State.Terminated != nil && (cs.State.Terminated.Reason != "Completed" || cs.State.Terminated.ExitCode > 0)) ||
-				(cs.LastTerminationState.Terminated != nil && (cs.LastTerminationState.Terminated.Reason != "Completed" || cs.LastTerminationState.Terminated.ExitCode > 0))) {
-				logs[pod.GetName()], err = p.GetPodContainerLogs(clientset, &pod, cs.Name)
-				if err != nil {
-					err = fmt.Errorf("unable to get pod logs: %v", err)
-					fmt.Printf("%s\n", err)
-					return nil, err
-				}
-			}
-		}
-	}
-	return logs, nil
-}
--- a/pkg/api/clientgo_utils_test.go
+++ b/pkg/api/clientgo_utils_test.go
--- a/pkg/api/context_apis.go
+++ b/pkg/api/context_apis.go
@@ -7,7 +7,6 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
-	"strings"

 	"github.com/qlik-oss/k-apis/pkg/config"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -23,6 +22,7 @@ const (
 	QliksenseKind           = "Qliksense"
 	QliksenseGroup          = "qlik.com"
 	QliksenseDefaultProfile = "docker-desktop"
+	DefaultRotateKeys       = "yes"
 	QliksenseMetadataName   = "QliksenseConfigMetadata"
 	DefaultMongodbUri       = "mongodb://qlik-default-mongodb:27017/qliksense?ssl=false"
 	DefaultMongodbUriKey    = "mongodbUri"
@@ -37,9 +37,10 @@ func (qliksenseCR *QliksenseCR) AddCommonConfig(contextName string) {
 	})
 	qliksenseCR.SetName(contextName)
 	qliksenseCR.Spec = &config.CRSpec{
-		Profile: QliksenseDefaultProfile,
+		Profile:    QliksenseDefaultProfile,
+		RotateKeys: DefaultRotateKeys,
 	}
-	qliksenseCR.Spec.AddToSecrets("qliksense", DefaultMongodbUriKey, strings.Replace(DefaultMongodbUri, "qlik-default", contextName, 1), "")
+	qliksenseCR.Spec.AddToSecrets("qliksense", DefaultMongodbUriKey, DefaultMongodbUri, "")
 }

 // AddBaseQliksenseConfigs adds configs into config.yaml
--- a/pkg/api/context_apis_test.go
+++ b/pkg/api/context_apis_test.go
@@ -2,7 +2,6 @@ package api

 import (
 	"reflect"
-	"strings"
 	"testing"

 	"github.com/qlik-oss/k-apis/pkg/config"
@@ -23,11 +22,12 @@ func TestAddCommonConfig(t *testing.T) {
 	q.SetName("myqliksense")
 	q.SetGroupVersionKind(gvk)
 	q.Spec = &config.CRSpec{
-		Profile: QliksenseDefaultProfile,
+		Profile:    QliksenseDefaultProfile,
+		RotateKeys: DefaultRotateKeys,
 		Secrets: map[string]config.NameValues{
 			"qliksense": []config.NameValue{{
 				Name:  DefaultMongodbUriKey,
-				Value: strings.Replace(DefaultMongodbUri, "qlik-default", "myqliksense", 1),
+				Value: DefaultMongodbUri,
 			},
 			},
 		},
--- a/pkg/api/copy_test.go
+++ b/pkg/api/copy_test.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"regexp"
 	"testing"

 	kapis_git "github.com/qlik-oss/k-apis/pkg/git"
@@ -61,7 +60,7 @@ func TestCopyDirectory_withGit_withKuz(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}

-	if err := kapis_git.Checkout(repo2, "v0.0.8", "", nil); err != nil {
+	if err := kapis_git.Checkout(repo2, "v0.0.2", "", nil); err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}

@@ -70,7 +69,7 @@ func TestCopyDirectory_withGit_withKuz(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}

-	if err := kapis_git.Checkout(repo1, "v0.0.8", "", nil); err != nil {
+	if err := kapis_git.Checkout(repo1, "v0.0.2", "", nil); err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}

@@ -79,15 +78,9 @@ func TestCopyDirectory_withGit_withKuz(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}

-	re, err := regexp.Compile(`name: qliksense-ca-certificates-[a-z]{5}`)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	repo1ManifestTweaked := re.ReplaceAllString(string(repo1Manifest), "name: qliksense-ca-certificates")
-	repo2ManifestTweaked := re.ReplaceAllString(string(repo2Manifest), "name: qliksense-ca-certificates")
-	if repo2ManifestTweaked != repo1ManifestTweaked {
-		t.Logf("manifest generated on the original config:\n%v", repo1ManifestTweaked)
-		t.Logf("manifest generated on the copied config:\n%v", repo2ManifestTweaked)
+	if string(repo2Manifest) != string(repo1Manifest) {
+		t.Logf("manifest generated on the original config:\n%v", string(repo1Manifest))
+		t.Logf("manifest generated on the copied config:\n%v", string(repo2Manifest))
 		t.Fatal("expected manifests to be equal, but they were not")
 	}
 }
--- a/pkg/api/kubectl.go
+++ b/pkg/api/kubectl.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 )

-// KubectlApply create resources in the provided namespace,
+// KubectlApply create resoruces in the provided namespace,
 // if namespace="" then use whatever the kubectl default is
 func KubectlApply(manifests, namespace string) error {
 	return kubectlOperation(manifests, "apply", namespace)
@@ -19,7 +19,7 @@ func KubectlApplyVerbose(manifests, namespace string, verbose bool) error {
 	return kubectlOperationVerbose(manifests, "apply", namespace, verbose)
 }

-// KubectlDelete delete resources in the provided namespace,
+// KubectlDelete delete resoruces in the provided namespace,
 // if namespace="" then use whatever the kubectl default is
 func KubectlDelete(manifests, namespace string) error {
 	return kubectlOperation(manifests, "delete", namespace)
--- a/pkg/api/preflight_apis.go
+++ b/pkg/api/preflight_apis.go
@@ -131,8 +131,8 @@ func (p *PreflightConfig) Initialize() error {
 	}
 	p.AddMinK8sV("1.15")
 	p.AddMinMongoV("3.6")
-	p.AddImage("nginx", "nginx:1.19.0-alpine")
-	p.AddImage("netcat", "qlik-docker-oss.bintray.io/preflight-netcat:v1.0.0")
-	p.AddImage("preflight-mongo", "qlik-docker-oss.bintray.io/preflight-mongo:v1.0.0")
+	p.AddImage("nginx", "nginx")
+	p.AddImage("netcat", "subfuzion/netcat")
+	p.AddImage("preflight-mongo", "qlik-docker-oss.bintray.io/preflight-mongo")
 	return p.Write()
 }
--- a/pkg/api/utils.go
+++ b/pkg/api/utils.go
@@ -12,7 +12,6 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"regexp"
 	"strings"
 	"time"

@@ -79,9 +78,8 @@ func ProcessConfigArgs(args []string, base64Encoded bool) ([]*ServiceKeyValue, e
 		if len(first) != 2 {
 			return nil, notValidErr
 		}
-
-		svcKey := getSvcAndKey(first[0])
-		if len(svcKey) != 2 {
+		second := strings.SplitN(first[0], ".", 2)
+		if len(second) != 2 {
 			return nil, notValidErr
 		}
 		resultValue := strings.Trim(first[1], "\"")
@@ -93,33 +91,14 @@ func ProcessConfigArgs(args []string, base64Encoded bool) ([]*ServiceKeyValue, e
 			}
 		}
 		resultSvcKV[i] = &ServiceKeyValue{
-			SvcName: svcKey[0],
-			Key:     svcKey[1],
+			SvcName: second[0],
+			Key:     second[1],
 			Value:   resultValue,
 		}
 	}
 	return resultSvcKV, nil
 }

-// input should be svc[key]
-func getSvcAndKey(arg string) []string {
-	// for key
-	re := regexp.MustCompile(`\[(.*)\]`)
-	// for service
-	re2 := regexp.MustCompile(`(.*)\[`)
-
-	keys := re.FindStringSubmatch(arg)
-
-	svcs := re2.FindStringSubmatch(arg)
-	if len(svcs) != 2 || len(keys) != 2 {
-		return strings.SplitN(arg, ".", 2)
-	}
-	if svcs[1] == "" || keys[1] == "" {
-		return []string{}
-	}
-	return []string{svcs[1], keys[1]}
-}
-
 func ExecuteTaskWithBlinkingStdoutFeedback(task func() (interface{}, error), feedback string) (result interface{}, err error) {
 	taskDone := make(chan bool)
 	go func() {
--- a/pkg/api/utils_test.go
+++ b/pkg/api/utils_test.go
@@ -45,24 +45,3 @@ func contains(arr []string, str string) bool {
 	}
 	return false
 }
-
-func TestGetSvcAndKey(t *testing.T) {
-	s1 := "qliksense[tls.cert]"
-	sa := getSvcAndKey(s1)
-	if sa[0] != "qliksense" || sa[1] != "tls.cert" {
-		t.Fail()
-		t.Logf("expected service: qliksense but got %s", sa[0])
-		t.Logf("expected key: tls.cert but got %s", sa[1])
-	}
-	s1 = "qliksense-idps.tls"
-	sa = getSvcAndKey(s1)
-	for _, s := range sa {
-		t.Logf("|%s|", s)
-	}
-	if sa[0] != "qliksense-idps" || sa[1] != "tls" {
-		t.Fail()
-		t.Logf("expected service: qliksense-idps but got %s", sa[0])
-		t.Logf("expected key: tls but got %s", sa[1])
-	}
-
-}
--- a/pkg/postflight/all_postflight_checks.go
+++ b/pkg/postflight/all_postflight_checks.go
@@ -1,31 +0,0 @@
-package postflight
-
-import (
-	"fmt"
-
-	. "github.com/logrusorgru/aurora"
-	ansi "github.com/mattn/go-colorable"
-	"github.com/pkg/errors"
-)
-
-func (qp *QliksensePostflight) RunAllPostflightChecks(namespace string, kubeConfigContents []byte, preflightOpts *PostflightOptions) error {
-	checkCount := 0
-	totalCount := 0
-
-	out := ansi.NewColorableStdout()
-	// Postflight db migration check
-	if err := qp.DbMigrationCheck(namespace, kubeConfigContents); err != nil {
-		fmt.Fprintf(out, "%s\n", Red("FAILED"))
-		fmt.Printf("Error: %v\n\n", err)
-	} else {
-		fmt.Fprintf(out, "%s\n\n", Green("PASSED"))
-		checkCount++
-	}
-	totalCount++
-
-	if checkCount == totalCount {
-		// All postflight checks were successful
-		return nil
-	}
-	return errors.New("1 or more postflight checks have FAILED")
-}
--- a/pkg/postflight/db_migration_check.go
+++ b/pkg/postflight/db_migration_check.go
@@ -1,74 +0,0 @@
-package postflight
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/qlik-oss/sense-installer/pkg/api"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-const initContainerNameToCheck = "migration"
-
-func (p *QliksensePostflight) DbMigrationCheck(namespace string, kubeConfigContents []byte) error {
-	fmt.Printf("Postflight db migration check... \n")
-	p.CG.LogVerboseMessage("\n----------------------------------- \n")
-	clientset, _, err := p.CG.GetK8SClientSet(kubeConfigContents, "")
-	if err != nil {
-		err = fmt.Errorf("unable to create a kubernetes client: %v", err)
-		fmt.Printf("%s\n", err)
-		return err
-	}
-
-	var logsMap map[string]string
-
-	// Retrieve all deployments
-	p.CG.LogVerboseMessage("Retrieving logs from deployments\n")
-	deploymentsClient := clientset.AppsV1().Deployments(namespace)
-	deployments, err := deploymentsClient.List(v1.ListOptions{})
-	api.LogDebugMessage("Number of deployments found: %d\n", deployments.Size())
-	for _, deployment := range deployments.Items {
-		api.LogDebugMessage("Deployment name: %s\n", deployment.GetName())
-		if logsMap, err = p.CG.GetPodsAndPodLogsFromFailedInitContainer(clientset, deployment.Spec.Template.Labels, namespace, initContainerNameToCheck); err != nil {
-			fmt.Printf("%s\n", err)
-			return err
-		}
-		p.filterLogsForErrors(logsMap, namespace)
-	}
-
-	// retrieve all statefulsets
-	p.CG.LogVerboseMessage("Retrieving logs from statefulsets\n")
-	statefulsetsClient := clientset.AppsV1().StatefulSets(namespace)
-	statefulsets, err := statefulsetsClient.List(v1.ListOptions{})
-	api.LogDebugMessage("Number of statefulsets found: %d\n", statefulsets.Size())
-	for _, statefulset := range statefulsets.Items {
-		api.LogDebugMessage("Statefulset name: %s\n", statefulset.GetName())
-		if logsMap, err = p.CG.GetPodsAndPodLogsFromFailedInitContainer(clientset, statefulset.Spec.Template.Labels, namespace, initContainerNameToCheck); err != nil {
-			fmt.Printf("%s\n", err)
-			return err
-		}
-		p.filterLogsForErrors(logsMap, namespace)
-	}
-
-	return nil
-}
-
-func (p *QliksensePostflight) filterLogsForErrors(logsMap map[string]string, namespace string) {
-	errorLogsPresent := false
-	for podName, podLog := range logsMap {
-		containerLogs := strings.Split(podLog, "\n")
-		if len(containerLogs) > 0 {
-			for _, logLine := range containerLogs {
-				if strings.Contains(strings.ToLower(logLine), "error") {
-					errorLogsPresent = true
-					fmt.Printf("Logs from pod: %s\n%s\n", podName, logLine)
-				}
-			}
-			if errorLogsPresent {
-				fmt.Printf("To view more logs in this context, please run the command: kubectl logs -n %s %s %s\n", namespace, podName, initContainerNameToCheck)
-			}
-		} else {
-			fmt.Printf("no logs obtained\n\n")
-		}
-	}
-}
--- a/pkg/postflight/postflight_utils.go
+++ b/pkg/postflight/postflight_utils.go
@@ -1,16 +0,0 @@
-package postflight
-
-import (
-	"github.com/qlik-oss/sense-installer/pkg/api"
-	"github.com/qlik-oss/sense-installer/pkg/qliksense"
-)
-
-type PostflightOptions struct {
-	Verbose bool
-}
-
-type QliksensePostflight struct {
-	Q  *qliksense.Qliksense
-	P  *PostflightOptions
-	CG *api.ClientGoUtils
-}
--- a/pkg/preflight/all_checks.go
+++ b/pkg/preflight/all_checks.go
@@ -15,100 +15,90 @@ func (qp *QliksensePreflight) RunAllPreflightChecks(kubeConfigContents []byte, n
 	out := ansi.NewColorableStdout()
 	// Preflight minimum kuberenetes version check
 	if err := qp.CheckK8sVersion(namespace, kubeConfigContents); err != nil {
-		fmt.Fprintf(out, "%s\n", Red("FAILED"))
+		fmt.Fprintf(out, "%s\n", Red("Preflight kubernetes minimum version check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {
-		fmt.Fprintf(out, "%s\n\n", Green("PASSED"))
+		fmt.Fprintf(out, "%s\n\n", Green("Preflight kubernetes minimum version check PASSED"))
 		checkCount++
 	}
 	totalCount++

 	// Preflight deployment check
 	if err := qp.CheckDeployment(namespace, kubeConfigContents, false); err != nil {
-		fmt.Fprintf(out, "%s\n", Red("FAILED"))
+		fmt.Fprintf(out, "%s\n", Red("Preflight deployment check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {
-		fmt.Fprintf(out, "%s\n\n", Green("PASSED"))
+		fmt.Fprintf(out, "%s\n\n", Green("Preflight deployment check PASSED"))
 		checkCount++
 	}
 	totalCount++

 	// Preflight service check
 	if err := qp.CheckService(namespace, kubeConfigContents, false); err != nil {
-		fmt.Fprintf(out, "%s\n", Red("FAILED"))
+		fmt.Fprintf(out, "%s\n", Red("Preflight service check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {
-		fmt.Fprintf(out, "%s\n\n", Green("PASSED"))
+		fmt.Fprintf(out, "%s\n\n", Green("Preflight service check PASSED"))
 		checkCount++
 	}
 	totalCount++

 	// Preflight pod check
 	if err := qp.CheckPod(namespace, kubeConfigContents, false); err != nil {
-		fmt.Fprintf(out, "%s\n", Red("FAILED"))
+		fmt.Fprintf(out, "%s\n", Red("Preflight pod check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {
-		fmt.Fprintf(out, "%s\n\n", Green("PASSED"))
+		fmt.Fprintf(out, "%s\n\n", Green("Preflight pod check PASSED"))
 		checkCount++
 	}
 	totalCount++

 	// Preflight role check
 	if err := qp.CheckCreateRole(namespace, false); err != nil {
-		fmt.Fprintf(out, "%s\n", Red("FAILED"))
+		fmt.Fprintf(out, "%s\n", Red("Preflight role check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {
-		fmt.Fprintf(out, "%s\n\n", Green("PASSED"))
+		fmt.Fprintf(out, "%s\n\n", Green("Preflight role check PASSED"))
 		checkCount++
 	}
 	totalCount++

 	// Preflight rolebinding check
 	if err := qp.CheckCreateRoleBinding(namespace, false); err != nil {
-		fmt.Fprintf(out, "%s\n", Red("FAILED"))
+		fmt.Fprintf(out, "%s\n", Red(" Preflight rolebinding check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {
-		fmt.Fprintf(out, "%s\n\n", Green("PASSED"))
+		fmt.Fprintf(out, "%s\n\n", Green("Preflight rolebinding check PASSED"))
 		checkCount++
 	}
 	totalCount++

 	// Preflight serviceaccount check
 	if err := qp.CheckCreateServiceAccount(namespace, false); err != nil {
-		fmt.Fprintf(out, "%s\n", Red("FAILED"))
+		fmt.Fprintf(out, "%s\n", Red(" Preflight serviceaccount check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {
-		fmt.Fprintf(out, "%s\n\n", Green("PASSED"))
+		fmt.Fprintf(out, "%s\n\n", Green("Preflight serviceaccount check PASSED"))
 		checkCount++
 	}
 	totalCount++

 	// Preflight mongo check
 	if err := qp.CheckMongo(kubeConfigContents, namespace, preflightOpts, false); err != nil {
-		fmt.Fprintf(out, "%s\n", Red("FAILED"))
+		fmt.Fprintf(out, "%s\n", Red(" Preflight mongo check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {
-		fmt.Fprintf(out, "%s\n\n", Green("PASSED"))
+		fmt.Fprintf(out, "%s\n\n", Green("Preflight mongo check PASSED"))
 		checkCount++
 	}
 	totalCount++

 	// Preflight DNS check
 	if err := qp.CheckDns(namespace, kubeConfigContents, false); err != nil {
-		fmt.Fprintf(out, "%s\n", Red("FAILED"))
+		fmt.Fprintf(out, "%s\n", Red(" Preflight DNS check FAILED"))
 		fmt.Printf("Error: %v\n\n", err)
 	} else {
-		fmt.Fprintf(out, "%s\n\n", Green("PASSED"))
-		checkCount++
-	}
-	totalCount++
-
-	// Preflight verify ca chain check
-	if err := qp.VerifyCAChain(kubeConfigContents, namespace, preflightOpts, false); err != nil {
-		fmt.Fprintf(out, "%s\n", Red("FAILED"))
-		fmt.Printf("Error: %v\n\n", err)
-	} else {
-		fmt.Fprintf(out, "%s\n\n", Green("PASSED"))
+		fmt.Fprintf(out, "%s\n\n", Green("Preflight DNS check PASSED"))
 		checkCount++
 	}
 	totalCount++
--- a/pkg/preflight/deployability.go
+++ b/pkg/preflight/deployability.go
@@ -6,8 +6,8 @@ import (
 	"k8s.io/client-go/kubernetes"
 )

-func (p *QliksensePreflight) CheckDeployment(namespace string, kubeConfigContents []byte, cleanup bool) error {
-	clientset, _, err := p.CG.GetK8SClientSet(kubeConfigContents, "")
+func (qp *QliksensePreflight) CheckDeployment(namespace string, kubeConfigContents []byte, cleanup bool) error {
+	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
 	if err != nil {
 		err = fmt.Errorf("Kube config error: %v\n", err)
 		return err
@@ -15,142 +15,142 @@ func (p *QliksensePreflight) CheckDeployment(namespace string, kubeConfigContent

 	// Deployment check
 	if !cleanup {
-		fmt.Print("Preflight deployment check... ")
-		p.CG.LogVerboseMessage("\n--------------------------- \n")
+		qp.P.LogVerboseMessage("Preflight deployment check: \n")
+		qp.P.LogVerboseMessage("--------------------------- \n")
 	}
-	err = p.checkPfDeployment(clientset, namespace, cleanup)
+	err = qp.checkPfDeployment(clientset, namespace, cleanup)
 	if err != nil {
-		p.CG.LogVerboseMessage("Preflight Deployment check: FAILED\n")
+		qp.P.LogVerboseMessage("Preflight Deployment check: FAILED\n")
 		return err
 	}
 	if !cleanup {
-		p.CG.LogVerboseMessage("Completed preflight deployment check\n")
+		qp.P.LogVerboseMessage("Completed preflight deployment check\n")
 	}

 	return nil
 }

-func (p *QliksensePreflight) CheckService(namespace string, kubeConfigContents []byte, cleanup bool) error {
-	clientset, _, err := p.CG.GetK8SClientSet(kubeConfigContents, "")
+func (qp *QliksensePreflight) CheckService(namespace string, kubeConfigContents []byte, cleanup bool) 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 {
-		fmt.Print("Preflight service check... ")
-		p.CG.LogVerboseMessage("\n------------------------ \n")
+		qp.P.LogVerboseMessage("Preflight service check: \n")
+		qp.P.LogVerboseMessage("------------------------ \n")
 	}
-	err = p.checkPfService(clientset, namespace, cleanup)
+	err = qp.checkPfService(clientset, namespace, cleanup)
 	if err != nil {
-		p.CG.LogVerboseMessage("Preflight Service check: FAILED\n")
+		qp.P.LogVerboseMessage("Preflight Service check: FAILED\n")
 		return err
 	}

 	if !cleanup {
-		p.CG.LogVerboseMessage("Completed preflight service check\n")
+		qp.P.LogVerboseMessage("Completed preflight service check\n")
 	}
 	return nil
 }

-func (p *QliksensePreflight) CheckPod(namespace string, kubeConfigContents []byte, cleanup bool) error {
-	clientset, _, err := p.CG.GetK8SClientSet(kubeConfigContents, "")
+func (qp *QliksensePreflight) CheckPod(namespace string, kubeConfigContents []byte, cleanup bool) 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 {
-		fmt.Print("Preflight pod check... ")
-		p.CG.LogVerboseMessage("\n-------------------- \n")
+		qp.P.LogVerboseMessage("Preflight pod check: \n")
+		qp.P.LogVerboseMessage("-------------------- \n")
 	}
-	err = p.checkPfPod(clientset, namespace, cleanup)
+	err = qp.checkPfPod(clientset, namespace, cleanup)
 	if err != nil {
-		p.CG.LogVerboseMessage("Preflight Pod check: FAILED\n")
+		qp.P.LogVerboseMessage("Preflight Pod check: FAILED\n")
 		return err
 	}
 	if !cleanup {
-		p.CG.LogVerboseMessage("Completed preflight pod check\n")
+		qp.P.LogVerboseMessage("Completed preflight pod check\n")
 	}
 	return nil
 }

-func (p *QliksensePreflight) checkPfPod(clientset kubernetes.Interface, namespace string, cleanup bool) error {
+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
 	podName := "pod-pf-check"
-	p.CG.DeletePod(clientset, namespace, podName)
+	qp.deletePod(clientset, namespace, podName)
 	if cleanup {
 		return nil
 	}
 	commandToRun := []string{}
-	imageName, err := p.GetPreflightConfigObj().GetImageName(nginx, true)
+	imageName, err := qp.GetPreflightConfigObj().GetImageName(nginx, true)
 	if err != nil {
 		return err
 	}
 	// create a pod
-	pod, err := p.CG.CreatePreflightTestPod(clientset, namespace, podName, imageName, nil, commandToRun)
+	pod, err := qp.createPreflightTestPod(clientset, namespace, podName, imageName, nil, commandToRun)
 	if err != nil {
 		err = fmt.Errorf("unable to create pod - %v\n", err)
 		return err
 	}
-	defer p.CG.DeletePod(clientset, namespace, podName)
+	defer qp.deletePod(clientset, namespace, podName)

-	if err := p.CG.WaitForPod(clientset, namespace, pod); err != nil {
+	if err := waitForPod(clientset, namespace, pod); err != nil {
 		return err
 	}

-	p.CG.LogVerboseMessage("Preflight pod creation check: PASSED\n")
-	p.CG.LogVerboseMessage("Cleaning up resources...\n")
+	qp.P.LogVerboseMessage("Preflight pod creation check: PASSED\n")
+	qp.P.LogVerboseMessage("Cleaning up resources...\n")
 	return nil
 }

-func (p *QliksensePreflight) checkPfService(clientset kubernetes.Interface, namespace string, cleanup bool) error {
+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"
-	p.CG.DeleteService(clientset, namespace, serviceName)
+	qp.deleteService(clientset, namespace, serviceName)
 	if cleanup {
 		return nil
 	}
 	// creating service
-	pfService, err := p.CG.CreatePreflightTestService(clientset, namespace, serviceName)
+	pfService, err := qp.createPreflightTestService(clientset, namespace, serviceName)
 	if err != nil {
 		err = fmt.Errorf("unable to create service - %v\n", err)
 		return err
 	}
-	defer p.CG.DeleteService(clientset, namespace, serviceName)
-	_, err = p.CG.GetService(clientset, namespace, pfService.GetName())
+	defer qp.deleteService(clientset, namespace, serviceName)
+	_, err = getService(clientset, namespace, pfService.GetName())
 	if err != nil {
 		err = fmt.Errorf("unable to retrieve service - %v\n", err)
 		return err
 	}
-	p.CG.LogVerboseMessage("Preflight service creation check: PASSED\n")
-	p.CG.LogVerboseMessage("Cleaning up resources...\n")
+	qp.P.LogVerboseMessage("Preflight service creation check: PASSED\n")
+	qp.P.LogVerboseMessage("Cleaning up resources...\n")
 	return nil
 }

-func (p *QliksensePreflight) checkPfDeployment(clientset kubernetes.Interface, namespace string, cleanup bool) error {
+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"
-	p.CG.DeleteDeployment(clientset, namespace, depName)
+	qp.deleteDeployment(clientset, namespace, depName)
 	if cleanup {
 		return nil
 	}

 	// check if we are able to create a deployment
-	imageName, err := p.GetPreflightConfigObj().GetImageName(nginx, true)
+	imageName, err := qp.GetPreflightConfigObj().GetImageName(nginx, true)
 	if err != nil {
 		return err
 	}
-	pfDeployment, err := p.CG.CreatePreflightTestDeployment(clientset, namespace, depName, imageName)
+	pfDeployment, err := qp.createPreflightTestDeployment(clientset, namespace, depName, imageName)
 	if err != nil {
 		err = fmt.Errorf("unable to create deployment - %v\n", err)
 		return err
 	}
-	defer p.CG.DeleteDeployment(clientset, namespace, depName)
-	if err := p.CG.WaitForDeployment(clientset, namespace, pfDeployment); err != nil {
+	defer qp.deleteDeployment(clientset, namespace, depName)
+	if err := waitForDeployment(clientset, namespace, pfDeployment); err != nil {
 		return err
 	}
-	p.CG.LogVerboseMessage("Preflight Deployment check: PASSED\n")
-	p.CG.LogVerboseMessage("Cleaning up resources...\n")
+	qp.P.LogVerboseMessage("Preflight Deployment check: PASSED\n")
+	qp.P.LogVerboseMessage("Cleaning up resources...\n")
 	return nil
 }
--- a/pkg/preflight/dns_check.go
+++ b/pkg/preflight/dns_check.go
@@ -12,68 +12,68 @@ const (
 	netcat = "netcat"
 )

-func (p *QliksensePreflight) CheckDns(namespace string, kubeConfigContents []byte, cleanup bool) error {
+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 {
-		fmt.Print("Preflight DNS check... ")
-		p.CG.LogVerboseMessage("\n------------------- \n")
+		qp.P.LogVerboseMessage("Preflight DNS check: \n")
+		qp.P.LogVerboseMessage("------------------- \n")
 	}
-	clientset, _, err := p.CG.GetK8SClientSet(kubeConfigContents, "")
+	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
-	p.runDNSCleanup(clientset, namespace, podName, serviceName, depName)
+	qp.runDNSCleanup(clientset, namespace, podName, serviceName, depName)
 	if cleanup {
 		return nil
 	}
 	// creating deployment
-	nginxImageName, err := p.GetPreflightConfigObj().GetImageName(nginx, true)
+	nginxImageName, err := qp.GetPreflightConfigObj().GetImageName(nginx, true)
 	if err != nil {
 		return err
 	}

-	dnsDeployment, err := p.CG.CreatePreflightTestDeployment(clientset, namespace, depName, nginxImageName)
+	dnsDeployment, err := qp.createPreflightTestDeployment(clientset, namespace, depName, nginxImageName)
 	if err != nil {
 		err = fmt.Errorf("unable to create deployment: %v\n", err)
 		return err
 	}
-	defer p.CG.DeleteDeployment(clientset, namespace, depName)
+	defer qp.deleteDeployment(clientset, namespace, depName)

-	if err := p.CG.WaitForDeployment(clientset, namespace, dnsDeployment); err != nil {
+	if err := waitForDeployment(clientset, namespace, dnsDeployment); err != nil {
 		return err
 	}

 	// creating service
-	dnsService, err := p.CG.CreatePreflightTestService(clientset, namespace, serviceName)
+	dnsService, err := qp.createPreflightTestService(clientset, namespace, serviceName)
 	if err != nil {
 		err = fmt.Errorf("unable to create service : %s, %s\n", serviceName, err)
 		return err
 	}
-	defer p.CG.DeleteService(clientset, namespace, serviceName)
+	defer qp.deleteService(clientset, namespace, serviceName)

 	// create a pod
 	commandToRun := []string{"sh", "-c", "sleep 10; nc -z -v -w 1 " + dnsService.Name + " 80"}
-	netcatImageName, err := p.GetPreflightConfigObj().GetImageName(netcat, true)
+	netcatImageName, err := qp.GetPreflightConfigObj().GetImageName(netcat, true)
 	if err != nil {
 		err = fmt.Errorf("unable to retrieve image : %v\n", err)
 		return err
 	}

-	dnsPod, err := p.CG.CreatePreflightTestPod(clientset, namespace, podName, netcatImageName, nil, commandToRun)
+	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)
 		return err
 	}

-	defer p.CG.DeletePod(clientset, namespace, podName)
+	defer qp.deletePod(clientset, namespace, podName)

-	if err := p.CG.WaitForPod(clientset, namespace, dnsPod); err != nil {
+	if err := waitForPod(clientset, namespace, dnsPod); err != nil {
 		return err
 	}
 	if len(dnsPod.Spec.Containers) == 0 {
@@ -81,30 +81,30 @@ func (p *QliksensePreflight) CheckDns(namespace string, kubeConfigContents []byt
 		return err
 	}

-	p.CG.WaitForPodToDie(clientset, namespace, dnsPod)
+	waitForPodToDie(clientset, namespace, dnsPod)

-	logStr, err := p.CG.GetPodLogs(clientset, dnsPod)
+	logStr, err := getPodLogs(clientset, dnsPod)
 	if err != nil {
 		err = fmt.Errorf("unable to execute dns check in the cluster: %v", err)
 		return err
 	}

 	if strings.HasSuffix(strings.TrimSpace(logStr), "succeeded!") {
-		p.CG.LogVerboseMessage("Preflight DNS check: PASSED\n")
+		qp.P.LogVerboseMessage("Preflight DNS check: PASSED\n")
 	} else {
 		err = fmt.Errorf("Expected response not found\n")
 		return err
 	}
 	if !cleanup {
-		p.CG.LogVerboseMessage("Completed preflight DNS check\n")
-		p.CG.LogVerboseMessage("Cleaning up resources...\n")
+		qp.P.LogVerboseMessage("Completed preflight DNS check\n")
+		qp.P.LogVerboseMessage("Cleaning up resources...\n")
 	}

 	return nil
 }

-func (p *QliksensePreflight) runDNSCleanup(clientset kubernetes.Interface, namespace, podName, serviceName, depName string) {
-	p.CG.DeleteDeployment(clientset, namespace, depName)
-	p.CG.DeletePod(clientset, namespace, podName)
-	p.CG.DeleteService(clientset, namespace, serviceName)
+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)
 }
--- a/pkg/preflight/mongo_check.go
+++ b/pkg/preflight/mongo_check.go
@@ -22,8 +22,8 @@ const (

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

@@ -57,12 +57,12 @@ func (qp *QliksensePreflight) CheckMongo(kubeConfigContents []byte, namespace st
 	}

 	if !cleanup {
-		qp.CG.LogVerboseMessage("MongodbUrl: %s\n", preflightOpts.MongoOptions.MongodbUrl)
+		qp.P.LogVerboseMessage("MongodbUrl: %s\n", preflightOpts.MongoOptions.MongodbUrl)

-		// if mongodbUrl is empty, abort check
+		// if mongoDbUrl is empty, abort check
 		if preflightOpts.MongoOptions.MongodbUrl == "" {
-			qp.CG.LogVerboseMessage("Mongodb Url is empty, hence aborting preflight check\n")
-			return errors.New("MongodbUrl is empty")
+			qp.P.LogVerboseMessage("Mongodb Url is empty, hence aborting preflight check\n")
+			return errors.New("MongoDbUrl is empty")
 		}
 	}

@@ -71,34 +71,34 @@ func (qp *QliksensePreflight) CheckMongo(kubeConfigContents []byte, namespace st
 	}

 	if !cleanup {
-		qp.CG.LogVerboseMessage("Completed preflight mongodb check\n")
+		qp.P.LogVerboseMessage("Completed preflight mongodb check\n")
 	}
 	return nil
 }

-func (p *QliksensePreflight) mongoConnCheck(kubeConfigContents []byte, namespace string, preflightOpts *PreflightOptions, cleanup bool) error {
+func (qp *QliksensePreflight) mongoConnCheck(kubeConfigContents []byte, namespace string, preflightOpts *PreflightOptions, cleanup bool) error {
 	caCertSecretName := "ca-certificates-crt"
 	mongoPodName := "pf-mongo-pod"
-	clientset, _, err := p.CG.GetK8SClientSet(kubeConfigContents, "")
+	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
-	p.runMongoCleanup(clientset, namespace, mongoPodName, caCertSecretName)
+	qp.runMongoCleanup(clientset, namespace, mongoPodName, caCertSecretName)
 	if cleanup {
 		return nil
 	}
 	secrets := map[string]string{}
 	if preflightOpts.MongoOptions.CaCertFile != "" {
-		caCertSecret, err := p.createSecret(clientset, namespace, preflightOpts.MongoOptions.CaCertFile, caCertSecretName)
+		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 p.CG.DeleteK8sSecret(clientset, namespace, caCertSecret.Name)
+		defer qp.deleteK8sSecret(clientset, namespace, caCertSecret.Name)
 		secrets[caCertSecretName] = caCertMountPath
 	}

@@ -106,35 +106,35 @@ func (p *QliksensePreflight) mongoConnCheck(kubeConfigContents []byte, namespace
 	api.LogDebugMessage("Mongo command: %s\n", strings.Join(commandToRun, " "))

 	// create a pod
-	imageName, err := p.GetPreflightConfigObj().GetImageName(preflight_mongo, true)
+	imageName, err := qp.GetPreflightConfigObj().GetImageName(preflight_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 := p.CG.CreatePreflightTestPod(clientset, namespace, mongoPodName, imageName, secrets, commandToRun)
+	mongoPod, err := qp.createPreflightTestPod(clientset, namespace, mongoPodName, imageName, secrets, commandToRun)
 	if err != nil {
 		err = fmt.Errorf("unable to create pod : %v\n", err)
 		return err
 	}
-	defer p.CG.DeletePod(clientset, namespace, mongoPodName)
+	defer qp.deletePod(clientset, namespace, mongoPodName)

-	if err := p.CG.WaitForPod(clientset, namespace, mongoPod); err != nil {
+	if err := waitForPod(clientset, namespace, mongoPod); err != nil {
 		return err
 	}
 	if len(mongoPod.Spec.Containers) == 0 {
 		err := fmt.Errorf("there are no containers in the pod- %v\n", err)
 		return err
 	}
-	p.CG.WaitForPodToDie(clientset, namespace, mongoPod)
-	logStr, err := p.CG.GetPodLogs(clientset, mongoPod)
+	waitForPodToDie(clientset, namespace, mongoPod)
+	logStr, err := getPodLogs(clientset, mongoPod)
 	if err != nil {
 		err = fmt.Errorf("unable to execute mongo check in the cluster: %v\n", err)
 		return err
 	}

 	// check mongo server version
-	ok, err := p.checkMongoVersion(logStr)
+	ok, err := qp.checkMongoVersion(logStr)
 	if !ok || err != nil {
 		return err
 	}
@@ -142,7 +142,7 @@ func (p *QliksensePreflight) mongoConnCheck(kubeConfigContents []byte, namespace
 	// check if connection succeeded
 	stringToCheck := "qlik - connection succeeded!!"
 	if strings.Contains(logStr, stringToCheck) {
-		p.CG.LogVerboseMessage("Preflight mongo check: PASSED\n")
+		qp.P.LogVerboseMessage("Preflight mongo check: PASSED\n")
 	} else {
 		err = fmt.Errorf("Connection failed: %s\n", logStr)
 		return err
@@ -150,9 +150,9 @@ func (p *QliksensePreflight) mongoConnCheck(kubeConfigContents []byte, namespace
 	return nil
 }

-func (p *QliksensePreflight) checkMongoVersion(logStr string) (bool, error) {
+func (qp *QliksensePreflight) checkMongoVersion(logStr string) (bool, error) {
 	// check mongo server version
-	api.LogDebugMessage("Minimum required mongo version: %s\n", p.GetPreflightConfigObj().GetMinMongoVersion())
+	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")
@@ -169,13 +169,13 @@ func (p *QliksensePreflight) checkMongoVersion(logStr string) (bool, error) {
 					err = fmt.Errorf("Unable to convert minimum mongo version into semver version:%v\n", err)
 					return false, err
 				}
-				minMongoVersionSemver, err := semver.NewVersion(p.GetPreflightConfigObj().GetMinMongoVersion())
+				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) {
-					p.CG.LogVerboseMessage("Current mongodb server version %s is greater than or equal to minimum required mongodb version: %s\n", currentMongoVersionSemver, 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)
@@ -187,13 +187,13 @@ func (p *QliksensePreflight) checkMongoVersion(logStr string) (bool, error) {
 	return false, err
 }

-func (p *QliksensePreflight) createSecret(clientset kubernetes.Interface, namespace, certFile, certSecretName string) (*apiv1.Secret, error) {
+func (qp *QliksensePreflight) createSecret(clientset *kubernetes.Clientset, namespace, certFile, certSecretName string) (*apiv1.Secret, error) {
 	certBytes, err := ioutil.ReadFile(certFile)
 	if err != nil {
 		return nil, err
 	}

-	certSecret, err := p.CG.CreatePreflightTestSecret(clientset, namespace, certSecretName, certBytes)
+	certSecret, err := qp.createPreflightTestSecret(clientset, namespace, certSecretName, certBytes)
 	if err != nil {
 		err = fmt.Errorf("unable to create secret with cert : %v\n", err)
 		return nil, err
@@ -201,7 +201,7 @@ func (p *QliksensePreflight) createSecret(clientset kubernetes.Interface, namesp
 	return certSecret, nil
 }

-func (p *QliksensePreflight) runMongoCleanup(clientset kubernetes.Interface, namespace, mongoPodName, caCertSecretName string) {
-	p.CG.DeletePod(clientset, namespace, mongoPodName)
-	p.CG.DeleteK8sSecret(clientset, namespace, caCertSecretName)
+func (qp *QliksensePreflight) runMongoCleanup(clientset *kubernetes.Clientset, namespace, mongoPodName, caCertSecretName string) {
+	qp.deletePod(clientset, namespace, mongoPodName)
+	qp.deleteK8sSecret(clientset, namespace, caCertSecretName)
 }
--- a/pkg/preflight/preflight_utils.go
+++ b/pkg/preflight/preflight_utils.go
@@ -1,8 +1,29 @@
 package preflight

 import (
+	"bytes"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/mitchellh/go-homedir"
 	"github.com/qlik-oss/sense-installer/pkg/api"
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
+	appsv1 "k8s.io/api/apps/v1"
+	apiv1 "k8s.io/api/core/v1"
+	"k8s.io/api/rbac/v1beta1"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/rest"
+	"k8s.io/client-go/tools/clientcmd"
+	"k8s.io/client-go/util/retry"
 )

 type PreflightOptions struct {
@@ -10,42 +31,709 @@ type PreflightOptions struct {
 	MongoOptions *MongoOptions
 }

+// LogVerboseMessage logs a verbose message
+func (p *PreflightOptions) LogVerboseMessage(strMessage string, args ...interface{}) {
+	if p.Verbose || os.Getenv("QLIKSENSE_DEBUG") == "true" {
+		fmt.Printf(strMessage, args...)
+	}
+}
+
 type MongoOptions struct {
 	MongodbUrl string
 	CaCertFile string
 }

+var gracePeriod int64 = 0
+
 type QliksensePreflight struct {
-	Q  *qliksense.Qliksense
-	P  *PreflightOptions
-	CG *api.ClientGoUtils
+	Q *qliksense.Qliksense
+	P *PreflightOptions
 }

 func (qp *QliksensePreflight) GetPreflightConfigObj() *api.PreflightConfig {
 	return api.NewPreflightConfig(qp.Q.QliksenseHome)
 }

-func (qp *QliksensePreflight) Cleanup(namespace string, kubeConfigContents []byte) error {
-	qp.CG.LogVerboseMessage("Preflight clean\n")
-	qp.CG.LogVerboseMessage("----------------\n")
+func InitPreflight() (string, []byte, error) {
+	api.LogDebugMessage("Reading .kube/config file...")

-	qp.CG.LogVerboseMessage("Removing deployment...\n")
+	homeDir, err := homedir.Dir()
+	if err != nil {
+		err = fmt.Errorf("Unable to deduce home dir\n")
+		return "", nil, err
+	}
+	api.LogDebugMessage("Kube config location: %s\n\n", filepath.Join(homeDir, ".kube", "config"))
+
+	kubeConfig := filepath.Join(homeDir, ".kube", "config")
+	kubeConfigContents, err := ioutil.ReadFile(kubeConfig)
+	if err != nil {
+		err = fmt.Errorf("Unable to deduce home dir\n")
+		return "", nil, err
+	}
+	// retrieve namespace
+	namespace := api.GetKubectlNamespace()
+	// if namespace comes back empty, we will run checks in the default namespace
+	if namespace == "" {
+		namespace = "default"
+	}
+	api.LogDebugMessage("Namespace: %s\n", namespace)
+	return namespace, kubeConfigContents, nil
+}
+
+func initiateK8sOps(opr, namespace string) error {
+	opr1 := strings.Fields(opr)
+	_, err := api.KubectlDirectOps(opr1, namespace)
+	if err != nil {
+		fmt.Println(err)
+		return err
+	}
+	return nil
+}
+
+func int32Ptr(i int32) *int32 { return &i }
+
+func retryOnError(mf func() error) error {
+	return retry.OnError(wait.Backoff{
+		Duration: 1 * time.Second,
+		Factor:   1,
+		Jitter:   0.1,
+		Steps:    5,
+	}, func(err error) bool {
+		return k8serrors.IsConflict(err) || k8serrors.IsGone(err) || k8serrors.IsServerTimeout(err) ||
+			k8serrors.IsServiceUnavailable(err) || k8serrors.IsTimeout(err) || k8serrors.IsTooManyRequests(err)
+	}, mf)
+}
+
+func getK8SClientSet(kubeconfig []byte, contextName string) (*kubernetes.Clientset, *rest.Config, error) {
+	var clientConfig *rest.Config
+	var err error
+	if len(kubeconfig) == 0 {
+		clientConfig, err = rest.InClusterConfig()
+		if err != nil {
+			err = fmt.Errorf("Unable to load in-cluster kubeconfig: %w", err)
+			return nil, nil, err
+		}
+	} else {
+		config, err := clientcmd.Load(kubeconfig)
+		if err != nil {
+			err = fmt.Errorf("Unable to load kubeconfig: %w", err)
+			return nil, nil, err
+		}
+		if contextName != "" {
+			config.CurrentContext = contextName
+		}
+		clientConfig, err = clientcmd.NewDefaultClientConfig(*config, &clientcmd.ConfigOverrides{}).ClientConfig()
+		if err != nil {
+			err = fmt.Errorf("Unable to create client config from config: %w", err)
+			return nil, nil, err
+		}
+	}
+	clientset, err := kubernetes.NewForConfig(clientConfig)
+	if err != nil {
+		err = fmt.Errorf("Unable to create clientset: %w", err)
+		return nil, nil, err
+	}
+	return clientset, clientConfig, nil
+}
+
+func (qp *QliksensePreflight) createPreflightTestDeployment(clientset *kubernetes.Clientset, namespace string, depName string, imageName string) (*appsv1.Deployment, error) {
+	deploymentsClient := clientset.AppsV1().Deployments(namespace)
+	deployment := &appsv1.Deployment{
+		ObjectMeta: v1.ObjectMeta{
+			Name: depName,
+		},
+		Spec: appsv1.DeploymentSpec{
+			Replicas: int32Ptr(1),
+			Selector: &v1.LabelSelector{
+				MatchLabels: map[string]string{
+					"app": "preflight-check",
+				},
+			},
+			Template: apiv1.PodTemplateSpec{
+				ObjectMeta: v1.ObjectMeta{
+					Labels: map[string]string{
+						"app":   "preflight-check",
+						"label": "preflight-check-label",
+					},
+				},
+				Spec: apiv1.PodSpec{
+					Containers: []apiv1.Container{
+						{
+							Name:  "dep",
+							Image: imageName,
+							Ports: []apiv1.ContainerPort{
+								{
+									Name:          "http",
+									Protocol:      apiv1.ProtocolTCP,
+									ContainerPort: 80,
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	// Create Deployment
+	var result *appsv1.Deployment
+	if err := retryOnError(func() (err error) {
+		result, err = deploymentsClient.Create(deployment)
+		return err
+	}); err != nil {
+		err = fmt.Errorf("unable to create deployments in the %s namespace: %w", namespace, err)
+		return nil, err
+	}
+	qp.P.LogVerboseMessage("Created deployment %q\n", result.GetObjectMeta().GetName())
+
+	return deployment, nil
+}
+
+func getDeployment(clientset *kubernetes.Clientset, namespace, depName string) (*appsv1.Deployment, error) {
+	deploymentsClient := clientset.AppsV1().Deployments(namespace)
+	var deployment *appsv1.Deployment
+	if err := retryOnError(func() (err error) {
+		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)
+		api.LogDebugMessage("%v\n", err)
+		return nil, err
+	}
+	return deployment, nil
+}
+
+func (qp *QliksensePreflight) deleteDeployment(clientset *kubernetes.Clientset, namespace, name string) error {
+	deploymentsClient := clientset.AppsV1().Deployments(namespace)
+	// Create Deployment
+	deletePolicy := v1.DeletePropagationForeground
+	deleteOptions := v1.DeleteOptions{
+		PropagationPolicy:  &deletePolicy,
+		GracePeriodSeconds: &gracePeriod,
+	}
+
+	if err := retryOnError(func() (err error) {
+		return deploymentsClient.Delete(name, &deleteOptions)
+	}); err != nil {
+		return err
+	}
+	if err := waitForDeploymentToDelete(clientset, namespace, name); err != nil {
+		return err
+	}
+	qp.P.LogVerboseMessage("Deleted deployment: %s\n", name)
+	return nil
+}
+
+func (qp *QliksensePreflight) createPreflightTestService(clientset *kubernetes.Clientset, namespace string, svcName string) (*apiv1.Service, error) {
+	iptr := int32Ptr(80)
+	servicesClient := clientset.CoreV1().Services(namespace)
+	service := &apiv1.Service{
+		ObjectMeta: v1.ObjectMeta{
+			Name:      svcName,
+			Namespace: namespace,
+			Labels: map[string]string{
+				"app": "preflight-check",
+			},
+		},
+		Spec: apiv1.ServiceSpec{
+			Ports: []apiv1.ServicePort{
+				{Name: "port1",
+					Port: *iptr,
+				},
+			},
+			Selector: map[string]string{
+				"app": "preflight-check",
+			},
+			ClusterIP: "",
+		},
+	}
+	var result *apiv1.Service
+	if err := retryOnError(func() (err error) {
+		result, err = servicesClient.Create(service)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+	qp.P.LogVerboseMessage("Created service %q\n", result.GetObjectMeta().GetName())
+
+	return service, nil
+}
+
+func getService(clientset *kubernetes.Clientset, namespace, svcName string) (*apiv1.Service, error) {
+	servicesClient := clientset.CoreV1().Services(namespace)
+	var svc *apiv1.Service
+	if err := retryOnError(func() (err error) {
+		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)
+		return nil, err
+	}
+
+	return svc, nil
+}
+
+func (qp *QliksensePreflight) deleteService(clientset *kubernetes.Clientset, namespace, name string) error {
+	servicesClient := clientset.CoreV1().Services(namespace)
+	// Create Deployment
+	deletePolicy := v1.DeletePropagationForeground
+	deleteOptions := v1.DeleteOptions{
+		PropagationPolicy: &deletePolicy,
+	}
+	if err := retryOnError(func() (err error) {
+		return servicesClient.Delete(name, &deleteOptions)
+	}); err != nil {
+		return err
+	}
+	qp.P.LogVerboseMessage("Deleted service: %s\n", name)
+	return nil
+}
+
+func (qp *QliksensePreflight) deletePod(clientset *kubernetes.Clientset, namespace, name string) error {
+
+	podsClient := clientset.CoreV1().Pods(namespace)
+	deletePolicy := v1.DeletePropagationForeground
+	deleteOptions := v1.DeleteOptions{
+		PropagationPolicy:  &deletePolicy,
+		GracePeriodSeconds: &gracePeriod,
+	}
+	if err := retryOnError(func() (err error) {
+		return podsClient.Delete(name, &deleteOptions)
+	}); err != nil {
+		return err
+	}
+	if err := waitForPodToDelete(clientset, namespace, name); err != nil {
+		return err
+	}
+	qp.P.LogVerboseMessage("Deleted pod: %s\n", name)
+	return nil
+}
+
+func (qp *QliksensePreflight) createPreflightTestPod(clientset *kubernetes.Clientset, namespace, podName, imageName string, secretNames map[string]string, commandToRun []string) (*apiv1.Pod, error) {
+	// build the pod definition we want to deploy
+	pod := &apiv1.Pod{
+		ObjectMeta: v1.ObjectMeta{
+			Name:      podName,
+			Namespace: namespace,
+			Labels: map[string]string{
+				"app": "preflight",
+			},
+		},
+		Spec: apiv1.PodSpec{
+			RestartPolicy: apiv1.RestartPolicyNever,
+			Containers: []apiv1.Container{
+				{
+					Name:            "cnt",
+					Image:           imageName,
+					ImagePullPolicy: apiv1.PullIfNotPresent,
+					Command:         commandToRun,
+				},
+			},
+		},
+	}
+	if len(secretNames) > 0 {
+		for secretName, mountPath := range secretNames {
+			pod.Spec.Volumes = append(pod.Spec.Volumes, apiv1.Volume{
+				Name: secretName,
+				VolumeSource: apiv1.VolumeSource{
+					Secret: &apiv1.SecretVolumeSource{
+						SecretName: secretName,
+						Items: []apiv1.KeyToPath{
+							{
+								Key:  secretName,
+								Path: filepath.Base(mountPath),
+							},
+						},
+					},
+				},
+			})
+			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),
+					ReadOnly:  true,
+				})
+			}
+		}
+	}
+
+	// now create the pod in kubernetes cluster using the clientset
+	if err := retryOnError(func() (err error) {
+		pod, err = clientset.CoreV1().Pods(namespace).Create(pod)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+	qp.P.LogVerboseMessage("Created pod: %s\n", pod.Name)
+	return pod, nil
+}
+
+func getPod(clientset *kubernetes.Clientset, namespace, podName string) (*apiv1.Pod, error) {
+	api.LogDebugMessage("Fetching pod: %s\n", podName)
+	var pod *apiv1.Pod
+	if err := retryOnError(func() (err error) {
+		pod, err = clientset.CoreV1().Pods(namespace).Get(podName, v1.GetOptions{})
+		return err
+	}); err != nil {
+		api.LogDebugMessage("%v\n", err)
+		return nil, err
+	}
+	return pod, nil
+}
+
+func getPodLogs(clientset *kubernetes.Clientset, pod *apiv1.Pod) (string, error) {
+	podLogOpts := apiv1.PodLogOptions{}
+
+	api.LogDebugMessage("Retrieving logs for pod: %s   namespace: %s\n", pod.GetName(), pod.Namespace)
+	req := clientset.CoreV1().Pods(pod.Namespace).GetLogs(pod.Name, &podLogOpts)
+	podLogs, err := req.Stream()
+	if err != nil {
+		return "", err
+	}
+	defer podLogs.Close()
+	time.Sleep(15 * time.Second)
+	buf := new(bytes.Buffer)
+	_, err = io.Copy(buf, podLogs)
+	if err != nil {
+		return "", err
+	}
+	api.LogDebugMessage("Log from pod: %s\n", buf.String())
+	return buf.String(), nil
+}
+
+func waitForResource(checkFunc func() (interface{}, error), validateFunc func(interface{}) bool) error {
+	timeout := time.NewTicker(2 * time.Minute)
+	defer timeout.Stop()
+OUT:
+	for {
+		r, err := checkFunc()
+		if err != nil {
+			return err
+		}
+		select {
+		case <-timeout.C:
+			break OUT
+		default:
+			if validateFunc(r) {
+				break OUT
+			}
+		}
+		time.Sleep(5 * time.Second)
+	}
+	return nil
+}
+
+func waitForDeployment(clientset *kubernetes.Clientset, namespace string, pfDeployment *appsv1.Deployment) error {
+	var err error
+	depName := pfDeployment.GetName()
+	checkFunc := func() (interface{}, error) {
+		pfDeployment, err = getDeployment(clientset, namespace, depName)
+		if err != nil {
+			err = fmt.Errorf("unable to retrieve deployment: %s\n", depName)
+			return nil, err
+		}
+		return pfDeployment, nil
+	}
+	validateFunc := func(data interface{}) bool {
+		d := data.(*appsv1.Deployment)
+		return int(d.Status.ReadyReplicas) > 0
+	}
+	if err := waitForResource(checkFunc, validateFunc); err != nil {
+		return err
+	}
+	if int(pfDeployment.Status.ReadyReplicas) == 0 {
+		err = fmt.Errorf("deployment took longer than expected to spin up pods")
+		return err
+	}
+	return nil
+}
+
+func waitForPod(clientset *kubernetes.Clientset, namespace string, pod *apiv1.Pod) error {
+	var err error
+	if len(pod.Spec.Containers) == 0 {
+		err = fmt.Errorf("there are no containers in the pod")
+		return err
+	}
+	podName := pod.Name
+	checkFunc := func() (interface{}, error) {
+		pod, err = getPod(clientset, namespace, podName)
+		if err != nil {
+			err = fmt.Errorf("unable to retrieve %s pod by name", podName)
+			return nil, err
+		}
+		return pod, nil
+	}
+	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
+	}
+
+	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 {
+		err = fmt.Errorf("container is taking much longer than expected")
+		return err
+	}
+	return nil
+}
+
+func waitForPodToDie(clientset *kubernetes.Clientset, namespace string, pod *apiv1.Pod) error {
+	podName := pod.Name
+	checkFunc := func() (interface{}, error) {
+		po, err := getPod(clientset, namespace, podName)
+		if err != nil {
+			err = fmt.Errorf("unable to retrieve %s pod by name", podName)
+			return nil, err
+		}
+		return po, nil
+	}
+	validateFunc := func(r interface{}) bool {
+		po := r.(*apiv1.Pod)
+		return po.Status.Phase == apiv1.PodFailed || po.Status.Phase == apiv1.PodSucceeded
+	}
+	if err := waitForResource(checkFunc, validateFunc); err != nil {
+		return err
+	}
+	return nil
+}
+
+func waitForPodToDelete(clientset *kubernetes.Clientset, namespace, podName string) error {
+	checkFunc := func() (interface{}, error) {
+		po, err := getPod(clientset, namespace, podName)
+		if err != nil {
+			return nil, err
+		}
+		return po, nil
+	}
+	validateFunc := func(po interface{}) bool {
+		return false
+	}
+	if err := waitForResource(checkFunc, validateFunc); err != nil {
+		return nil
+	}
+	err := fmt.Errorf("delete pod is taking unusually long")
+	return err
+}
+
+func waitForDeploymentToDelete(clientset *kubernetes.Clientset, namespace, deploymentName string) error {
+	checkFunc := func() (interface{}, error) {
+		dep, err := getDeployment(clientset, namespace, deploymentName)
+		if err != nil {
+			return nil, err
+		}
+		return dep, nil
+	}
+	validateFunc := func(po interface{}) bool {
+		return false
+	}
+	if err := waitForResource(checkFunc, validateFunc); err != nil {
+		return nil
+	}
+	err := fmt.Errorf("delete deployment is taking unusually long")
+	return err
+}
+
+func (qp *QliksensePreflight) createPfRole(clientset *kubernetes.Clientset, namespace, roleName string) (*v1beta1.Role, error) {
+	// build the role defination we want to create
+	var role *v1beta1.Role
+	roleSpec := &v1beta1.Role{
+		ObjectMeta: v1.ObjectMeta{
+			Name:      roleName,
+			Namespace: namespace,
+			Labels: map[string]string{
+				"app": "preflight",
+			},
+		},
+		Rules: []v1beta1.PolicyRule{},
+	}
+
+	// now create the role in kubernetes cluster using the clientset
+	if err := retryOnError(func() (err error) {
+		role, err = clientset.RbacV1beta1().Roles(namespace).Create(roleSpec)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+
+	qp.P.LogVerboseMessage("Created role: %s\n", role.Name)
+
+	return role, nil
+}
+
+func (qp *QliksensePreflight) deleteRole(clientset *kubernetes.Clientset, namespace string, roleName string) error {
+	rolesClient := clientset.RbacV1beta1().Roles(namespace)
+
+	deletePolicy := v1.DeletePropagationForeground
+	deleteOptions := v1.DeleteOptions{
+		PropagationPolicy: &deletePolicy,
+	}
+	err := rolesClient.Delete(roleName, &deleteOptions)
+	if err != nil {
+		log.Printf("Error: %v\n", err)
+		return err
+	}
+	qp.P.LogVerboseMessage("Deleted role: %s\n\n", roleName)
+	return nil
+}
+
+func (qp *QliksensePreflight) createPfRoleBinding(clientset *kubernetes.Clientset, namespace, roleBindingName string) (*v1beta1.RoleBinding, error) {
+	var roleBinding *v1beta1.RoleBinding
+	// build the rolebinding defination we want to create
+	roleBindingSpec := &v1beta1.RoleBinding{
+		ObjectMeta: v1.ObjectMeta{
+			Name:      roleBindingName,
+			Namespace: namespace,
+			Labels: map[string]string{
+				"app": "preflight",
+			},
+		},
+		Subjects: []v1beta1.Subject{
+			{
+				Kind:      "ServiceAccount",
+				APIGroup:  "",
+				Name:      "preflight-check-subject",
+				Namespace: namespace,
+			},
+		},
+		RoleRef: v1beta1.RoleRef{
+			APIGroup: "",
+			Kind:     "Role",
+			Name:     "preflight-check-roleref",
+		},
+	}
+
+	// now create the roleBinding in kubernetes cluster using the clientset
+	if err := retryOnError(func() (err error) {
+		roleBinding, err = clientset.RbacV1beta1().RoleBindings(namespace).Create(roleBindingSpec)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+	qp.P.LogVerboseMessage("Created RoleBinding: %s\n", roleBindingSpec.Name)
+	return roleBinding, nil
+}
+
+func (qp *QliksensePreflight) deleteRoleBinding(clientset *kubernetes.Clientset, namespace string, roleBindingName string) error {
+	roleBindingClient := clientset.RbacV1beta1().RoleBindings(namespace)
+
+	deletePolicy := v1.DeletePropagationForeground
+	deleteOptions := v1.DeleteOptions{
+		PropagationPolicy: &deletePolicy,
+	}
+	err := roleBindingClient.Delete(roleBindingName, &deleteOptions)
+	if err != nil {
+		log.Printf("Error: %v\n", err)
+		return err
+	}
+	qp.P.LogVerboseMessage("Deleted RoleBinding: %s\n\n", roleBindingName)
+	return nil
+}
+
+func (qp *QliksensePreflight) createPfServiceAccount(clientset *kubernetes.Clientset, namespace, serviceAccountName string) (*apiv1.ServiceAccount, error) {
+	var serviceAccount *apiv1.ServiceAccount
+	// build the serviceAccount defination we want to create
+	serviceAccountSpec := &apiv1.ServiceAccount{
+		ObjectMeta: v1.ObjectMeta{
+			Name:      "preflight-check-test-serviceaccount",
+			Namespace: namespace,
+			Labels: map[string]string{
+				"app": "preflight",
+			},
+		},
+	}
+
+	// now create the serviceAccount in kubernetes cluster using the clientset
+	if err := retryOnError(func() (err error) {
+		serviceAccount, err = clientset.CoreV1().ServiceAccounts(namespace).Create(serviceAccountSpec)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+	qp.P.LogVerboseMessage("Created Service Account: %s\n", serviceAccountSpec.Name)
+	return serviceAccount, nil
+}
+
+func (qp *QliksensePreflight) deleteServiceAccount(clientset *kubernetes.Clientset, namespace string, serviceAccountName string) error {
+	serviceAccountClient := clientset.CoreV1().ServiceAccounts(namespace)
+
+	deletePolicy := v1.DeletePropagationForeground
+	deleteOptions := v1.DeleteOptions{
+		PropagationPolicy: &deletePolicy,
+	}
+	err := serviceAccountClient.Delete(serviceAccountName, &deleteOptions)
+	if err != nil {
+		log.Printf("Error: %v\n", err)
+		return err
+	}
+	qp.P.LogVerboseMessage("Deleted ServiceAccount: %s\n\n", serviceAccountName)
+	return nil
+}
+
+func (qp *QliksensePreflight) createPreflightTestSecret(clientset *kubernetes.Clientset, namespace, secretName string, secretData []byte) (*apiv1.Secret, error) {
+	var secret *apiv1.Secret
+	var err error
+	// build the secret defination we want to create
+	secretSpec := &apiv1.Secret{
+		ObjectMeta: v1.ObjectMeta{
+			Name:      secretName,
+			Namespace: namespace,
+			Labels: map[string]string{
+				"app": "preflight",
+			},
+		},
+		Data: map[string][]byte{
+			secretName: secretData,
+		},
+	}
+
+	// now create the secret in kubernetes cluster using the clientset
+	if err = retryOnError(func() (err error) {
+		secret, err = clientset.CoreV1().Secrets(namespace).Create(secretSpec)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+	qp.P.LogVerboseMessage("Created Secret: %s\n", secret.Name)
+	return secret, nil
+}
+
+func (qp *QliksensePreflight) deleteK8sSecret(clientset *kubernetes.Clientset, namespace string, secretName string) error {
+	secretClient := clientset.CoreV1().Secrets(namespace)
+
+	deletePolicy := v1.DeletePropagationForeground
+	deleteOptions := v1.DeleteOptions{
+		PropagationPolicy: &deletePolicy,
+	}
+	err := secretClient.Delete(secretName, &deleteOptions)
+	if err != nil {
+		return 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.CG.LogVerboseMessage("Removing service...\n")
+	qp.P.LogVerboseMessage("Removing service...\n")
 	qp.CheckService(namespace, kubeConfigContents, true)
-	qp.CG.LogVerboseMessage("Removing pod...\n")
+	qp.P.LogVerboseMessage("Removing pod...\n")
 	qp.CheckPod(namespace, kubeConfigContents, true)

-	qp.CG.LogVerboseMessage("Removing role...\n")
+	qp.P.LogVerboseMessage("Removing role...\n")
 	qp.CheckCreateRole(namespace, true)
-	qp.CG.LogVerboseMessage("Removing rolebinding...\n")
+	qp.P.LogVerboseMessage("Removing rolebinding...\n")
 	qp.CheckCreateRoleBinding(namespace, true)
-	qp.CG.LogVerboseMessage("Removing serviceaccount...\n")
+	qp.P.LogVerboseMessage("Removing serviceaccount...\n")
 	qp.CheckCreateServiceAccount(namespace, true)

-	qp.CG.LogVerboseMessage("Removing DNS check components...\n")
+	qp.P.LogVerboseMessage("Removing DNS check components...\n")
 	qp.CheckDns(namespace, kubeConfigContents, true)
-	qp.CG.LogVerboseMessage("Removing mongo check components...\n")
+	qp.P.LogVerboseMessage("Removing mongo check components...\n")
 	qp.CheckMongo(kubeConfigContents, namespace, &PreflightOptions{MongoOptions: &MongoOptions{}}, true)
 	return nil
 }
--- a/pkg/preflight/preflight_utils_test.go
+++ b/pkg/preflight/preflight_utils_test.go
@@ -0,0 +1,43 @@
+package preflight
+
+import (
+	"fmt"
+	"testing"
+)
+
+func Test_initiateK8sOps(t *testing.T) {
+	t.Skip()
+	type args struct {
+		opr       string
+		namespace string
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name: "valid case",
+			args: args{
+				opr:       fmt.Sprintf("version"),
+				namespace: "test-ns",
+			},
+			wantErr: false,
+		},
+		{
+			name: "invalid case",
+			args: args{
+				opr:       fmt.Sprintf("versions"),
+				namespace: "test-ns",
+			},
+			wantErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := initiateK8sOps(tt.args.opr, tt.args.namespace); (err != nil) != tt.wantErr {
+				t.Errorf("initiateK8sOps() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
--- a/pkg/preflight/role_check.go
+++ b/pkg/preflight/role_check.go
@@ -14,15 +14,15 @@ import (
 func (qp *QliksensePreflight) CheckCreateRole(namespace string, cleanup bool) error {
 	// create a Role
 	if !cleanup {
-		fmt.Print("Preflight role check... ")
-		qp.CG.LogVerboseMessage("\n--------------------- \n")
+		qp.P.LogVerboseMessage("Preflight role check: \n")
+		qp.P.LogVerboseMessage("--------------------- \n")
 	}
 	err := qp.checkCreateEntity(namespace, "Role", cleanup)
 	if err != nil {
 		return err
 	}
 	if !cleanup {
-		qp.CG.LogVerboseMessage("Completed preflight role check\n")
+		qp.P.LogVerboseMessage("Completed preflight role check\n")
 	}
 	return nil
 }
@@ -30,15 +30,15 @@ func (qp *QliksensePreflight) CheckCreateRole(namespace string, cleanup bool) er
 func (qp *QliksensePreflight) CheckCreateRoleBinding(namespace string, cleanup bool) error {
 	// create a RoleBinding
 	if !cleanup {
-		fmt.Print("Preflight rolebinding check... ")
-		qp.CG.LogVerboseMessage("\n---------------------------- \n")
+		qp.P.LogVerboseMessage("Preflight rolebinding check: \n")
+		qp.P.LogVerboseMessage("---------------------------- \n")
 	}
 	err := qp.checkCreateEntity(namespace, "RoleBinding", cleanup)
 	if err != nil {
 		return err
 	}
 	if !cleanup {
-		qp.CG.LogVerboseMessage("Completed preflight rolebinding check\n")
+		qp.P.LogVerboseMessage("Completed preflight rolebinding check\n")
 	}
 	return nil
 }
@@ -46,15 +46,15 @@ func (qp *QliksensePreflight) CheckCreateRoleBinding(namespace string, cleanup b
 func (qp *QliksensePreflight) CheckCreateServiceAccount(namespace string, cleanup bool) error {
 	// create a service account
 	if !cleanup {
-		fmt.Print("Preflight serviceaccount check... ")
-		qp.CG.LogVerboseMessage("\n------------------------------- \n")
+		qp.P.LogVerboseMessage("Preflight serviceaccount check: \n")
+		qp.P.LogVerboseMessage("------------------------------- \n")
 	}
 	err := qp.checkCreateEntity(namespace, "ServiceAccount", cleanup)
 	if err != nil {
 		return err
 	}
 	if !cleanup {
-		qp.CG.LogVerboseMessage("Completed preflight serviceaccount check\n")
+		qp.P.LogVerboseMessage("Completed preflight serviceaccount check\n")
 	}
 	return nil
 }
@@ -67,13 +67,13 @@ func (qp *QliksensePreflight) checkCreateEntity(namespace, entityToTest string,
 	var err error
 	currentCR, err = qConfig.GetCurrentCR()
 	if err != nil {
-		qp.CG.LogVerboseMessage("Unable to retrieve current CR: %v\n", err)
+		qp.P.LogVerboseMessage("Unable to retrieve current CR: %v\n", err)
 		return err
 	}
 	if currentCR.IsRepoExist() {
 		mfroot = currentCR.Spec.GetManifestsRoot()
 	} else if tempDownloadedDir, err := qliksense.DownloadFromGitRepoToTmpDir(qliksense.QLIK_GIT_REPO, "master"); err != nil {
-		qp.CG.LogVerboseMessage("Unable to Download from git repo to tmp dir: %v\n", err)
+		qp.P.LogVerboseMessage("Unable to Download from git repo to tmp dir: %v\n", err)
 		return err
 	} else {
 		mfroot = tempDownloadedDir
@@ -95,8 +95,7 @@ func (qp *QliksensePreflight) checkCreateEntity(namespace, entityToTest string,
 	if sa != "" {
 		sa = strings.Replace(sa, "name: qliksense", "name: preflight", -1)
 	} else {
-		err = fmt.Errorf(`We were unable to retrieve valid %ss from running "kustomize" in your %s directory. 
-Please check the value in the "Profile" field of your CR. `, strings.ToLower(entityToTest), kusDir)
+		err := fmt.Errorf("Unable to retrieve yamls to apply on cluster from dir: %s, error: %v", kusDir, err)
 		return err
 	}
 	namespace = "" // namespace is handled when generating the manifests
@@ -108,10 +107,10 @@ Please check the value in the "Profile" field of your CR. `, strings.ToLower(ent
 	}

 	defer func() {
-		qp.CG.LogVerboseMessage("Cleaning up resources...\n")
+		qp.P.LogVerboseMessage("Cleaning up resources...\n")
 		err := api.KubectlDeleteVerbose(sa, namespace, qp.P.Verbose)
 		if err != nil {
-			qp.CG.LogVerboseMessage("Preflight cleanup failed!\n")
+			qp.P.LogVerboseMessage("Preflight cleanup failed!\n")
 		}
 	}()

@@ -121,55 +120,55 @@ Please check the value in the "Profile" field of your CR. `, strings.ToLower(ent
 		return err
 	}

-	qp.CG.LogVerboseMessage("Preflight %s check: PASSED\n", entityToTest)
+	qp.P.LogVerboseMessage("Preflight %s check: PASSED\n", entityToTest)
 	return nil
 }

 func (qp *QliksensePreflight) CheckCreateRB(namespace string, kubeConfigContents []byte) error {

 	// create a role
-	qp.CG.LogVerboseMessage("Preflight createRole check: \n")
-	qp.CG.LogVerboseMessage("--------------------------- \n")
+	qp.P.LogVerboseMessage("Preflight createRole check: \n")
+	qp.P.LogVerboseMessage("--------------------------- \n")
 	errStr := strings.Builder{}
 	err1 := qp.checkCreateEntity(namespace, "Role", false)
 	if err1 != nil {
 		errStr.WriteString(err1.Error())
 		errStr.WriteString("\n")
-		qp.CG.LogVerboseMessage("%v\n", err1)
-		qp.CG.LogVerboseMessage("Preflight role check: FAILED\n")
+		qp.P.LogVerboseMessage("%v\n", err1)
+		qp.P.LogVerboseMessage("Preflight role check: FAILED\n")
 	}
-	qp.CG.LogVerboseMessage("Completed preflight role check\n\n")
+	qp.P.LogVerboseMessage("Completed preflight role check\n\n")

 	// create a roleBinding
-	qp.CG.LogVerboseMessage("Preflight rolebinding check: \n")
-	qp.CG.LogVerboseMessage("---------------------------- \n")
+	qp.P.LogVerboseMessage("Preflight rolebinding check: \n")
+	qp.P.LogVerboseMessage("---------------------------- \n")
 	err2 := qp.checkCreateEntity(namespace, "RoleBinding", false)
 	if err2 != nil {
 		errStr.WriteString(err2.Error())
 		errStr.WriteString("\n")
-		qp.CG.LogVerboseMessage("%v\n", err2)
-		qp.CG.LogVerboseMessage("Preflight rolebinding check: FAILED\n")
+		qp.P.LogVerboseMessage("%v\n", err2)
+		qp.P.LogVerboseMessage("Preflight rolebinding check: FAILED\n")
 	}
-	qp.CG.LogVerboseMessage("Completed preflight rolebinding check\n\n")
+	qp.P.LogVerboseMessage("Completed preflight rolebinding check\n\n")

 	// create a service account
-	qp.CG.LogVerboseMessage("Preflight serviceaccount check: \n")
-	qp.CG.LogVerboseMessage("------------------------------- \n")
+	qp.P.LogVerboseMessage("Preflight serviceaccount check: \n")
+	qp.P.LogVerboseMessage("------------------------------- \n")
 	err3 := qp.checkCreateEntity(namespace, "ServiceAccount", false)
 	if err3 != nil {
 		errStr.WriteString(err3.Error())
 		errStr.WriteString("\n")
-		qp.CG.LogVerboseMessage("%v\n", err3)
-		qp.CG.LogVerboseMessage("Preflight serviceaccount check: FAILED\n")
+		qp.P.LogVerboseMessage("%v\n", err3)
+		qp.P.LogVerboseMessage("Preflight serviceaccount check: FAILED\n")
 	}
-	qp.CG.LogVerboseMessage("Completed preflight serviceaccount check\n\n")
+	qp.P.LogVerboseMessage("Completed preflight serviceaccount check\n\n")

 	if err1 != nil || err2 != nil || err3 != nil {
-		qp.CG.LogVerboseMessage("Preflight authcheck: FAILED\n")
-		qp.CG.LogVerboseMessage("Completed preflight authcheck\n")
+		qp.P.LogVerboseMessage("Preflight authcheck: FAILED\n")
+		qp.P.LogVerboseMessage("Completed preflight authcheck\n")
 		return errors.New(errStr.String())
 	}
-	qp.CG.LogVerboseMessage("Preflight authcheck: PASSED\n")
-	qp.CG.LogVerboseMessage("Completed preflight authcheck\n")
+	qp.P.LogVerboseMessage("Preflight authcheck: PASSED\n")
+	qp.P.LogVerboseMessage("Completed preflight authcheck\n")
 	return nil
 }
--- a/pkg/preflight/verify_ca.go
+++ b/pkg/preflight/verify_ca.go
@@ -1,123 +0,0 @@
-package preflight
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/json"
-	"fmt"
-	"net/url"
-	"strings"
-
-	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-)
-
-func (qp *QliksensePreflight) VerifyCAChain(kubeConfigContents []byte, namespace string, preflightOpts *PreflightOptions, cleanup bool) error {
-
-	var currentCR *qapi.QliksenseCR
-	var err error
-	qConfig := qapi.NewQConfig(qp.Q.QliksenseHome)
-	qConfig.SetNamespace(namespace)
-
-	fmt.Print("Preflight verify-ca-chain check... ")
-	qp.CG.LogVerboseMessage("\n----------------------------------- \n")
-
-	currentCR, err = qConfig.GetCurrentCR()
-	if err != nil {
-		qp.CG.LogVerboseMessage("Unable to retrieve current CR: %v\n", err)
-		return err
-	}
-	decryptedCR, err := qConfig.GetDecryptedCr(currentCR)
-	if err != nil {
-		qp.CG.LogVerboseMessage("An error occurred while retrieving mongodbUrl from current CR: %v\n", err)
-		return err
-	}
-
-	// infer ca certs form CR
-	caCertificates := strings.TrimSpace(decryptedCR.Spec.GetFromSecrets("qliksense", "caCertificates"))
-
-	fmt.Println("Openssl verify mongodbUrl:")
-	// infer mongodb url from CR
-	mongodbUrl := strings.TrimSpace(decryptedCR.Spec.GetFromSecrets("qliksense", "mongodbUri"))
-	qp.CG.LogVerboseMessage("Mongodb url inferred form CR: %s\n", mongodbUrl)
-
-	// parse out server and port from mongodb url and execute openssl verify
-	if err := qp.extractCertAndVerify(mongodbUrl, caCertificates); err != nil {
-		return err
-	}
-
-	fmt.Printf("\nOpenssl verify discoveryUrl:\n")
-	// infer idpConfigs form CR
-	idpConfigs := strings.TrimSpace(decryptedCR.Spec.GetFromSecrets("identity-providers", "idpConfigs"))
-
-	data := []map[string]interface{}{}
-	if err := json.Unmarshal([]byte(idpConfigs), &data); err != nil {
-		panic(err)
-	}
-
-	var discoveryUrl string
-	for _, idpData := range data {
-		discoveryUrl = idpData["discoveryUrl"].(string)
-		qp.CG.LogVerboseMessage("Discovery url: %s\n", discoveryUrl)
-	}
-	if err := qp.extractCertAndVerify(discoveryUrl, caCertificates); err != nil {
-		return err
-	}
-
-	qp.CG.LogVerboseMessage("Completed preflight verify-ca-chain check\n")
-	return nil
-}
-
-func (qp *QliksensePreflight) extractCertAndVerify(server string, caCertificates string) error {
-	u, err := url.Parse(server)
-	if err != nil {
-		return fmt.Errorf("unable to parse url: %v", err)
-	}
-
-	switch strings.ToLower(u.Scheme) {
-	case "http":
-		return fmt.Errorf("http url is not supported for this operation")
-	case "https":
-		if u.Port() == "" {
-			u.Host += ":443"
-		}
-	}
-
-	qp.CG.LogVerboseMessage("Host: %s, port: %s\n", u.Host, u.Port())
-	conn, err := tls.Dial("tcp", u.Host, &tls.Config{})
-	qp.CG.LogVerboseMessage("Host: %s\n", u.Host)
-	if err != nil {
-		return fmt.Errorf("failed to connect: " + err.Error())
-	}
-	defer conn.Close()
-
-	// Get the ConnectionState struct as that's the one which gives us x509.Certificate struct
-	x509Certificates := conn.ConnectionState().PeerCertificates
-
-	var serverCert *x509.Certificate
-	if len(x509Certificates) == 0 {
-		return fmt.Errorf("no server certificates retrieved from the server")
-	}
-	// we retrieve and verify the server certificate, we ignore intermediate certificates at this point.
-	for _, x509Cert := range x509Certificates {
-		if !x509Cert.IsCA {
-			serverCert = x509Cert
-			break
-		}
-	}
-	if serverCert == nil {
-		return fmt.Errorf("no valid server certificates retrieved from the server")
-	}
-	roots := x509.NewCertPool()
-	if ok := roots.AppendCertsFromPEM([]byte(caCertificates)); !ok {
-		return fmt.Errorf("failed to parse root certificate.")
-	}
-
-	opts := x509.VerifyOptions{
-		Roots:   roots,
-		DNSName: u.Hostname(),
-	}
-	if _, err := serverCert.Verify(opts); err != nil {
-		return fmt.Errorf("failed to verify certificate: " + err.Error())
-	}
-	return nil
-}
--- a/pkg/preflight/version_check.go
+++ b/pkg/preflight/version_check.go
@@ -8,25 +8,25 @@ import (
 	"k8s.io/apimachinery/pkg/version"
 )

-func (p *QliksensePreflight) CheckK8sVersion(namespace string, kubeConfigContents []byte) error {
-	fmt.Print("Preflight kubernetes version check... ")
-	p.CG.LogVerboseMessage("\n----------------------------------- \n")
+func (qp *QliksensePreflight) CheckK8sVersion(namespace string, kubeConfigContents []byte) error {
+	qp.P.LogVerboseMessage("Preflight kubernetes version check: \n")
+	qp.P.LogVerboseMessage("----------------------------------- \n")
 	var currentVersion *semver.Version

-	clientset, _, err := p.CG.GetK8SClientSet(kubeConfigContents, "")
+	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
 	if err != nil {
 		err = fmt.Errorf("Unable to create clientset: %v\n", err)
 		return err
 	}
 	var serverVersion *version.Info
-	if err := p.CG.RetryOnError(func() (err error) {
+	if err := retryOnError(func() (err error) {
 		serverVersion, err = clientset.ServerVersion()
 		return err
 	}); err != nil {
 		err = fmt.Errorf("Unable to get server version: %v\n", err)
 		return err
 	}
-	p.CG.LogVerboseMessage("Kubernetes API Server version: %s\n", serverVersion.String())
+	qp.P.LogVerboseMessage("Kubernetes API Server version: %s\n", serverVersion.String())

 	// Compare K8s version on the cluster with minimum supported k8s version
 	currentVersion, err = semver.NewVersion(serverVersion.String())
@@ -36,14 +36,14 @@ func (p *QliksensePreflight) CheckK8sVersion(namespace string, kubeConfigContent
 	}
 	api.LogDebugMessage("Current Kubernetes Version: %v\n", currentVersion)

-	minK8sVersionSemver, err := semver.NewVersion(p.GetPreflightConfigObj().GetMinK8sVersion())
+	minK8sVersionSemver, err := semver.NewVersion(qp.GetPreflightConfigObj().GetMinK8sVersion())
 	if err != nil {
 		err = fmt.Errorf("Unable to convert minimum Kubernetes version into semver version:%v\n", err)
 		return err
 	}

 	if currentVersion.GreaterThan(minK8sVersionSemver) {
-		p.CG.LogVerboseMessage("Current Kubernetes API Server version %s is greater than or equal to minimum required version: %s\n", currentVersion, minK8sVersionSemver)
+		qp.P.LogVerboseMessage("Current Kubernetes API Server version %s is greater than or equal to minimum required version: %s\n", currentVersion, minK8sVersionSemver)
 	} else {
 		err = fmt.Errorf("Current Kubernetes API Server version %s is less than minimum required version: %s", currentVersion, minK8sVersionSemver)
 		return err
--- a/pkg/qliksense/about.go
+++ b/pkg/qliksense/about.go
@@ -23,12 +23,13 @@ type patch struct {
 	Patch string `yaml:"patch"`
 }

-type annotationTransformer struct {
+type selectivePatch struct {
 	APIVersion string `yaml:"apiVersion"`
 	Metadata   struct {
 		Name string `yaml:"name"`
 	} `yaml:"metadata"`
-	Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"`
+	Enabled bool    `yaml:"enabled"`
+	Patches []patch `yaml:"patches"`
 }

 type helmChart struct {
@@ -72,7 +73,7 @@ func (q *Qliksense) About(gitRef, profile string) (*VersionOutput, error) {
 }

 func (q *Qliksense) AboutDir(configDirectory, profile string) (*VersionOutput, error) {
-	if chartVersion, err := getChartVersion(filepath.Join(configDirectory, "manifests", "base", "transformers", "release", "annotations.yaml"), "app.kubernetes.io/version"); err != nil {
+	if chartVersion, err := getChartVersion(filepath.Join(configDirectory, "transformers", "qseokversion.yaml"), "qliksense"); err != nil {
 		return nil, err
 	} else if kuzManifest, err := executeKustomizeBuildWithStdoutProgress(filepath.Join(configDirectory, "manifests", profile)); err != nil {
 		return nil, err
@@ -222,16 +223,22 @@ func traverseYamlDecodedMapRecursively(val reflect.Value, path []string, visitor
 	}
 }

-func getChartVersion(versionFile, versionAnnotation string) (string, error) {
-	var annTransformer annotationTransformer
+func getChartVersion(versionFile, chartName string) (string, error) {
+	var patchInst patch
+	var selPatch selectivePatch
+	var chart helmChart

 	if bytes, err := ioutil.ReadFile(versionFile); err != nil {
 		return "", err
-	} else if err = yaml.Unmarshal(bytes, &annTransformer); err != nil {
+	} else if err = yaml.Unmarshal(bytes, &selPatch); err != nil {
 		return "", err
 	}
-	if version, ok := annTransformer.Annotations[versionAnnotation]; ok {
-		return version, nil
+	for _, patchInst = range selPatch.Patches {
+		if err := yaml.Unmarshal([]byte(patchInst.Patch), &chart); err == nil {
+			if chart.ChartName == chartName {
+				return chart.ChartVersion, nil
+			}
+		}
 	}
 	return "", nil
 }
--- a/pkg/qliksense/apply.go
+++ b/pkg/qliksense/apply.go
@@ -1,8 +1,61 @@
 package qliksense

-func (q *Qliksense) ApplyCRFromBytes(crBytes []byte, opts *InstallCommandOptions, overwriteExistingContext bool) error {
-	if err := q.LoadCr(crBytes, overwriteExistingContext); err != nil {
+import (
+	"fmt"
+	"io"
+
+	qapi "github.com/qlik-oss/sense-installer/pkg/api"
+)
+
+func (q *Qliksense) ApplyCRFromReader(r io.Reader, opts *InstallCommandOptions, keepPatchFiles, overwriteExistingContext, pull, push bool) error {
+	if err := q.LoadCr(r, overwriteExistingContext); err != nil {
 		return err
 	}
-	return q.InstallQK8s("", opts)
+	qConfig := qapi.NewQConfig(q.QliksenseHome)
+	cr, err := qConfig.GetCurrentCR()
+	if err != nil {
+		return err
+	}
+	version := cr.GetLabelFromCr("version")
+
+	if pull {
+		fmt.Println("Pulling images...")
+		if err := q.PullImages(version, ""); err != nil {
+			return err
+		}
+	}
+	if push {
+		fmt.Println("Pushing images...")
+		if err := q.PushImagesForCurrentCR(); err != nil {
+			return err
+		}
+	}
+
+	if IsQliksenseInstalled(cr.GetName()) {
+		// it is needed in case want to upgrade from one version to another
+		if cr.Spec.ManifestsRoot == "" && cr.Spec.Git == nil {
+			if !qConfig.IsRepoExistForCurrent(version) {
+				if err := q.FetchQK8s(version); err != nil {
+					return err
+				}
+			}
+		}
+		return q.UpgradeQK8s(keepPatchFiles)
+	}
+	return q.InstallQK8s(version, opts, keepPatchFiles)
+}
+
+func IsQliksenseInstalled(crName string) bool {
+	args := []string{
+		"get",
+		"qliksense",
+		crName,
+		"-ogo-template",
+		`--template='{{ .metadata.name}}'`,
+	}
+	_, err := qapi.KubectlDirectOps(args, "")
+	if err != nil {
+		return false
+	}
+	return true
 }
--- a/pkg/qliksense/config.go
+++ b/pkg/qliksense/config.go
@@ -5,19 +5,16 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path"
 	"path/filepath"
 	"strings"

-	"github.com/qlik-oss/k-apis/pkg/config"
-
 	"github.com/mitchellh/go-homedir"
-	"gopkg.in/yaml.v2"

 	"github.com/qlik-oss/k-apis/pkg/cr"
 	"github.com/qlik-oss/sense-installer/pkg/api"
 	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-	"k8s.io/kubectl/pkg/cmd/util/editor"
 )

 const (
@@ -42,9 +39,9 @@ func (q *Qliksense) ConfigApplyQK8s() error {
 		return errors.New(agreementTempalte + "\nPlease do $ qliksense config set-configs qliksense.acceptEULA=yes\n")
 	}

-	// create patch dependent resources
-	fmt.Println("Installing resources used by the kuztomize patch")
-	if err := q.createK8sResourceBeforePatch(qcr); err != nil {
+	// create patch dependent resoruces
+	fmt.Println("Installing resoruces used kuztomize patch")
+	if err := q.createK8sResoruceBeforePatch(qcr); err != nil {
 		return err
 	}

@@ -76,30 +73,27 @@ func (q *Qliksense) configEjson() error {
 }

 func (q *Qliksense) applyConfigToK8s(qcr *qapi.QliksenseCR) error {
-	if err := q.configEjson(); err != nil {
-		return err
+	if qcr.Spec.RotateKeys != "None" {
+		if err := q.configEjson(); err != nil {
+			return err
+		}
 	}
-
 	userHomeDir, err := homedir.Dir()
 	if err != nil {
 		fmt.Printf(`error fetching user's home directory: %v\n`, err)
 		return err
 	}
+	fmt.Println("Manifests root: " + qcr.Spec.GetManifestsRoot())
 	qcr.SetNamespace(qapi.GetKubectlNamespace())
-	b, _ := yaml.Marshal(qcr.KApiCr)
-	fmt.Printf("%v", string(b))
-	// os.Exit(0)
 	// generate patches
-	cr.GeneratePatches(&qcr.KApiCr, config.KeysActionRestoreOrRotate, path.Join(userHomeDir, ".kube", "config"))
+	cr.GeneratePatches(&qcr.KApiCr, path.Join(userHomeDir, ".kube", "config"))
 	// apply generated manifests
 	profilePath := filepath.Join(qcr.Spec.GetManifestsRoot(), qcr.Spec.GetProfileDir())
-	fmt.Printf("Generating manifests for profile: %v\n", profilePath)
 	mByte, err := ExecuteKustomizeBuild(profilePath)
 	if err != nil {
-		fmt.Printf("error generating manifests: %v\n", err)
+		fmt.Println("cannot generate manifests for "+profilePath, err)
 		return err
 	}
-	fmt.Println("Applying manifests to the cluster")
 	if err = qapi.KubectlApply(string(mByte), qcr.GetNamespace()); err != nil {
 		return err
 	}
@@ -196,12 +190,13 @@ func (q *Qliksense) EditCR(contextName string) error {
 	if err := ioutil.WriteFile(tempFile.Name(), crContent, os.ModePerm); err != nil {
 		return nil
 	}
-
-	currentEditor := editor.NewDefaultEditor([]string{"KUBE_EDITOR", "EDITOR"})
-	if err = currentEditor.Launch(tempFile.Name()); err != nil {
+	cmd := exec.Command(getKubeEditorTool(), tempFile.Name())
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
+	err = cmd.Run()
+	if err != nil {
 		return err
 	}
-
 	newCr, err := qapi.GetCRObject(tempFile.Name())
 	if err != nil {
 		return errors.New("cannot save the cr. Someting wrong in the file format. It is not saved\n" + err.Error())
@@ -216,3 +211,11 @@ func (q *Qliksense) EditCR(contextName string) error {
 	}
 	return nil
 }
+
+func getKubeEditorTool() string {
+	editor := os.Getenv("KUBE_EDITOR")
+	if editor == "" {
+		editor = "vim"
+	}
+	return editor
+}
--- a/pkg/qliksense/context_configs.go
+++ b/pkg/qliksense/context_configs.go
@@ -176,6 +176,53 @@ func caseInsenstiveFieldByName(v reflect.Value, name string) reflect.Value {
 	return v.FieldByNameFunc(func(n string) bool { return strings.ToLower(n) == name })
 }

+func validateCR(key string, keySub string, value string, crSpec *api.QliksenseCR) (bool, *api.QliksenseCR) {
+	cr := reflect.ValueOf(crSpec.Spec)
+	keyValid := caseInsenstiveFieldByName(reflect.Indirect(cr), key)
+	if !keyValid.IsValid() {
+		//not in main spec
+		fmt.Println(key, "is an invalid key")
+		return false, crSpec
+	} else if keySub == "" {
+		if key == "rotatekeys" {
+			if _, err := validateInput(value); err != nil {
+				return false, crSpec
+			}
+		}
+	}
+	// checks if it is git or gitops
+	if keySub != "" {
+		if !keyValid.IsNil() {
+			if !caseInsenstiveFieldByName(reflect.Indirect(keyValid), keySub).IsValid() {
+				fmt.Println(keySub, "is an invalid key")
+				return false, crSpec
+			} else {
+				// verify gitops enabled and gitops schedule
+				switch keySub {
+				case "schedule":
+					if _, err := cron.ParseStandard(value); err != nil {
+						fmt.Println("Please enter string with standard cron scheduling syntax ")
+						return false, crSpec
+					}
+				case "enabled":
+					if !strings.EqualFold(value, "yes") && !strings.EqualFold(value, "no") {
+						fmt.Println("Please use yes or no for key enabled")
+						return false, crSpec
+					}
+				}
+			}
+		} else {
+			switch key {
+			case "opsrunner":
+				crSpec.Spec.OpsRunner = &config.OpsRunner{}
+			case "git":
+				crSpec.Spec.Git = &config.Repo{}
+			}
+		}
+	}
+	return true, crSpec
+}
+
 // SetOtherConfigs - set profile/storageclassname/git.repository/manifestRoot commands
 func (q *Qliksense) SetOtherConfigs(args []string) error {
 	// retieve current context from config.yaml
@@ -193,7 +240,11 @@ func (q *Qliksense) SetOtherConfigs(args []string) error {
 	}

 	for _, arg := range args {
-		if strings.HasPrefix(arg, "git.") {
+		if strings.HasPrefix(arg, "fetchSource.") {
+			if err := q.processSetFetchSource(arg, qliksenseCR); err != nil {
+				return err
+			}
+		} else if strings.HasPrefix(arg, "git.") {
 			if err := q.processSetGit(arg, qliksenseCR); err != nil {
 				return err
 			}
@@ -222,34 +273,64 @@ func processSetSingleArg(arg string, cr *api.QliksenseCR) error {
 		cr.Spec.Profile = nv[1]
 	case "storageClassName":
 		cr.Spec.StorageClassName = nv[1]
+	case "rotateKeys":
+		valid := false
+		for _, v := range []string{"yes", "no", "None"} {
+			if nv[1] == v {
+				valid = true
+			}
+		}
+		if !valid {
+			return errors.New("please povide rotateKeys=yes|no|None")
+		}
+		cr.Spec.RotateKeys = nv[1]
 	default:
-		return errors.New("Please enter one of: profile, storageClassName, manifestRoot, git to configure the current context")
+		return errors.New("Please enter one of: profile, storageClassName,rotateKeys, manifestRoot to configure the current context")
 	}
 	return nil
 }

-func (q *Qliksense) processSetGit(arg string, cr *api.QliksenseCR) error {
-	s := strings.Split(arg, "=")
-	tArg0 := strings.TrimSpace(s[0])
-	tArg1 := strings.TrimSpace(s[1])
-	subs := strings.Split(tArg0, ".")
-	if cr.Spec.Git == nil {
-		cr.Spec.Git = &config.Repo{}
+func (q *Qliksense) processSetFetchSource(arg string, cr *api.QliksenseCR) error {
+	args := strings.Split(arg, "=")
+	subs := strings.Split(args[0], ".")
+	if cr.Spec.FetchSource == nil {
+		cr.Spec.FetchSource = &config.Repo{}
 	}
 	switch subs[1] {
 	case "repository":
-		cr.Spec.Git.Repository = tArg1
+		cr.Spec.FetchSource.Repository = args[1]
 	case "accessToken":
 		qConfig := api.NewQConfig(q.QliksenseHome)
 		key, err := qConfig.GetEncryptionKeyFor(cr.GetName())
 		if err != nil {
 			return err
 		}
-		return cr.SetFetchAccessToken(tArg1, key)
+		return cr.SetFetchAccessToken(args[1], key)
 	case "secretName":
-		cr.Spec.Git.SecretName = tArg1
+		cr.Spec.FetchSource.SecretName = args[1]
 	case "userName":
-		cr.Spec.Git.UserName = tArg1
+		cr.Spec.FetchSource.UserName = args[1]
+	default:
+		return errors.New(arg + " does not match any cr spec")
+	}
+	return nil
+}
+
+func (q *Qliksense) processSetGit(arg string, cr *api.QliksenseCR) error {
+	args := strings.Split(arg, "=")
+	subs := strings.Split(args[0], ".")
+	if cr.Spec.Git == nil {
+		cr.Spec.Git = &config.Repo{}
+	}
+	switch subs[1] {
+	case "repository":
+		cr.Spec.Git.Repository = args[1]
+	case "accessToken":
+		cr.Spec.Git.AccessToken = args[1]
+	case "secretName":
+		cr.Spec.Git.SecretName = args[1]
+	case "userName":
+		cr.Spec.Git.UserName = args[1]
 	default:
 		return errors.New(arg + " does not match any cr spec")
 	}
@@ -277,6 +358,8 @@ func (q *Qliksense) processSetOpsRunner(arg string, cr *api.QliksenseCR) error {
 		cr.Spec.OpsRunner.WatchBranch = args[1]
 	case "image":
 		cr.Spec.OpsRunner.Image = args[1]
+	case "crPvc":
+		cr.Spec.OpsRunner.CrPvc = args[1]
 	default:
 		return errors.New(arg + " does not match any cr spec")
 	}
@@ -438,8 +521,8 @@ func (q *Qliksense) SetUpQliksenseContext(contextName string) error {
 		return err
 	}

-	// set the encrypted default mongo for the context in current CR
-	return q.SetSecrets([]string{fmt.Sprintf("qliksense.mongodbUri=mongodb://%s-mongodb:27017/qliksense?ssl=false", contextName)}, false, false)
+	// set the encrypted default mongo
+	return q.SetSecrets([]string{`qliksense.mongodbUri="mongodb://qlik-default-mongodb:27017/qliksense?ssl=false"`}, false, false)
 }

 func validateInput(input string) (string, error) {
--- a/pkg/qliksense/context_configs_test.go
+++ b/pkg/qliksense/context_configs_test.go
@@ -96,6 +96,7 @@ metadata:
  name: qlik-default
 spec:
  profile: docker-desktop
+  rotateKeys: "yes"
  releaseName: qlik-default
 `
 	qlikDefaultContext := "qlik-default"
@@ -243,7 +244,7 @@ func TestSetOtherConfigs(t *testing.T) {
 				q: &Qliksense{
 					QliksenseHome: testDir,
 				},
-				args: []string{"profile=minikube", "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", "opsRunner.enabled=yes", "opsRunner.schedule=30 * * * *", "git.repository=master", "git.userName=foo", "git.accessToken=1234"},
 			},
 			wantErr: false,
 		},
@@ -253,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"},
+				args: []string{"someconfig=somevalue, opsRunner.schedule=bar", "opsRunner.enabled=bar", "git.foo=bar", "rotateKeys=bar"},
 			},
 			wantErr: true,
 		},
@@ -743,6 +744,7 @@ metadata:
  name: qlik-default
 spec:
  profile: docker-desktop
+  rotateKeys: "yes"
  releaseName: qlik-default
  `
 	qlikDefaultContext := "qlik-default"
@@ -761,6 +763,7 @@ metadata:
  name: qlik1
 spec:
  profile: docker-desktop
+  rotateKeys: "yes"
  releaseName: qlik1`

 	contextYaml2 :=
@@ -771,6 +774,7 @@ metadata:
  name: qlik2
 spec:
  profile: docker-desktop
+  rotateKeys: "yes"
  releaseName: qlik2`

 	contextsDir := filepath.Join(testDir, contexts, "qlik1")
--- a/pkg/qliksense/context_configs_unset.go
+++ b/pkg/qliksense/context_configs_unset.go
@@ -38,11 +38,7 @@ func unsetAll(qHome string, args []string) error {
 		}
 		// delete key inside configs if present
 		// delete key inside secrets if present
-		if isRemoved = unsetServiceKey(arg, qcr); isRemoved {
-			//return qConfig.WriteCR(qcr)
-			continue
-		}
-		if isRemoved = unsetTopAttrKey(arg, qcr); !isRemoved {
+		if isRemoved = unsetServiceKey(arg, qcr); !isRemoved {
 			return fmt.Errorf("%s not found in the context", arg)
 		}
 	}
@@ -53,7 +49,7 @@ func unsetOnlyKey(key string, qcr *api.QliksenseCR) bool {

 	v := reflect.ValueOf(qcr.Spec).Elem().FieldByName(strings.Title(key))
 	if v.IsValid() && v.CanSet() {
-		v.Set(reflect.Zero(v.Type()))
+		v.SetString("")
 		return true
 	}
 	return false
@@ -103,21 +99,6 @@ func unsetServiceKey(svcKey string, qcr *api.QliksenseCR) bool {
 	return false
 }

-func unsetTopAttrKey(attKey string, qcr *api.QliksenseCR) bool {
-	sk := strings.Split(attKey, ".")
-	attStruct := sk[0]
-	key := sk[1]
-	attV := reflect.ValueOf(qcr.Spec).Elem().FieldByName(strings.Title(attStruct))
-	if !attV.IsValid() || attV.IsZero() || attV.IsNil() {
-		return false
-	}
-	v := attV.Elem().FieldByName(strings.Title(key))
-	if v.IsValid() && v.CanSet() {
-		v.Set(reflect.Zero(v.Type()))
-		return true
-	}
-	return false
-}
 func findIndex(elem string, nvs kconfig.NameValues) int {
 	for i, nv := range nvs {
 		if nv.Name == elem {
--- a/pkg/qliksense/context_configs_unset_test.go
+++ b/pkg/qliksense/context_configs_unset_test.go
@@ -16,9 +16,7 @@ func TestUnsetAll(t *testing.T) {
 	testPepareDir(qHome)
 	defer os.RemoveAll(qHome)
 	//fmt.Print(qHome)
-	args := []string{"qliksense", "qliksense2.acceptEula3", "serviceA.acceptEula", "opsRunner.watchBranch"}
-	//args := []string{"opsRunner"}
-	//args := []string{"opsRunner.watchBranch"}
+	args := []string{"rotateKeys", "qliksense", "qliksense2.acceptEula3", "serviceA.acceptEula"}
 	if err := unsetAll(qHome, args); err != nil {
 		t.Log("error during unset", err)
 		t.FailNow()
@@ -29,6 +27,10 @@ func TestUnsetAll(t *testing.T) {
 		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")
@@ -42,14 +44,6 @@ func TestUnsetAll(t *testing.T) {
 		t.Log("serviceA not deleted")
 		t.Fail()
 	}
-	if qcr.Spec.OpsRunner == nil {
-		t.Log("opsRunner not deleted")
-		t.Fail()
-	}
-	if qcr.Spec.OpsRunner.WatchBranch != "" {
-		t.Log("opsRunner.watchBranch not deleted")
-		t.Fail()
-	}
 }

 func testPepareDir(qHome string) {
@@ -78,9 +72,7 @@ metadata:
  name: qlik-default
 spec:
  profile: docker-desktop
-  opsRunner:
-    enabled: "yes"
-    watchBranch: something
+  rotateKeys: "yes"
  configs:
    qliksense:
    - name: acceptEula
--- a/pkg/qliksense/crds.go
+++ b/pkg/qliksense/crds.go
@@ -5,15 +5,7 @@ import (
 	"os"
 	"path/filepath"

-	"github.com/mitchellh/go-homedir"
 	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-	apixv1beta1client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/tools/clientcmd"
-	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/resource"
 )

 type CrdCommandOptions struct {
@@ -28,11 +20,11 @@ func (q *Qliksense) ViewCrds(opts *CrdCommandOptions) error {
 		fmt.Println("cannot get the current-context cr", err)
 		return err
 	}
-	engineCRD, err := getQliksenseInitCrds(qcr)
+	engineCRD, err := getQliksenseInitCrd(qcr)
 	if err != nil {
 		return err
 	}
-	customCrd, err := getCustomCrds(qcr)
+	customCrd, err := getCustomCrd(qcr)
 	if err != nil {
 		return nil
 	}
@@ -59,12 +51,12 @@ func (q *Qliksense) InstallCrds(opts *CrdCommandOptions) error {
 		return err
 	}

-	if engineCRD, err := getQliksenseInitCrds(qcr); err != nil {
+	if engineCRD, err := getQliksenseInitCrd(qcr); err != nil {
 		return err
 	} else if err = qapi.KubectlApply(engineCRD, ""); err != nil {
 		return err
 	}
-	if customCrd, err := getCustomCrds(qcr); err != nil {
+	if customCrd, err := getCustomCrd(qcr); err != nil {
 		return err
 	} else if customCrd != "" {
 		if err = qapi.KubectlApply(customCrd, ""); err != nil {
@@ -81,7 +73,7 @@ func (q *Qliksense) InstallCrds(opts *CrdCommandOptions) error {
 	return nil
 }

-func getQliksenseInitCrds(qcr *qapi.QliksenseCR) (string, error) {
+func getQliksenseInitCrd(qcr *qapi.QliksenseCR) (string, error) {
 	var repoPath string
 	var err error

@@ -106,7 +98,7 @@ func getQliksenseInitCrds(qcr *qapi.QliksenseCR) (string, error) {
 	return string(qInitByte), nil
 }

-func getCustomCrds(qcr *qapi.QliksenseCR) (string, error) {
+func getCustomCrd(qcr *qapi.QliksenseCR) (string, error) {
 	crdPath := qcr.GetCustomCrdsPath()
 	if crdPath == "" {
 		return "", nil
@@ -118,77 +110,3 @@ func getCustomCrds(qcr *qapi.QliksenseCR) (string, error) {
 	}
 	return string(qInitByte), nil
 }
-
-func (q *Qliksense) CheckAllCrdsInstalled() (bool, error) {
-	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	qcr, err := qConfig.GetCurrentCR()
-	if err != nil {
-		return false, err
-	}
-
-	customResourceDefinitionInterface, err := getCustomResourceDefinitionInterface()
-	if err != nil {
-		return false, err
-	}
-
-	if engineCRDs, err := getQliksenseInitCrds(qcr); err != nil {
-		return false, err
-	} else if allInstalled, err := checkCrdsInstalled(engineCRDs, customResourceDefinitionInterface); err != nil {
-		return false, err
-	} else if !allInstalled {
-		return false, nil
-	}
-
-	if customCrds, err := getCustomCrds(qcr); err != nil {
-		return false, err
-	} else if allInstalled, err := checkCrdsInstalled(customCrds, customResourceDefinitionInterface); err != nil {
-		return false, err
-	} else if !allInstalled {
-		return false, nil
-	}
-
-	if allInstalled, err := checkCrdsInstalled(q.GetOperatorCRDString(), customResourceDefinitionInterface); err != nil {
-		return false, err
-	} else if !allInstalled {
-		return false, nil
-	}
-
-	return true, nil
-}
-
-func checkCrdsInstalled(crds string, customResourceDefinitionInterface apixv1beta1client.CustomResourceDefinitionInterface) (bool, error) {
-	kuzResourceFactory := resmap.NewFactory(resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl()), nil)
-	if kuzResMap, err := kuzResourceFactory.NewResMapFromBytes([]byte(crds)); err != nil {
-		return false, err
-	} else {
-		for _, kuzRes := range kuzResMap.Resources() {
-			if customResourceDefinition, err := customResourceDefinitionInterface.Get(kuzRes.GetName(), v1.GetOptions{}); err != nil && apierrors.IsNotFound(err) {
-				return false, nil
-			} else if err != nil {
-				return false, err
-			} else if customResourceDefinition == nil {
-				return false, fmt.Errorf("failed looking up crd: %v", kuzRes.GetName())
-			}
-		}
-		return true, nil
-	}
-}
-
-func getCustomResourceDefinitionInterface() (apixv1beta1client.CustomResourceDefinitionInterface, error) {
-	homeDir, err := homedir.Dir()
-	if err != nil {
-		return nil, err
-	}
-	kubeconfigPath := filepath.Join(homeDir, ".kube", "config")
-	k8sRestConfig, err := clientcmd.BuildConfigFromFlags("", kubeconfigPath)
-	if err != nil {
-		return nil, err
-	}
-
-	apixClient, err := apixv1beta1client.NewForConfig(k8sRestConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	return apixClient.CustomResourceDefinitions(), nil
-}
--- a/pkg/qliksense/crds_test.go
+++ b/pkg/qliksense/crds_test.go
@@ -1,18 +1,8 @@
 package qliksense

 import (
-	"io/ioutil"
-	"os"
 	"testing"

-	apixv1beta1client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/resource"
-
-	"github.com/gobuffalo/packr/v2"
-
 	kapi_config "github.com/qlik-oss/k-apis/pkg/config"
 	qapi "github.com/qlik-oss/sense-installer/pkg/api"
 )
@@ -23,7 +13,7 @@ func TestGetQliksenseInitCrd(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}

-	crdFromContextConfig, err := getQliksenseInitCrds(&qapi.QliksenseCR{
+	crdFromContextConfig, err := getQliksenseInitCrd(&qapi.QliksenseCR{
 		KApiCr: kapi_config.KApiCr{
 			Spec: &kapi_config.CRSpec{
 				ManifestsRoot: someTmpRepoPath,
@@ -34,7 +24,7 @@ func TestGetQliksenseInitCrd(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}

-	crdFromDownloadedConfig, err := getQliksenseInitCrds(&qapi.QliksenseCR{
+	crdFromDownloadedConfig, err := getQliksenseInitCrd(&qapi.QliksenseCR{
 		KApiCr: kapi_config.KApiCr{
 			Spec: &kapi_config.CRSpec{
 				ManifestsRoot: "",
@@ -49,87 +39,3 @@ func TestGetQliksenseInitCrd(t *testing.T) {
 		t.Fatalf("expected %v to equal %v, but they didn't", crdFromContextConfig, crdFromDownloadedConfig)
 	}
 }
-
-func TestCheckAllCrdsInstalled(t *testing.T) {
-	t.Skip("Skipping this test because it makes kubernetes calls")
-
-	tmpQlikSenseHome, err := ioutil.TempDir("", "tmp-qlik-sense-home-")
-	if err != nil {
-		t.Fatalf("unexpected error creating tmp dir: %v", err)
-	}
-	defer os.RemoveAll(tmpQlikSenseHome)
-
-	setupQliksenseTestDefaultContext(t, tmpQlikSenseHome, `
-apiVersion: qlik.com/v1
-kind: Qliksense
-metadata:
-  name: qlik-default
-spec:
-  profile: docker-desktop
-`)
-
-	q := &Qliksense{
-		QliksenseHome: tmpQlikSenseHome,
-		CrdBox:        packr.New("crds", "./crds"),
-	}
-
-	if err := q.FetchQK8s("v1.50.3"); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if allInstalled, err := q.CheckAllCrdsInstalled(); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	} else if allInstalled {
-		t.Fatal("expected crds to NOT be installed at this point")
-	}
-
-	if err := q.InstallCrds(&CrdCommandOptions{All: true}); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	} else if allInstalled, err := q.CheckAllCrdsInstalled(); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	} else if !allInstalled {
-		t.Fatal("expected crds to BE installed at this point")
-	}
-
-	//cleanup:
-	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	qcr, err := qConfig.GetCurrentCR()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	customResourceDefinitionInterface, err := getCustomResourceDefinitionInterface()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if engineCRDs, err := getQliksenseInitCrds(qcr); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	} else if err := deleteCrds(engineCRDs, customResourceDefinitionInterface); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if customCrd, err := getCustomCrds(qcr); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	} else if err := deleteCrds(customCrd, customResourceDefinitionInterface); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if err := deleteCrds(q.GetOperatorCRDString(), customResourceDefinitionInterface); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func deleteCrds(crds string, customResourceDefinitionInterface apixv1beta1client.CustomResourceDefinitionInterface) error {
-	kuzResourceFactory := resmap.NewFactory(resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl()), nil)
-	if kuzResMap, err := kuzResourceFactory.NewResMapFromBytes([]byte(crds)); err != nil {
-		return err
-	} else {
-		for _, kuzRes := range kuzResMap.Resources() {
-			if err := customResourceDefinitionInterface.Delete(kuzRes.GetName(), &v1.DeleteOptions{}); err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-}
--- a/pkg/qliksense/docker.go
+++ b/pkg/qliksense/docker.go
@@ -30,14 +30,19 @@ const (

 func (q *Qliksense) PullImages(version, profile string) error {
 	qConfig := qapi.NewQConfig(q.QliksenseHome)
+	if version != "" {
+		if !qConfig.IsRepoExistForCurrent(version) {
+			if err := q.FetchQK8s(version); err != nil {
+				return err
+			}
+		}
+	}
 	qcr, err := qConfig.GetCurrentCR()
 	if err != nil {
 		return err
 	}
 	if !qcr.IsRepoExist() {
-		if err := fetchAndUpdateCR(qConfig, version); err != nil {
-			return err
-		}
+		return errors.New("ManifestsRoot not found")
 	}
 	if profile != "" {
 		qcr.Spec.Profile = profile
@@ -155,10 +160,7 @@ func (q *Qliksense) PushImagesForCurrentCR() error {
 	qcr, err := qConfig.GetCurrentCR()
 	if err != nil {
 		return err
-	} else if err := ensureImageRegistrySetInCR(qcr); err != nil {
-		return err
 	}
-
 	version := qcr.GetLabelFromCr("version")
 	profile := qcr.Spec.Profile
 	repoDir := qcr.Spec.ManifestsRoot
@@ -342,20 +344,3 @@ func (q *Qliksense) writeVersionOutput(versionOut *VersionOutput, imagesDir, ver
 	}
 	return nil
 }
-
-func validatePullPushFlagsOnInstall(cr *qapi.QliksenseCR, pull, push bool) error {
-	if pull && !push {
-		fmt.Printf("WARNING: pulling images without pushing them\n")
-	}
-	if push {
-		return ensureImageRegistrySetInCR(cr)
-	}
-	return nil
-}
-
-func ensureImageRegistrySetInCR(cr *qapi.QliksenseCR) error {
-	if registry := cr.Spec.GetImageRegistry(); registry == "" {
-		return errors.New("no image registry set in the CR; to set it use: qliksense config set-image-registry")
-	}
-	return nil
-}
--- a/pkg/qliksense/docker_test.go
+++ b/pkg/qliksense/docker_test.go
@@ -235,19 +235,19 @@ spec:
 		t.Fatal("expected to find the GitOps image in the list, but it wasn't there")
 	}
 	if !haveMatchingImage(func(image string) bool {
-		return strings.Contains(image, "nginx")
+		return image == "nginx"
 	}) {
 		t.Fatal("expected to find the nginx Preflight image in the list, but it wasn't there")
 	}
 	if !haveMatchingImage(func(image string) bool {
-		return strings.Contains(image, "preflight-netcat")
+		return image == "subfuzion/netcat"
 	}) {
 		t.Fatal("expected to find the netcat Preflight image in the list, but it wasn't there")
 	}
 	if !haveMatchingImage(func(image string) bool {
-		return strings.Contains(image, "qlik-docker-oss.bintray.io/preflight-mongo")
+		return image == "qlik-docker-oss.bintray.io/preflight-mongo"
 	}) {
-		t.Fatal("expected to find the preflight-mongo image in the list, but it wasn't there")
+		t.Fatal("expected to find the mongo Preflight image in the list, but it wasn't there")
 	}
 }

@@ -268,6 +268,7 @@ spec:
    - name: imageRegistry
      value: %s
  manifestsRoot: %s
+  rotateKeys: "yes"
  releaseName: qlik-default
 `, version, registry.url, manifestsRootDir)
 	setupQliksenseTestDefaultContext(t, tmpQlikSenseHome, cr)
@@ -314,23 +315,23 @@ spec:
 		return err
 	}

-	transformersDir := path.Join(manifestsRootDir, "manifests", "base", "transformers", "release")
+	transformersDir := path.Join(manifestsRootDir, "transformers")
 	if err := os.MkdirAll(transformersDir, os.ModePerm); err != nil {
 		return err
 	}
-	if err := ioutil.WriteFile(path.Join(transformersDir, "annotations.yaml"), []byte(`
-apiVersion: builtin
-kind: AnnotationsTransformer
+	if err := ioutil.WriteFile(path.Join(transformersDir, "qseokversion.yaml"), []byte(`
+apiVersion: qlik.com/v1
+kind: SelectivePatch
 metadata:
-  name: common-annotations
-annotations:
-  app.kubernetes.io/name: qliksense
-  app.kubernetes.io/instance: $(PREFIX)
-  app.kubernetes.io/version: 1.21.23
-  app.kubernetes.io/managed-by: qliksense-operator
-fieldSpecs:
-  - path: metadata/annotations
-    create: true
+  name: qseokversion
+enabled: true
+patches:
+- target:
+    kind: HelmChart
+    labelSelector: name!=qliksense-init
+  patch: |-
+    chartName: qliksense
+    chartVersion: 1.21.23
 `), os.ModePerm); err != nil {
 		return err
 	}
--- a/pkg/qliksense/fetch.go
+++ b/pkg/qliksense/fetch.go
@@ -2,6 +2,7 @@ package qliksense

 import (
 	"bufio"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -53,7 +54,10 @@ func (q *Qliksense) FetchK8sWithOpts(opts *FetchCommandOptions) error {
 		cr.SetFetchUrl(opts.GitUrl)
 	}
 	v := getVersion(opts, cr)
-	if v != "" && qConfig.IsRepoExistForCurrent(v) {
+	if v == "" {
+		return errors.New("Cannot find gitref/tag/branch/version to fetch")
+	}
+	if qConfig.IsRepoExistForCurrent(v) {
 		if opts.Overwrite || getVerionsOverwriteConfirmation(v) == "y" {
 			if err := qConfig.DeleteRepoForCurrent(v); err != nil {
 				return err
@@ -94,6 +98,7 @@ func fetchAndUpdateCR(qConfig *qapi.QliksenseConfig, version string) error {
 	if err != nil {
 		return err
 	}
+
 	destDir := qConfig.BuildRepoPath(version)
 	fmt.Printf("fetching version [%s] from %s\n", version, qcr.GetFetchUrl())
 	if err := qapi.CopyDirectory(tempDest, destDir); err != nil {
@@ -137,7 +142,7 @@ func getVersion(opts *FetchCommandOptions, qcr *qapi.QliksenseCR) string {

 func getVerionsOverwriteConfirmation(version string) string {
 	reader := bufio.NewReader(os.Stdin)
-	fmt.Println("The version  [" + version + "] already exists")
+	fmt.Println("The version  [" + version + "] already exist")
 	cfm := "n"
 	for {
 		fmt.Print("Do you want to delete and fetch again [y/N]: ")
--- a/pkg/qliksense/fetch_test.go
+++ b/pkg/qliksense/fetch_test.go
@@ -16,7 +16,7 @@ func TestFetchAndUpdateCR(t *testing.T) {
 	}
 	q.SetUpQliksenseContext("test1")
 	qConfig := qapi.NewQConfig(tempHome)
-	if err := fetchAndUpdateCR(qConfig, "v0.0.8"); err != nil {
+	if err := fetchAndUpdateCR(qConfig, "v0.0.2"); err != nil {
 		t.Log(err)
 		t.FailNow()
 	}
@@ -28,8 +28,8 @@ func TestFetchAndUpdateCR(t *testing.T) {
 		t.FailNow()
 	}

-	if cr.Spec.ManifestsRoot != "contexts/test1/qlik-k8s/v0.0.8" {
-		t.Log("actual path: " + cr.Spec.ManifestsRoot + ", expected path: contexts/test1/qlik-k8s/v0.0.8")
+	if cr.Spec.ManifestsRoot != "contexts/test1/qlik-k8s/v0.0.2" {
+		t.Log("actual path: " + cr.Spec.ManifestsRoot + ", expected path: contexts/test1/qlik-k8s/v0.0.2")
 		t.FailNow()
 	}
 	//testing latest tag is fetched
@@ -43,7 +43,7 @@ func TestFetchAndUpdateCR(t *testing.T) {
 	cr = &qapi.QliksenseCR{}
 	qapi.ReadFromFile(cr, actualCrFile)
 	v := cr.GetLabelFromCr("version")
-	if v == "" || v == "v0.0.8" {
+	if v == "" || v == "v0.0.2" {
 		t.Log("should get latest but got version: " + v)
 		t.Fail()
 	}
--- a/pkg/qliksense/get_installable_versions.go
+++ b/pkg/qliksense/get_installable_versions.go
@@ -5,8 +5,6 @@ import (
 	"fmt"

 	"github.com/Masterminds/semver/v3"
-	"github.com/go-git/go-git/v5/plumbing/transport"
-	"github.com/go-git/go-git/v5/plumbing/transport/http"
 	"github.com/qlik-oss/k-apis/pkg/git"
 	qapi "github.com/qlik-oss/sense-installer/pkg/api"
 )
@@ -24,20 +22,8 @@ func (q *Qliksense) GetInstallableVersions(opts *LsRemoteCmdOptions) error {
 	}

 	var repoPath string
-	var auth transport.AuthMethod
 	if qcr.Spec.GetManifestsRoot() != "" {
 		repoPath = qcr.Spec.GetManifestsRoot()
-		encKey, err := qConfig.GetEncryptionKeyFor(qcr.GetName())
-		if err != nil {
-			return err
-		}
-		accessToken := qcr.GetFetchAccessToken(encKey)
-		if accessToken != "" {
-			auth = &http.BasicAuth{
-				Username: "something",
-				Password: accessToken,
-			}
-		}
 	} else {
 		repoPath, err = DownloadFromGitRepoToTmpDir(defaultConfigRepoGitUrl, "master")
 		if err != nil {
@@ -50,7 +36,7 @@ func (q *Qliksense) GetInstallableVersions(opts *LsRemoteCmdOptions) error {
 		return err
 	}

-	remoteRefsList, err := git.GetRemoteRefs(r, auth,
+	remoteRefsList, err := git.GetRemoteRefs(r, nil,
 		&git.RemoteRefConstraints{
 			Include:   true,
 			Sort:      true,
@@ -110,18 +96,13 @@ func getLatestTag(repoUrl, accessToken string) (string, error) {
 	if err != nil {
 		return "", err
 	}
+
 	r, err := git.OpenRepository(repoPath)
 	if err != nil {
 		return "", err
 	}
-	var auth transport.AuthMethod
-	if accessToken != "" {
-		auth = &http.BasicAuth{
-			Username: "something",
-			Password: accessToken,
-		}
-	}
-	remoteRefsList, err := git.GetRemoteRefs(r, auth,
+
+	remoteRefsList, err := git.GetRemoteRefs(r, nil,
 		&git.RemoteRefConstraints{
 			Include:   true,
 			Sort:      true,
@@ -163,7 +144,7 @@ func getLatestTag(repoUrl, accessToken string) (string, error) {
 		v, err := semver.NewVersion(sv)
 		if err != nil {
 			// it may happen, in the repo some tags may not conform to semver
-			//fmt.Println("the tag is not conform to semver: " + sv)
+			fmt.Print("Unconform tags: " + sv)
 			continue
 		}
 		if maxSem == nil || maxSem.LessThan(v) {
--- a/pkg/qliksense/get_installable_versions_test.go
+++ b/pkg/qliksense/get_installable_versions_test.go
@@ -17,9 +17,9 @@ func TestGetLatestTag(t *testing.T) {
 		t.Log(err)
 		t.Log(sv)
 	}
-	baseV, _ := semver.NewVersion("v0.0.8")
+	baseV, _ := semver.NewVersion("v0.0.7")
 	if !sv.GreaterThan(baseV) {
-		t.Log("Expected greater than v0.0.8, but got:  " + s)
+		t.Log("Expected greater than v0.0.7, but got:  " + s)
 		t.Fail()
 	}
 }
--- a/pkg/qliksense/install.go
+++ b/pkg/qliksense/install.go
@@ -7,11 +7,6 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/mattn/go-tty"

 	"github.com/mitchellh/go-homedir"
 	"github.com/qlik-oss/k-apis/pkg/config"
@@ -22,99 +17,63 @@ import (
 )

 type InstallCommandOptions struct {
-	StorageClass    string
-	MongodbUri      string
-	AcceptEULA      string
-	DryRun          bool
-	Pull            bool
-	Push            bool
-	CleanPatchFiles bool
-	RotateKeys      bool
+	StorageClass string
+	MongodbUri   string
+	RotateKeys   string
+	DryRun       bool
 }

-const (
-	eulaText             = "Please read the end user license agreement at: https://www.qlik.com/us/legal/license-terms"
-	eulaPrompt           = "Do you accept our EULA? (y/n): "
-	eulaErrorInstruction = `You must enter "y" to continue or execute the command with the acceptEULA flag set to "yes"`
-)
+func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions, keepPatchFiles bool) error {

-func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions) error {
+	// step1: fetch 1.0.0 # pull down qliksense-k8s@1.0.0
+	// step2: operator view | kubectl apply -f # operator manifest (CRD)
+	// step3: config apply | kubectl apply -f # generates patches (if required) in configuration directory, applies manifest
+	// step4: config view | kubectl apply -f # generates Custom Resource manifest (CR)

+	// fetch the version
 	qConfig := qapi.NewQConfig(q.QliksenseHome)
+	if !keepPatchFiles {
+		if err := q.DiscardAllUnstagedChangesFromGitRepo(qConfig); err != nil {
+			fmt.Printf("error removing temporary changes to the config: %v\n", err)
+		}
+	}
+
 	qcr, err := qConfig.GetCurrentCR()
 	if err != nil {
 		fmt.Println("cannot get the current-context cr", err)
 		return err
 	}

-	if !qcr.IsRepoExist() {
-		if err := fetchAndUpdateCR(qConfig, version); err != nil {
-			return err
-		} else if qcr, err = qConfig.GetCurrentCR(); err != nil {
-			return err
-		}
-	}
-
-	if opts.AcceptEULA != "" && opts.AcceptEULA != "yes" {
-		enforceEula()
-	} else if opts.AcceptEULA == "" && !qcr.IsEULA() {
-		enforceEula()
-	}
 	qcr.SetEULA("yes")
-
 	if opts.MongodbUri != "" {
 		qcr.Spec.AddToSecrets("qliksense", "mongodbUri", opts.MongodbUri, "")
 	}
 	if opts.StorageClass != "" {
 		qcr.Spec.StorageClassName = opts.StorageClass
 	}
-
-	if err := qConfig.WriteCurrentContextCR(qcr); err != nil {
-		return err
+	if opts.RotateKeys != "" {
+		qcr.Spec.RotateKeys = opts.RotateKeys
 	}
-
-	if opts.CleanPatchFiles {
-		if err := q.DiscardAllUnstagedChangesFromGitRepo(qConfig); err != nil {
-			fmt.Printf("error removing temporary changes to the config: %v\n", err)
-		}
-	}
-
 	// for debugging purpose
 	if opts.DryRun {
 		// generate patches
+		qcr.Spec.RotateKeys = "None"
 		userHomeDir, _ := homedir.Dir()
 		fmt.Println("Generating patches only")
-		cr.GeneratePatches(&qcr.KApiCr, config.KeysActionDoNothing, path.Join(userHomeDir, ".kube", "config"))
+		cr.GeneratePatches(&qcr.KApiCr, path.Join(userHomeDir, ".kube", "config"))
 		return nil
 	}
-
-	if installed, err := q.CheckAllCrdsInstalled(); err != nil {
-		fmt.Println("error verifying whether CRDs are installed", err)
-		return err
-	} else if !installed {
-		return errors.New(`please install CRDs by executing: $ qliksense crds install`)
-	}
-
-	if err := validatePullPushFlagsOnInstall(qcr, opts.Pull, opts.Push); err != nil {
-		return err
-	}
-	if opts.Pull {
-		fmt.Println("Pulling images...")
-		if err := q.PullImages(version, ""); err != nil {
-			return err
-		}
-	}
-	if opts.Push {
-		fmt.Println("Pushing images...")
-		if err := q.PushImagesForCurrentCR(); err != nil {
-			return err
-		}
-	}
+	qConfig.WriteCurrentContextCR(qcr)

 	if err := applyImagePullSecret(qConfig); err != nil {
 		return err
 	}

+	// check if acceptEULA is yes or not
+	if !qcr.IsEULA() {
+		return errors.New(agreementTempalte + "\n Please do $ qliksense install --acceptEULA=yes\n")
+	}
+
 	//CRD will be installed outside of operator
 	//install operator controller into the namespace
 	fmt.Println("Installing operator controller")
@@ -126,25 +85,13 @@ func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions) err
 		return err
 	}

-	// create patch dependent resources
-	fmt.Println("Installing resources used by the kuztomize patch")
-	if err := q.createK8sResourceBeforePatch(qcr); err != nil {
+	// create patch dependent resoruces
+	fmt.Println("Installing resoruces used kuztomize patch")
+	if err := q.createK8sResoruceBeforePatch(qcr); err != nil {
 		return err
 	}

-	if opts.RotateKeys {
-		fmt.Println("Deleting stored application keys")
-		if err := q.DeleteKeysClusterBackup(); err != nil {
-			return err
-		} else {
-			qcr.AddLabelToCr("keys-rotated", strconv.FormatInt(time.Now().Unix(), 10))
-			if err := qConfig.WriteCurrentContextCR(qcr); err != nil {
-				return err
-			}
-		}
-	}
-
-	if qcr.Spec.OpsRunner != nil {
+	if qcr.Spec.Git != nil && qcr.Spec.Git.Repository != "" {
 		// fetching and applying manifest will be in the operator controller
 		// get decrypted cr
 		if dcr, err := qConfig.GetDecryptedCr(qcr); err != nil {
@@ -153,16 +100,35 @@ func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions) err
 			return q.applyCR(dcr)
 		}
 	}
+	if !qcr.IsRepoExist() {
+		if err := fetchAndUpdateCR(qConfig, version); err != nil {
+			return err
+		}
+	}
+
+	qcr, err = qConfig.GetCurrentCR()
+	if err != nil {
+		fmt.Println("cannot get the current-context cr", err)
+		return err
+	} else if qcr.Spec.GetManifestsRoot() == "" {
+		return errors.New("cannot get the manifest root. Use qliksense fetch <version> or qliksense set manifestsRoot")
+	}

 	// install generated manifests into cluster
-	fmt.Println("Installing generated manifests into the cluster")
+	fmt.Println("Installing generated manifests into cluster")
+
 	if dcr, err := qConfig.GetDecryptedCr(qcr); err != nil {
 		return err
-	} else if err := q.applyConfigToK8s(dcr); err != nil {
-		fmt.Println("cannot do kubectl apply on manifests")
-		return err
 	} else {
-		return q.applyCR(dcr)
+		if IsQliksenseInstalled(dcr.GetName()) {
+			return q.UpgradeQK8s(keepPatchFiles)
+		}
+		if err := q.applyConfigToK8s(dcr); err != nil {
+			fmt.Println("cannot do kubectl apply on manifests")
+			return err
+		} else {
+			return q.applyCR(dcr)
+		}
 	}
 }

@@ -227,7 +193,7 @@ images:
 func (q *Qliksense) applyCR(cr *qapi.QliksenseCR) error {
 	// install operator cr into cluster
 	//get the current context cr
-	fmt.Println("Installing operator CR into the cluster")
+	fmt.Println("Install operator CR into cluster")
 	r, err := cr.GetString()
 	if err != nil {
 		return err
@@ -239,7 +205,7 @@ func (q *Qliksense) applyCR(cr *qapi.QliksenseCR) error {
 	return nil
 }

-func (q *Qliksense) createK8sResourceBeforePatch(qcr *qapi.QliksenseCR) error {
+func (q *Qliksense) createK8sResoruceBeforePatch(qcr *qapi.QliksenseCR) error {
 	for svc, nvs := range qcr.Spec.Secrets {
 		for _, nv := range nvs {
 			if isK8sSecretNeedToCreate(nv) {
@@ -258,26 +224,3 @@ func (q *Qliksense) createK8sResourceBeforePatch(qcr *qapi.QliksenseCR) error {
 func isK8sSecretNeedToCreate(nv config.NameValue) bool {
 	return nv.ValueFrom != nil
 }
-
-func enforceEula() {
-	fmt.Println(eulaText)
-	fmt.Print(eulaPrompt)
-	answer := readAnswerFromTty()
-	if strings.ToLower(answer) != "y" {
-		fmt.Println(eulaErrorInstruction)
-		os.Exit(1)
-	}
-}
-
-func readAnswerFromTty() string {
-	t, err := tty.Open()
-	if err != nil {
-		panic(err)
-	}
-	defer t.Close()
-	answer, err := t.ReadString()
-	if err != nil {
-		panic(err)
-	}
-	return answer
-}
--- a/pkg/qliksense/install_test.go
+++ b/pkg/qliksense/install_test.go
@@ -5,18 +5,20 @@ import (
 	"io/ioutil"
 	"os"
 	"path"
+	"path/filepath"
 	"strings"
 	"testing"

-	"github.com/gobuffalo/packr/v2"
-	qapi "github.com/qlik-oss/sense-installer/pkg/api"
 	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
+
+	"github.com/gobuffalo/packr/v2"
+	qapi "github.com/qlik-oss/sense-installer/pkg/api"
 )

-func TestCreateK8sResourceBeforePatch(t *testing.T) {
+func TestCreateK8sResoruceBeforePatch(t *testing.T) {
 	td := setup()
 	sampleCr := `
 apiVersion: qlik.com/v1
@@ -43,10 +45,18 @@ spec:
    qliksense:
    - name: mongodbUri
      value: mongodb://qlik-default-mongodb:27017/qliksense?ssl=false
-  profile: docker-desktop`
+  profile: docker-desktop
+  rotateKeys: "yes"`

+	crFile := filepath.Join(testDir, "install_test.yaml")
+	ioutil.WriteFile(crFile, []byte(sampleCr), 0644)
 	q := New(testDir)
-	if err := q.LoadCr([]byte(sampleCr), false); err != nil {
+	file, e := os.Open(crFile)
+	if e != nil {
+		t.Log(e)
+		t.FailNow()
+	}
+	if err := q.LoadCr(file, false); err != nil {
 		t.Log(err)
 		t.FailNow()
 	}
@@ -56,7 +66,7 @@ spec:
 		t.Log(err)
 		t.FailNow()
 	}
-	if err = q.createK8sResourceBeforePatch(cr); err != nil {
+	if err = q.createK8sResoruceBeforePatch(cr); err != nil {
 		t.Log(err)
 		t.FailNow()
 	}
--- a/pkg/qliksense/keys.go
+++ b/pkg/qliksense/keys.go
@@ -1,21 +0,0 @@
-package qliksense
-
-import (
-	"path"
-
-	"github.com/mitchellh/go-homedir"
-	"github.com/qlik-oss/k-apis/pkg/cr"
-	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-)
-
-func (q *Qliksense) DeleteKeysClusterBackup() error {
-	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	if qcr, err := qConfig.GetCurrentCR(); err != nil {
-		return err
-	} else if userHomeDir, err := homedir.Dir(); err != nil {
-		return err
-	} else if err := cr.DeleteKeysClusterBackup(&qcr.KApiCr, path.Join(userHomeDir, ".kube", "config")); err != nil {
-		return err
-	}
-	return nil
-}
--- a/pkg/qliksense/kuz_test.go
+++ b/pkg/qliksense/kuz_test.go
@@ -276,11 +276,9 @@ func Test_executeKustomizeBuild_onQlikConfig_regenerateKeys(t *testing.T) {
 	configPath := filepath.Join(tmpDir, "config")
 	if repo, err := kapis_git.CloneRepository(configPath, defaultConfigRepoGitUrl, nil); err != nil {
 		t.Fatalf("unexpected error: %v\n", err)
-	} else if err := kapis_git.Checkout(repo, "e38df644e759abf0b5941c1511d1a2cd5e3c42fa", "commit-e38df644e759abf0b5941c1511d1a2cd5e3c42fa", nil); err != nil {
+	} else if err := kapis_git.Checkout(repo, "e38df644e759abf0b5941c1511d1a2cd5e3c42fa", "", nil); err != nil {
 		t.Fatalf("unexpected error: %v\n", err)
 	}
-	//tmpDir := "/var/folders/mf/5hs1qkq508q_scjbhxhmf9qwjrp346/T/679268230"
-	//configPath := "/var/folders/mf/5hs1qkq508q_scjbhxhmf9qwjrp346/T/679268230/config"

 	cr := &config.CRSpec{
 		ManifestsRoot: configPath,
@@ -312,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[interface {}]interface {})["name"].(string), "users-secrets-") {
+			keyIdBase64 = resource["data"].(map[interface {}]interface {})["tokenAuthPrivateKeyId"].(string)
 			break
 		}
 	}
--- a/pkg/qliksense/load_cr.go
+++ b/pkg/qliksense/load_cr.go
@@ -3,13 +3,17 @@ package qliksense
 import (
 	"errors"
 	"fmt"
+	"io"
+	"io/ioutil"
 	"strings"

 	qapi "github.com/qlik-oss/sense-installer/pkg/api"
 )

-func (q *Qliksense) LoadCr(crBytes []byte, overwriteExistingContext bool) error {
-	if crName, err := q.loadCrStringIntoFileSystem(string(crBytes), overwriteExistingContext); err != nil {
+func (q *Qliksense) LoadCr(reader io.Reader, overwriteExistingContext bool) error {
+	if crBytes, err := ioutil.ReadAll(reader); err != nil {
+		return err
+	} else if crName, err := q.loadCrStringIntoFileSystem(string(crBytes), overwriteExistingContext); err != nil {
 		return err
 	} else {
 		fmt.Println("cr name: [ " + crName + " ] has been loaded")
@@ -17,6 +21,16 @@ func (q *Qliksense) LoadCr(crBytes []byte, overwriteExistingContext bool) error
 	return nil
 }

+func (q *Qliksense) IsEulaAcceptedInCrFile(reader io.Reader) (bool, error) {
+	if crBytes, err := ioutil.ReadAll(reader); err != nil {
+		return false, err
+	} else if cr, err := qapi.CreateCRObjectFromString(string(crBytes)); err != nil {
+		return false, err
+	} else {
+		return cr.IsEULA(), nil
+	}
+}
+
 func (q *Qliksense) loadCrStringIntoFileSystem(crstr string, overwriteExistingContext bool) (string, error) {
 	cr, err := qapi.CreateCRObjectFromString(crstr)
 	if err != nil {
@@ -55,8 +69,8 @@ func (q *Qliksense) loadCrStringIntoFileSystem(crstr string, overwriteExistingCo
 			}
 		}
 	}
-	if cr.Spec.Git != nil && cr.Spec.Git.AccessToken != "" {
-		if err := cr.SetFetchAccessToken(cr.Spec.Git.AccessToken, encryptionKey); err != nil {
+	if cr.Spec.FetchSource != nil && cr.Spec.FetchSource.AccessToken != "" {
+		if err := cr.SetFetchAccessToken(cr.Spec.FetchSource.AccessToken, encryptionKey); err != nil {
 			return "", err
 		}
 	}
--- a/pkg/qliksense/load_cr_test.go
+++ b/pkg/qliksense/load_cr_test.go
@@ -1,6 +1,9 @@
 package qliksense

 import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
 	"testing"

 	qapi "github.com/qlik-oss/sense-installer/pkg/api"
@@ -34,7 +37,8 @@ spec:
    qliksense:
    - name: mongodbUri
      value: mongodb://qlik-default-mongodb:27017/qliksense?ssl=false
-  profile: docker-desktop`
+  profile: docker-desktop
+  rotateKeys: "yes"`
 	sampleCr2 := `
 apiVersion: qlik.com/v1
 kind: Qliksense
@@ -60,7 +64,8 @@ spec:
    qliksense:
    - name: mongodbUri
      value: mongodb://qlik-default-mongodb:27017/qliksense?ssl=false
-  profile: docker-desktop`
+  profile: docker-desktop
+  rotateKeys: "yes"`

 	duplicateCr := `
 apiVersion: qlik.com/v1
@@ -74,13 +79,30 @@ spec:
    repository: https://github.com/ffoysal/qliksense-k8s
    accessToken: abababababababaab
    userName: "blblbl"`
+	crFile1 := filepath.Join(testDir, "testcr1.yaml")
+	ioutil.WriteFile(crFile1, []byte(sampleCr1), 0644)
+	crFile2 := filepath.Join(testDir, "testcr2.yaml")
+	ioutil.WriteFile(crFile2, []byte(sampleCr2), 0644)
+
+	dupCrFile := filepath.Join(testDir, "dupcr.yaml")
+	ioutil.WriteFile(dupCrFile, []byte(duplicateCr), 0644)

 	q := New(testDir)
-	if err := q.LoadCr([]byte(sampleCr1), false); err != nil {
+	file1, e := os.Open(crFile1)
+	if e != nil {
+		t.Log(e)
+		t.FailNow()
+	}
+	if err := q.LoadCr(file1, false); err != nil {
 		t.Log(err)
 		t.FailNow()
 	}
-	if err := q.LoadCr([]byte(sampleCr2), false); err != nil {
+	file2, e := os.Open(crFile2)
+	if e != nil {
+		t.Log(e)
+		t.FailNow()
+	}
+	if err := q.LoadCr(file2, false); err != nil {
 		t.Log(err)
 		t.FailNow()
 	}
@@ -106,7 +128,12 @@ spec:
 	if qConfig.Spec.CurrentContext != "qlik-test3" {
 		t.FailNow()
 	}
-	if err := q.LoadCr([]byte(duplicateCr), false); err == nil {
+	file, e := os.Open(dupCrFile)
+	if e != nil {
+		t.Log(e)
+		t.FailNow()
+	}
+	if err := q.LoadCr(file, false); err == nil {
 		t.FailNow()
 	}
 	td()
--- a/pkg/qliksense/operator.go
+++ b/pkg/qliksense/operator.go
@@ -41,7 +41,7 @@ func (q *Qliksense) getYamlFromPackrFile(packrFile string) string {
 	if err != nil {
 		fmt.Printf("Cannot read file %s", packrFile)
 	}
-	return fmt.Sprintln("#source: " + packrFile + "\n\n" + s + "\n---")
+	return fmt.Sprintln("#soruce: " + packrFile + "\n\n" + s + "\n---")
 }
 func (q *Qliksense) getFileList(resourceType string) []string {
 	var resList []string
--- a/pkg/qliksense/upgrade.go
+++ b/pkg/qliksense/upgrade.go
@@ -6,7 +6,7 @@ import (
 	qapi "github.com/qlik-oss/sense-installer/pkg/api"
 )

-func (q *Qliksense) UpgradeQK8s(cleanPatchFiles bool) error {
+func (q *Qliksense) UpgradeQK8s(keepPatchFiles bool) error {

 	// step1: get CR
 	// step2: run kustomize
@@ -14,10 +14,12 @@ func (q *Qliksense) UpgradeQK8s(cleanPatchFiles bool) error {

 	// fetch the version
 	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	if cleanPatchFiles {
-		if err := q.DiscardAllUnstagedChangesFromGitRepo(qConfig); err != nil {
-			fmt.Printf("error removing temporary changes to the config: %v\n", err)
-		}
+	if !keepPatchFiles {
+		defer func() {
+			if err := q.DiscardAllUnstagedChangesFromGitRepo(qConfig); err != nil {
+				fmt.Printf("error removing temporary changes to the config: %v\n", err)
+			}
+		}()
 	}

 	qcr, err := qConfig.GetCurrentCR()
@@ -25,6 +27,7 @@ func (q *Qliksense) UpgradeQK8s(cleanPatchFiles bool) error {
 		fmt.Println("cannot get the current-context cr", err)
 		return err
 	}
+	qcr.Spec.RotateKeys = "no"

 	dcr, err := qConfig.GetDecryptedCr(qcr)
 	if err != nil {
Author	SHA1	Message	Date
Foysal Iqbal	99b442020f	add dry-run for debugging purpose Signed-off-by: Foysal Iqbal <mqb@qlik.com>	2020-06-02 11:05:41 -04:00
Foysal Iqbal	9c6e83152d	add dry-run for debugging purpose Signed-off-by: Foysal Iqbal <mqb@qlik.com>	2020-06-02 10:27:44 -04:00
Foysal Iqbal	a9a9d464c0	Merge branch 'master' into dry-run	2020-06-02 09:42:33 -04:00
Foysal Iqbal	ef3224fb2c	add dry-run for debugging purpose Signed-off-by: Foysal Iqbal <mqb@qlik.com>	2020-05-28 22:41:57 -04:00