test

2020-02-28 11:07:51 -05:00
36 changed files with 809 additions and 2090 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,3 @@ cmd/qliksense/__debug_bin
 pkg/qliksense/crds
 pkg/qliksense/packrd
 pkg/qliksense/qliksense-packr.go
-pkg/qliksense/docker-registry
--- a/11
+++ b/11
@@ -24,13 +24,8 @@ SUPPORTED_ARCHES = amd64

 MIXIN = qliksense

-DEVNUL := /dev/null
-WHICH := which
-
 ifeq ($(CLIENT_PLATFORM),windows)
 FILE_EXT=.exe
-DEVNUL := NUL
-WHICH := where
 else ifeq ($(RUNTIME_PLATFORM),windows)
 FILE_EXT=.exe
 else
@@ -45,12 +40,6 @@ build: clean generate

 .PHONY: test
 test:
-ifeq ($(shell ${WHICH} docker-registry 2>${DEVNUL}),)
-	$(eval TMP := $(shell mktemp -d))
-	git clone https://github.com/docker/distribution.git $(TMP)/docker-distribution
-	cd $(TMP)/docker-distribution; git checkout -b v2.7.1; make
-	cp $(TMP)/docker-distribution/bin/registry pkg/qliksense/docker-registry
-endif
 	go test -short -count=1 -tags "$(BUILDTAGS)" -v ./...

 xbuild-all: clean generate
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# (WIP) Qlik Sense installation and operations CLI
+# Qlik Sense installation and operations CLI

 - [Qlik Sense installation and operations CLI](#qlik-sense-installation-and-operations-cli)
  - [About](#about)
@@ -6,145 +6,161 @@
  - [Getting Started](#getting-started)
    - [Requirements](#requirements)
    - [Download](#download)
-    - [TL;DR](#TL;DR)
-    - [How qliksense CLI works](#how-qliksense-cli-works)
-      - [Witout Git Repo](#Without-git-repo)
-      - [With Git Repo](#With-a-git-repo)
-    - [Air Gapped](#air-gaped)
+      - [Porter CLI](#porter-cli)
+    - [Generate Credentials from published bundle](#generate-credentials-from-published-bundle)
+    - [Qlik Sense version and image list](#qliksense-version-and-image-list)
+    - [Optional: Pulling images in manifest locally, "air gap"](#optional-pulling-images-in-manifest-locally-%22air-gap%22)
+    - [Running Preflight checks](#running-preflight-checks)
+    - [Installation](#installation)
+      - [Supported Parameters during install](#supported-parameters-during-install)
+      - [How To Add Identity Provider Config](#how-to-add-identity-provider-config)
+  - [Packaging a Custom bundle](#packaging-a-custom-bundle)
  
 ## About

-The Qlik Sense installer CLI (qliksense) provides an imperitive interface to many of the configurations that need to be applied against the declaritive structure described in [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s). This cli faciliates to do
+The Qlik Sense installer CLI (sense-installer) provides an imperitive interface to many of the configurations that need to be applied against the declaritive structure described in [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s).

- installation of QSEoK
- installation of qliksense operator to manage QSEoK
- air gapped installation of QSEoK
+This is a technology preview that uses [porter](https://porter.sh) to execute "actions" (operations) and bundle versions of the [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s) repository.

-This is a technology preview that uses qlik modified [kustomize](https://github.com/qlik-oss/kustomize) to kubernetes manifests of the versions of the [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s) repository.
+These bundles are posted to [docker hub](https://hub.docker.com/) at the following location: [qliksense-cnab-bundle](https://hub.docker.com/r/qlik/qliksense-cnab-bundle/tags).

-For each version of a qliksense sense edge build there should be a corresponding release in [qliksense-k8s] repository under [releases](https://github.com/qlik-oss/qliksense-k8s/releases)
+For each version of a qliksense sense edge build there should be a corresponding release current posted on docker hub. ex. `qlik/qliksense-cnab-bundle:v1.21.23-edge` for `v1.21.23` edge release of qliksense. The latest version posted will also be labelled as `latest`

 ### Future Direction

+- Porter is currently used as a core technology for the CLI. In the future Porter will be moved "up the stack" to allow the CLI to perform the current and expanded operations independently and encapsulate core functionality currently provided by Porter and other dependent tooling.
 - More operations:
  - Expanded preflight checks
  - backup/restore operations
-  - fully support airgap installation of QSEoK
-  - restore unwanted deletion of kubernetes resoureces

 ## Getting Started

 ### Requirements

- `kubectl` need to be installed and configured properly so that `kubectl` can connect to the kubernetes cluser. The `qliksense` CLI uses `kubectl` under the hood to perform operations on cluster
+- Docker Client connected to a docker engine into which images can built, pulled and pushed.
  - (Docker Desktop setup tested for these instructions)
  
 ### Download

- Download the appropriate executable for your platform from the [releases page](https://github.com/qlik-oss/sense-installer/releases) and rename it to `qliksense`. All the examplease down below uses `qliksense`.
+- Download the appropriate executable for your platform from the [releases page](https://github.com/qlik-oss/sense-installer/releases).
+- To allow the CLI to download and initialize dependencies (including porter and it's associated mixins), simply execute `qliksense` with no arguments
+  - `qliksense`
  
-### TL;DR
+#### Porter CLI
+- *Optional*: If wanting to use porter CLI directly, two environment variables will need to be set so as not to conflict with an existing porter installation:
+  - _Bash_
+    ```shell
+    bash# export PORTER_HOME="$HOME\.qliksense"
+    bash# export PATH="$HOME\.qliksense;$PATH"
+    ```

- To download the version `v0.0.2` from qliksense-k8s [releases](https://github.com/qlik-oss/qliksense-k8s/releases).
+  - _PowerShell_
+    ```shell
+    PS> $Env:PORTER_HOME="$Env:USERPROFILE\.qliksense"
+    PS> $Env:PATH="$Env:USERPROFILE\.qliksense;$Env:PATH"
+    ```
+
+### Generate Credentials from published bundle
+
+- Ensure connectivity to the target cluster create a kubeconfig credential for a target bundle. 
+  - generating a file as follows, replace `<credential_name>` with a name of your choosing.
+    - _Bash_
+      ```shell
+      bash# CREDENTIAL_NAME=<credential_name>
+      bash# cat <<EOF > $HOME/.qliksense/credentials/$CREDENTIAL_NAME.yaml
+      name: $CREDENTIAL_NAME
+      credentials:
+      - name: kubeconfig
+        source:
+          path: $HOME/.kube/config
+      EOF
+      ```
+    - _PowerShell_
+      ```shell
+      PS> $CREDENTIAL_NAME="<credential_name>"
+      PS> Add-Content -Value @"
+      name: $CREDENTIAL_NAME
+      credentials:
+      - name: kubeconfig
+        source:
+          path: $Env:USERPROFILE\.kube\config
+      "@ -Path $Env:USERPROFILE\.qliksense\credentials\$CREDENTIAL_NAME".yaml"
+      ```
+  - credentials can also be created using the [porter](https://porter.sh) CLI *(the correct environmental variable need to have been set up as shown in [Porter CLI](#porter-cli) above)*
+    - `porter cred generate <credential_name> --tag qlik/qliksense-cnab-bundle:v1.21.23-edge`, replace `<credential_name>` with a name of your choosing.
+    - Select `file path` and specify full path to a kube config file ex. _Bash_: `/home/user/.kube/config` or _PowerShell_ `C:\Users\user\.kube\config`
+
+### Qlik Sense version and image list
+
+It is possible verify the version of the [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s) repository bundled into the `qlik/qliksense-cnab-bundle` image and retreive the list of images included in that release. (This operation can take a minute or so)<https://github.com/qlik-oss/kustomize/issues/13> as the entire manifests needs to be rendered:
+
+- `qliksense about --tag qlik/qliksense-cnab-bundle:<qliksense_version>`
+
+### Optional: Pulling images in manifest locally, "air gap"
+
+If the `dockerRegistry` parameter is specified as the private docker registry to be used by the kubernetes cluster hosting qliksense, it is possible to pull images to the local docker engine for an eventual push during a `qliksense install` or `qliksense upgrade`
+
+- `qliksense pull --tag qlik/qliksense-cnab-bundle:<qliksense_version>`
+
+### Running Preflight checks
+
+You can run preflight checks to ensure that the cluster is in a healthy state before installing Qliksense.
+
+- `qliksense preflight -c <credential_name> --tag qlik/qliksense-cnab-bundle:<qliksense_version>`
+
+The above command runs the checks in the default namespace. If you want to specify the namespace to run preflight checks on:
+
+- `qliksense preflight --param namespace=<value> -c <credential_name> --tag qlik/qliksense-cnab-bundle:<qliksense_version>`
+
+### Installation
+
+- Install the bundle : `qliksense install --param acceptEULA=yes -c <credential_name> --tag qlik/qliksense-cnab-bundle:<qliksense_version>`
+
+#### Supported Parameters during install
+
+| Name        | Descriptions           | Default  |
+| ------------- |:-------------:| -----:|
+| profile      | select a profile i.e docker-desktop, aws-eks, gke | docker-desktop |
+| acceptEULA      | yes | has to be yes |
+| namespace      | any kubernetes namespace      |   default |
+| dockerRegistry      | A private docker image regitry for pods    |   not specified (public) |
+| rotateKeys | regenerate application PKI keys on upgrade (yes/no)      |    no |
+| mongoDbUri | the mongodb URI to use      |    URI of development mongodb |
+| scName | storage class name      |    none |
+
+#### How To Add Identity Provider Config
+
+Since idp configs are usually multiline configs it is not conventional to pass to porter during install as a `param`. Rather put the configs in a file and refer to that file during `porter install` command. For example to add `keycloak` IDP create file named `idpconfigs.txt` and put

 ```shell
-$qliksense fetch v0.0.2
+idpConfigs=[{"discoveryUrl":"http://keycloak-insecure:8089/keycloak/realms/master22/.well-known/openid-configuration","clientId":"edge-auth","clientSecret":"e15b5075-9399-4b20-a95e-023022aa4aed","realm":"master","hostname":"elastic.example","claimsMapping":{"sub":["sub","client_id"],"name":["name","given_name","family_name","preferred_username"]}}]
+
 ```

- To install CRDs for QSEoK and qliksense operator into the kubernetes cluster.
+Then pass that file during install command like this

 ```shell
-$qliksense crds install --all
+qliksense install --param acceptEULA=yes -c  <credential_name> --param-file idpconfigs.txt --tag qlik/qliksense-cnab-bundle:<qliksense_version>`
 ```

- To install QSEoK into a namespace in the kubernetes cluster where `kubectl` is pointing to.
+## Packaging a Custom bundle
+
+If files need to be added to the [qliksense-k8s repository](https://github.com/qlik-oss/qliksense-k8s) in order to perform advanced configuration outside the scope of the what the operator provides, a custom bundle needs to be built.
+
+Packaging of Qlik Sense on Kubernetes is done through a [Porter](https://porter.sh/) definition in the [Qlik Sense on Kubernetes configuration repository](https://github.com/qlik-oss/qliksense-k8s/blob/master/porter.yaml), the resulting bundle published on DockerHub as a [Cloud Natvie Application Bundle](https://cnab.io/) called [qliksense-cnab-bundle](https://hub.docker.com/r/qlik/qliksense-cnab-bundle)
+
+To start, clone [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s) and modify the repo as desired, once finished make sure to be in the `qliksense-k8s` directory from which the porter bundle can be built:

 ```shell
-$qliksense install --acceptEULA="yes"
+git clone git@github.com:qlik-oss/qliksense-k8s.git
+
+cd qliksense-k8s
+
+qliksense build
 ```

-## How qliksense cli works
+Once built, all of the `porter` command that were used with `--tag` can be now be used without this flag provided that porter is executed with the `qliksense-k8s` directory. `porter` will automatically use the qliksense-k8s (and the porter.yaml) in the current directory.

-At the initialization `qliksense` cli create few files in the director `~/.qliksene` and it contains following files
+## List of Commands

-```console
-.qliksense
-├── config.yaml
-├── contexts
-│   └── qlik-default
-│       └── qlik-default.yaml
-└── ejson
-    └── keys
-```
-
-`qlik-default.yaml` is a default CR has been created with some default values like this
-
-```yaml
-apiVersion: qlik.com/v1
-kind: Qliksense
-metadata:
-  name: qlik-default
-spec:
-  profile: docker-desktop
-  secrets:
-    qliksense:
-    - name: mongoDbUri
-      value: mongodb://qlik-default-mongodb:27017/qliksense?ssl=false
-  rotateKeys: "yes"
-  releaseName: qlik-default
-```
-
-The `qliksense` cli creates a default qliksense context (different from kubectl context) named `qlik-default` which will be the prefix for all kubernetes resources created by the cli under this context latter on. New context and configuration can be created by the cli.
-
-```console
-$ qliksense config
-do operations on/around CR
-
-Usage:
-  qliksense config [command]
-
-Available Commands:
-  apply         generate the patchs and apply manifests to k8s
-  list-contexts retrieves the contexts and lists them
-  set           configure a key value pair into the current context
-  set-configs   set configurations into the qliksense context
-  set-context   Sets the context in which the Kubernetes cluster and resources live in
-  set-secrets   set secrets configurations into the qliksense context
-  view          view the qliksense operator CR
-
-Flags:
-  -h, --help   help for config
-
-Use "qliksense config [command] --help" for more information about a command.
-```
-
-`qliksense` cli works in two modes
-
- with a git repo fork/clone of [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s)
- without git repo
-
-### Without git repo
-
-In this mode `qliksense` CLI download the specified version from [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s) and put it into folder `~/.qliksense/contexts/<context-name>/qlik-k8s`.
-
-The qliksense cli create a CR for the qliksense operator and all the config operations are peformed to edit the CR. So when `qliksense install` or `qliksense config apply` both generate patches in local file system (i.e `~/.qliksense/contexts/<context-name>/qlik-k8s`) and install those manifests into the cluster and create a custom resoruce (CR) for the `qliksene operator` then the operator make association to the isntalled resoruces  so that when `qliksenes uninstall` is performed the operator can delete all those kubernetes resources related to QSEoK for the current context.
-
-### With a git repo
-
-User has to create fork or clone of [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s) and push it to their own git server. When user perform `qliksense install` or `qliksene config apply` the qliksense operator do these tasks
-
- downloads the corresponding version of manifests from the user's git repo.
- generate kustomize patches
- install kubernetes resoruces 
- push those generated patches into a new branch in the provided git repo. so that user user can merge those patches into their master branch. 
- spinup a cornjob to monitor master branch. If user modifies anything in the master branch those changes will be applied into the cluster. This is a light weight `git-ops` model
-
-This is how repo info is provided into the CR
-
-```console
-qliksense config set git.repository="https://github.com/my-org/qliksense-k8s"
-
-qliksense config set git.accessToken=blablalaala
-```
-
-## Air gaped
+- [qliksense about](action_about.md)
--- 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: "About Qlik Sense",
 		Long:  "Gives the version of QLik Sense on Kubernetes and versions of images.",
 		Example: `
 qliksense about 1.0.0
--- a/cmd/qliksense/config.go
+++ b/cmd/qliksense/config.go
@@ -1,6 +1,7 @@
 package main

 import (
+	"fmt"
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
 	"github.com/spf13/cobra"
 )
@@ -9,6 +10,9 @@ var configCmd = &cobra.Command{
 	Use:   "config",
 	Short: "do operations on/around CR",
 	Long:  `do operations on/around CR`,
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Println("Use like: config view or config apply")
+	},
 }

 func configApplyCmd(q *qliksense.Qliksense) *cobra.Command {
--- a/cmd/qliksense/context.go
+++ b/cmd/qliksense/context.go
@@ -1,8 +1,6 @@
 package main

 import (
-	"errors"
-
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
 	"github.com/spf13/cobra"
 )
@@ -89,54 +87,3 @@ func setSecretsCmd(q *qliksense.Qliksense) *cobra.Command {
 	f.BoolVar(&secret, "secret", false, "Whether secrets should be encrypted as a Kubernetes Secret resource")
 	return cmd
 }
-
-func setImageRegistryCmd(q *qliksense.Qliksense) *cobra.Command {
-	var (
-		cmd          *cobra.Command
-		pushUsername string
-		pushPassword string
-		pullUsername string
-		pullPassword string
-		username     string
-		password     string
-	)
-
-	cmd = &cobra.Command{
-		Use:   "set-image-registry",
-		Short: "set private image registry",
-		Example: `
-qliksense config set-image-registry https://your.private.registry.example.com:5000 --push-username foo1 --push-password bar1 --pull-username foo2 --pull-password bar2
-qliksense config set-image-registry https://your.private.registry.example.com:5000 --username foo --password bar
-`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) != 1 {
-				return errors.New("private docker image registry FQDN is required")
-			}
-			registry := args[0]
-
-			if username != "" {
-				pullUsername = username
-				pushUsername = username
-			}
-			if password != "" {
-				pullPassword = password
-				pushPassword = password
-			}
-			if (pullUsername != "" && pushUsername == "") || (pullUsername == "" && pushUsername != "") {
-				return errors.New("if you specify pull credentials, you must specify push credentials as well and vise versa")
-			}
-			if (pullUsername == "" && pullPassword != "") || (pushUsername == "" && pushPassword != "") {
-				return errors.New("if you specify passwords, you must specify usernames as well")
-			}
-			return q.SetImageRegistry(registry, pushUsername, pushPassword, pullUsername, pullPassword)
-		},
-	}
-	f := cmd.Flags()
-	f.StringVar(&pushUsername, "push-username", "", "Username used for pushing images")
-	f.StringVar(&pushPassword, "push-password", "", "Password used for pushing images")
-	f.StringVar(&pullUsername, "pull-username", "", "Username used for pulling images")
-	f.StringVar(&pullPassword, "pull-password", "", "Password used for pulling images")
-	f.StringVar(&username, "username", "", "Username used for both pushing and pulling images")
-	f.StringVar(&password, "password", "", "Password used for both pushing and pulling images")
-	return cmd
-}
--- a/cmd/qliksense/crds.go
+++ b/cmd/qliksense/crds.go
@@ -1,42 +0,0 @@
-package main
-
-import (
-	"github.com/qlik-oss/sense-installer/pkg/qliksense"
-	"github.com/spf13/cobra"
-)
-
-var crdsCmd = &cobra.Command{
-	Use:   "crds",
-	Short: "crds for qliksense and operators",
-	Long:  `crds for qliksense and operators`,
-}
-
-func crdsViewCmd(q *qliksense.Qliksense) *cobra.Command {
-	opts := &qliksense.CrdCommandOptions{}
-	c := &cobra.Command{
-		Use:   "view",
-		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", "a", false, "Include All CRDs")
-	return c
-}
-
-func crdsInstallCmd(q *qliksense.Qliksense) *cobra.Command {
-	opts := &qliksense.CrdCommandOptions{}
-	c := &cobra.Command{
-		Use:   "install",
-		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", "a", false, "Include All CRDs")
-	return c
-}
--- a/cmd/qliksense/install.go
+++ b/cmd/qliksense/install.go
@@ -1,6 +1,7 @@
 package main

 import (
+	"errors"
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
 	"github.com/spf13/cobra"
 )
@@ -10,12 +11,15 @@ func installCmd(q *qliksense.Qliksense) *cobra.Command {
 	c := &cobra.Command{
 		Use:     "install",
 		Short:   "install a qliksense release",
-		Long:    `install a qliksense release`,
+		Long:    `install a qliksesne release`,
 		Example: `qliksense install <version>`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 0 {
-				return q.InstallQK8s("", opts)
+		Args: func(cmd *cobra.Command, args []string) error {
+			if len(args) != 1 {
+				return errors.New("requires a version (i.e. v1.0.0)")
 			}
+			return nil
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
 			return q.InstallQK8s(args[0], opts)
 		},
 	}
--- a/cmd/qliksense/operator.go
+++ b/cmd/qliksense/operator.go
@@ -1,6 +1,7 @@
 package main

 import (
+	"fmt"
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
 	"github.com/spf13/cobra"
 )
@@ -9,41 +10,18 @@ var operatorCmd = &cobra.Command{
 	Use:   "operator",
 	Short: "Configuration for operator",
 	Long:  `Configuration for operator`,
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Println("User like: operator view")
+	},
 }

-/*
 func operatorViewCmd(q *qliksense.Qliksense) *cobra.Command {
 	c := &cobra.Command{
 		Use:   "view",
-		Short: "View CRD for operator",
-		Long:  `View CRD for operator`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return q.ViewOperator()
-		},
-	}
-	return c
-}
-*/
-
-func operatorCrdCmd(q *qliksense.Qliksense) *cobra.Command {
-	c := &cobra.Command{
-		Use:   "crd",
-		Short: "View CRD for operator",
-		Long:  `View CRD for operator`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return q.ViewOperator()
-		},
-	}
-	return c
-}
-
-func operatorControllerCmd(q *qliksense.Qliksense) *cobra.Command {
-	c := &cobra.Command{
-		Use:   "controller",
-		Short: "View manifests for operator controller",
-		Long:  `View manifests for operator controller`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return q.ViewOperatorController()
+		Short: "View Configuration for operator",
+		Long:  `View Configuration for operator`,
+		Run: func(cmd *cobra.Command, args []string) {
+			q.ViewOperatorCrd()
 		},
 	}
 	return c
--- a/cmd/qliksense/pull.go
+++ b/cmd/qliksense/pull.go
@@ -0,0 +1,27 @@
+package main
+
+import (
+	"github.com/qlik-oss/sense-installer/pkg/qliksense"
+	"github.com/spf13/cobra"
+)
+
+func pullQliksenseImages(q *qliksense.Qliksense) *cobra.Command {
+	opts := &aboutCommandOptions{}
+
+	cmd := &cobra.Command{
+		Use:     "pull",
+		Short:   "Pull docke images for offline install",
+		Example: `qliksense pull`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if gitRef, err := getAboutCommandGitRef(args); err != nil {
+				return err
+			} else if err = q.PullImages(gitRef, opts.Profile, false); err != nil {
+				return err
+			}
+			return nil
+		},
+	}
+	f := cmd.Flags()
+	f.StringVar(&opts.Profile, "profile", "", "Configuration profile")
+	return cmd
+}
--- a/cmd/qliksense/pull_push.go
+++ b/cmd/qliksense/pull_push.go
@@ -1,60 +0,0 @@
-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"
-)
-
-func pullQliksenseImages(q *qliksense.Qliksense) *cobra.Command {
-	opts := &aboutCommandOptions{}
-
-	cmd := &cobra.Command{
-		Use:     "pull",
-		Short:   "Pull docker images for offline install",
-		Example: `qliksense pull`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			version, err := getAboutCommandGitRef(args)
-			if err != nil {
-				return err
-			}
-
-			if version != "" {
-				qConfig := qapi.NewQConfig(q.QliksenseHome)
-				if !qConfig.IsRepoExistForCurrent(version) {
-					if err := q.FetchQK8s(version); err != nil {
-						return err
-					}
-				} else if err := qConfig.SwitchCurrentCRToVersionAndProfile(version, opts.Profile); err != nil {
-					return err
-				}
-			}
-
-			return q.PullImagesForCurrentCR()
-		},
-	}
-	f := cmd.Flags()
-	f.StringVar(&opts.Profile, "profile", "", "Configuration profile")
-	return cmd
-}
-
-func pushQliksenseImages(q *qliksense.Qliksense) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:     "push",
-		Short:   "Push docker images for offline install",
-		Example: `qliksense push`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qConfig := qapi.NewQConfig(q.QliksenseHome)
-			if qcr, err := qConfig.GetCurrentCR(); err != nil {
-				return err
-			} else if registry := qcr.GetImageRegistry(); registry == "" {
-				return errors.New("no image registry in config")
-			} else {
-				return q.PushImagesForCurrentCR()
-			}
-		},
-	}
-	return cmd
-}
--- a/cmd/qliksense/root.go
+++ b/cmd/qliksense/root.go
@@ -2,20 +2,20 @@ package main

 import (
 	"fmt"
-	ansi "github.com/mattn/go-colorable"
-	"github.com/mitchellh/go-homedir"
-	"github.com/qlik-oss/sense-installer/pkg"
-	"github.com/qlik-oss/sense-installer/pkg/api"
-	"github.com/qlik-oss/sense-installer/pkg/qliksense"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"github.com/ttacon/chalk"
 	"io"
 	"log"
 	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/mitchellh/go-homedir"
+	"github.com/qlik-oss/sense-installer/pkg"
+	"github.com/qlik-oss/sense-installer/pkg/api"
+	"github.com/qlik-oss/sense-installer/pkg/qliksense"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 )

 // To run this project in ddebug mode, run:
@@ -32,10 +32,12 @@ func initAndExecute() error {
 		qlikSenseHome string
 		err           error
 	)
+
 	qlikSenseHome, err = setUpPaths()
 	if err != nil {
 		log.Fatal(err)
 	}
+
 	// create dirs and appropriate files for setting up contexts
 	api.LogDebugMessage("QliksenseHomeDir: %s", qlikSenseHome)

@@ -44,13 +46,10 @@ func initAndExecute() error {
 		return err
 	}
 	qliksenseClient.SetUpQliksenseDefaultContext()
-	cmd := rootCmd(qliksenseClient)
-	//levenstein checks
-	if levenstein(cmd) == false {
-		if err := cmd.Execute(); err != nil {
-			return err
-		}
+	if err := rootCmd(qliksenseClient).Execute(); err != nil {
+		return err
 	}
+
 	return nil
 }

@@ -94,8 +93,10 @@ func rootCmd(p *qliksense.Qliksense) *cobra.Command {
 	cmd = &cobra.Command{
 		Use:   "qliksense",
 		Short: "Qliksense cli tool",
-		Long:  `qliksense cli tool provides functionality to perform operations on qliksense-k8s, qliksense operator, and kubernetes cluster`,
-		Args:  cobra.ArbitraryArgs,
+		Long: `qliksense cli tool provides a wrapper around the porter api as well as
+		provides addition functionality`,
+		Args:         cobra.ArbitraryArgs,
+		SilenceUsage: true,
 	}

 	cmd.Flags().SetInterspersed(false)
@@ -105,17 +106,13 @@ func rootCmd(p *qliksense.Qliksense) *cobra.Command {
 	// For qliksense overrides/commands

 	cmd.AddCommand(pullQliksenseImages(p))
-	cmd.AddCommand(pushQliksenseImages(p))
 	cmd.AddCommand(about(p))
 	// add version command
 	cmd.AddCommand(versionCmd)

 	// add operator command
 	cmd.AddCommand(operatorCmd)
-	//operatorCmd.AddCommand(operatorViewCmd(p))
-	operatorCmd.AddCommand(operatorCrdCmd(p))
-	operatorCmd.AddCommand(operatorControllerCmd(p))
-
+	operatorCmd.AddCommand(operatorViewCmd(p))
 	//add fetch command
 	cmd.AddCommand(fetchCmd(p))

@@ -147,16 +144,8 @@ func rootCmd(p *qliksense.Qliksense) *cobra.Command {
 	// add the list config command as a sub-command to the app config sub-command
 	configCmd.AddCommand(listContextConfigCmd(p))

-	// add set-image-registry command as a sub-command to the app config sub-command
-	configCmd.AddCommand(setImageRegistryCmd(p))
-
 	// add uninstall command
 	cmd.AddCommand(uninstallCmd(p))
-
-	// add crds
-	cmd.AddCommand(crdsCmd)
-	crdsCmd.AddCommand(crdsViewCmd(p))
-	crdsCmd.AddCommand(crdsInstallCmd(p))
 	return cmd
 }

@@ -218,29 +207,3 @@ func copy(src, dst string) (int64, error) {
 	nBytes, err = io.Copy(destination, source)
 	return nBytes, err
 }
-
-func levenstein(cmd *cobra.Command) bool {
-	cmd.SuggestionsMinimumDistance = 4
-	if len(os.Args) > 1 {
-		args := os.Args[1]
-		for _, ctx := range cmd.Commands() {
-			val := *ctx
-			if args == val.Name() {
-				//found command
-				return false
-			}
-		}
-		suggest := cmd.SuggestionsFor(os.Args[1])
-		if len(suggest) > 0 {
-			arg := []string{}
-			for _, cm := range os.Args {
-				arg = append(arg, cm)
-			}
-			arg[1] = suggest[0]
-			out := ansi.NewColorableStdout()
-			fmt.Fprintln(out, chalk.Green.Color("Did you mean: "), chalk.Bold.TextStyle(strings.Join(arg, " ")), "?")
-			return true
-		}
-	}
-	return false
-}
--- a/cmd/qliksense/upgrade.go
+++ b/cmd/qliksense/upgrade.go
@@ -9,7 +9,7 @@ func upgradeCmd(q *qliksense.Qliksense) *cobra.Command {
 	c := &cobra.Command{
 		Use:     "upgrade",
 		Short:   "upgrade qliksense release",
-		Long:    `upgrade qliksense release`,
+		Long:    `upgrade qliksesne release`,
 		Example: `qliksense upgrade <version>`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return q.UpgradeQK8s()
--- a/go.mod
+++ b/go.mod
@@ -17,13 +17,19 @@ require (
 	cloud.google.com/go v0.52.0 // indirect
 	cloud.google.com/go/storage v1.5.0 // indirect
 	github.com/Shopify/ejson v1.2.1
+	github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
 	github.com/aws/aws-sdk-go v1.28.9 // indirect
+	github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 // indirect
 	github.com/bugsnag/bugsnag-go v1.5.3 // indirect
+	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
+	github.com/cloudflare/cfssl v1.4.1 // indirect
 	github.com/containerd/containerd v1.3.2 // indirect
 	github.com/containerd/continuity v0.0.0-20191214063359-1097c8bae83b // indirect
 	github.com/containers/image/v5 v5.1.0
-	github.com/docker/cli v0.0.0-20191212191748-ebca1413117a // indirect
-	github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7 // indirect
+	github.com/docker/cli v0.0.0-20191212191748-ebca1413117a
+	github.com/docker/distribution v2.7.1+incompatible
+	github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7
+	github.com/docker/go v1.5.1-1 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/gobuffalo/envy v1.9.0 // indirect
 	github.com/gobuffalo/logger v1.0.3 // indirect
@@ -33,31 +39,37 @@ require (
 	github.com/golang/protobuf v1.3.3 // indirect
 	github.com/google/uuid v1.1.1
 	github.com/gorilla/mux v1.7.3 // indirect
+	github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect

 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
+	github.com/jinzhu/gorm v1.9.11 // indirect
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
-	github.com/mattn/go-colorable v0.1.4
+	github.com/mattn/go-sqlite3 v2.0.1+incompatible // indirect
+	github.com/miekg/pkcs11 v1.0.3 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/qlik-oss/k-apis v0.0.11
+	github.com/pkg/errors v0.8.1
+	github.com/qlik-oss/k-apis v0.0.8
 	github.com/rogpeppe/go-internal v1.5.2 // indirect
-	github.com/spf13/cobra v0.0.6
+	github.com/spf13/cobra v0.0.5
 	github.com/spf13/viper v1.6.1
-	github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31
-	golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d // indirect
+	github.com/theupdateframework/notary v0.6.1 // indirect
+	github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
+	golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6 // indirect
 	golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a // indirect
 	golang.org/x/net v0.0.0-20200202094626-16171245cfb2
-	golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae // indirect
-	golang.org/x/tools v0.0.0-20200228135638-5c7c66ced534 // indirect
+	golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c // indirect
+	golang.org/x/tools v0.0.0-20200219054238-753a1d49df85 // indirect
 	google.golang.org/genproto v0.0.0-20200128133413-58ce757ed39b // indirect
 	google.golang.org/grpc v1.27.0 // indirect
+	gopkg.in/dancannon/gorethink.v3 v3.0.5 // indirect
+	gopkg.in/fatih/pool.v2 v2.0.0 // indirect
+	gopkg.in/gorethink/gorethink.v3 v3.0.5 // indirect
 	gopkg.in/yaml.v2 v2.2.8
 	gopkg.in/yaml.v3 v3.0.0-20190924164351-c8b7dadae555
-	k8s.io/api v0.17.0
-	k8s.io/apimachinery v0.17.0
 	sigs.k8s.io/kustomize/api v0.3.2
-	sigs.k8s.io/yaml v1.1.0
+	vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 // indirect
 )

 exclude github.com/Azure/go-autorest v12.0.0+incompatible
--- a/go.sum
+++ b/go.sum
@@ -1,6 +1,9 @@
 bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8=
+bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c/go.mod h1:hSVuE3qU7grINVSwrmzHfpg9k87ALBk+XaualNyUzI4=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.37.4 h1:glPeL3BQJsbF6aIIYfZizMwc5LTYz250bDMjttbBGAU=
+cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 cloud.google.com/go v0.39.0 h1:UgQP9na6OTfp4dsAiz/eFpFA1C6tPdH5wiRdi19tuMw=
 cloud.google.com/go v0.39.0/go.mod h1:rVLT6fkc8chs9sfPtFc1SBH6em7n+ZoXaG+87tDISts=
@@ -36,7 +39,6 @@ github.com/Azure/azure-amqp-common-go/v2 v2.1.0/go.mod h1:R8rea+gJRuJR6QxTir/XuE
 github.com/Azure/azure-pipeline-go v0.2.1 h1:OLBdZJ3yvOn2MezlWvbrBMTEUQC72zAftRZOMdj5HYo=
 github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4=
 github.com/Azure/azure-sdk-for-go v29.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v30.1.0+incompatible h1:HyYPft8wXpxMd0kfLtXo6etWcO+XuPbLkcgx9g2cqxU=
 github.com/Azure/azure-sdk-for-go v30.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-service-bus-go v0.9.1/go.mod h1:yzBx6/BUGfjfeqbRZny9AQIbIe3AcV9WZbAdpkoXOa0=
 github.com/Azure/azure-storage-blob-go v0.8.0 h1:53qhf0Oxa0nOjgbDeeYPUeyiNmafAFEY95rZLK0Tj6o=
@@ -54,7 +56,6 @@ github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjW
 github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
 github.com/Azure/go-autorest/autorest/mocks v0.2.0 h1:Ww5g4zThfD/6cLb4z6xxgeyDa7QDkizMkJKe0ysZXp0=
 github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY=
 github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
 github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k=
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
@@ -63,6 +64,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/zstd v1.4.0/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
+github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
+github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
 github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190605020000-c4ba1fdf4d36/go.mod h1:aJ4qN3TfrelA6NZ6AXsXRfmEVaYin3EDbSPJrKS8OXo=
 github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e h1:eb0Pzkt15Bm7f2FFYv7sjY7NPFi3cPkS3tv1CcrFBWA=
@@ -95,9 +98,14 @@ github.com/Shopify/ejson v1.2.1 h1:Dx0Ipn0mUgrZlzIa5oIUrH0rdSmBOyod/UJmQQK1KHo=
 github.com/Shopify/ejson v1.2.1/go.mod h1:J8cw5GOA0l/aMOPp+uDfwNYVbeqIaBhzRkv1+76UCvk=
 github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs=
 github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
+github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
+github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/VividCortex/ewma v1.1.1 h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdcM=
 github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=
+github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI=
+github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0=
+github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -108,6 +116,7 @@ github.com/andybalholm/brotli v0.0.0-20190621154722-5f990b63d2d6 h1:bZ28Hqta7TFA
 github.com/andybalholm/brotli v0.0.0-20190621154722-5f990b63d2d6/go.mod h1:+lx6/Aqd1kLJ1GQfkvOnaZ1WGmLpMpbprPuIOOZX30U=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
+github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
@@ -132,6 +141,8 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY=
+github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=
 github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
 github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
 github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
@@ -148,8 +159,11 @@ github.com/bugsnag/bugsnag-go v1.5.3 h1:yeRUT3mUE13jL1tGwvoQsKdVbAsQx9AJ+fqahKve
 github.com/bugsnag/bugsnag-go v1.5.3/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
 github.com/bugsnag/panicwrap v1.2.0 h1:OzrKrRvXis8qEvOkfcxNcYbOd2O7xXS2nnKMEMABFQA=
 github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
+github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
+github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/certifi/gocertifi v0.0.0-20180118203423-deb3ae2ef261/go.mod h1:GJKEexRPVJrBSOjoqN5VNOIKJ5Q3RViH6eu3puDRwx4=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA=
@@ -161,6 +175,11 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cloudflare/backoff v0.0.0-20161212185259-647f3cdfc87a/go.mod h1:rzgs2ZOiguV6/NpiDgADjRLPNyZlApIWxKpkT+X8SdY=
+github.com/cloudflare/cfssl v1.4.1 h1:vScfU2DrIUI9VPHBVeeAQ0q5A+9yshO1Gz+3QoUQiKw=
+github.com/cloudflare/cfssl v1.4.1/go.mod h1:KManx/OJPb5QY+y0+o/898AMcM128sF0bURvoVUSjTo=
+github.com/cloudflare/go-metrics v0.0.0-20151117154305-6a9aea36fb41/go.mod h1:eaZPlJWD+G9wseg1BuRXlHnjntPMrywMsyxf+LTOdP4=
+github.com/cloudflare/redoctober v0.0.0-20171127175943-746a508df14c/go.mod h1:6Se34jNoqrd8bTxrmJB2Bg2aoZ2CdSXonils9NsiNgo=
 github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f h1:tSNMc+rJDfmYntojat8lljbt1mgKNpTxUZJsSzJ9Y1s=
 github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko=
 github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
@@ -203,10 +222,10 @@ github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfc
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
+github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E=
 github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -214,6 +233,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
 github.com/deislabs/oras v0.7.0 h1:RnDoFd3tQYODMiUqxgQ8JxlrlWL0/VMKIKRD01MmNYk=
 github.com/deislabs/oras v0.7.0/go.mod h1:sqMKPG3tMyIX9xwXUBRLhZ24o+uT4y6jgBD2RzUTKDM=
+github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3 h1:tkum0XDgfR0jcVVXuTsYv/erY2NnEDqwRojbxR1rBYA=
+github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
 github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
@@ -229,6 +250,8 @@ github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc
 github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
 github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ=
 github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
+github.com/docker/go v1.5.1-1 h1:hr4w35acWBPhGBXlzPoHpmZ/ygPjnmFVxGxxGnMyP7k=
+github.com/docker/go v1.5.1-1/go.mod h1:CADgU4DSXK5QUlFslkQu2yW2TKzFZcXq/leZfM0UH5Q=
 github.com/docker/go-connections v0.0.0-20180212134524-7beb39f0b969/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
@@ -253,6 +276,9 @@ github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 h1:qk/FSDDxo05w
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad h1:Qk76DOWdOp+GlyDKBAG3Klr9cn7N+LcYc82AZ2S7+cA=
 github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad/go.mod h1:mPKfmRa823oBIgl2r20LeMSpTAteW5j7FLkc0vjmzyQ=
+github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
+github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
+github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e h1:p1yVGRW3nmb85p1Sh1ZJSDm4A4iKLS5QNbvUHMgGu/M=
 github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
@@ -263,6 +289,8 @@ github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y=
+github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
 github.com/etcd-io/bbolt v1.3.3 h1:gSJmxrs37LgTqR/oyJBWok6k6SvXEUerFTbltIhXkBM=
 github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
@@ -287,6 +315,7 @@ github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa h1:RDBNVkRviHZtvD
 github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
 github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc=
 github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
+github.com/getsentry/raven-go v0.0.0-20180121060056-563b81fc02b7/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v0.0.0-20161207003320-04f313413ffd/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -350,6 +379,7 @@ github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tF
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
 github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
+github.com/go-sql-driver/mysql v1.3.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 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/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
@@ -380,7 +410,6 @@ github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4
 github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q=
 github.com/gobuffalo/packd v1.0.0 h1:6ERZvJHfe24rfFmA9OaoKBdC7+c9sydrytMg8SdFGBM=
 github.com/gobuffalo/packd v1.0.0/go.mod h1:6VTc4htmJRFB7u1m/4LeMTWjFoYrUiBkU9Fdec9hrhI=
-github.com/gobuffalo/packr v1.30.1 h1:hu1fuVR3fXEZR7rXNW3h8rqSML8EVAf6KNm0NKO/wKg=
 github.com/gobuffalo/packr/v2 v2.7.1 h1:n3CIW5T17T8v4GGK5sWXLVWJhCz7b5aNLSxW6gYim4o=
 github.com/gobuffalo/packr/v2 v2.7.1/go.mod h1:qYEvAazPaVxy7Y7KR0W8qYEE+RymX74kETFqjFoFlOc=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
@@ -392,6 +421,7 @@ github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v0.0.0-20170815085658-fcdc5011193f/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
@@ -424,6 +454,7 @@ github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4=
@@ -447,6 +478,8 @@ github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/certificate-transparency-go v1.0.21 h1:Yf1aXowfZ2nuboBsg7iYGLmwsOARdV86pfH3g95wXmE=
+github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -500,6 +533,7 @@ github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51
 github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA=
 github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v0.0.0-20170217192616-94e7d24fd285/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
@@ -520,6 +554,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpg
 github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.2/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8=
+github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=
 github.com/hairyhenderson/gomplate/v3 v3.6.0 h1:EryWG7cCxvZ2awoZ957B3AMAd20Zy0uRXeZ7TXXMIp0=
 github.com/hairyhenderson/gomplate/v3 v3.6.0/go.mod h1:RbEC6Y14nNTHCtNWpBAkwqDP4ICFUrAH0S8PUFa0qT4=
 github.com/hairyhenderson/toml v0.3.1-0.20191004034452-2a4f3b6160f2 h1:Dc4YWWuY02jqhCnErAH++juCTwEPLstAOOVhyPXeE7Q=
@@ -613,9 +649,17 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a h1:zPPuIq2jAWWPTrGt70eK/BSch+gFAGrNzecsoENgu2o=
 github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
+github.com/jinzhu/gorm v1.9.11 h1:gaHGvE+UnWGlbWG4Y3FUwY1EcZ5n6S9WtqBA/uySMLE=
+github.com/jinzhu/gorm v1.9.11/go.mod h1:bu/pK8szGZ2puuErfU0RwyeNdsf3e6nCX/noXaVxkfw=
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M=
+github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548/go.mod h1:hGT6jSUVzF6no3QaDSMLGLEHtHSBSefs+MgcDWnmhmo=
+github.com/jmoiron/sqlx v0.0.0-20180124204410-05cef0741ade/go.mod h1:IiEW3SEiiErVyFdH8NTuWjSifiEQKUoyK3LNqr2kCHU=
 github.com/johannesboyne/gofakes3 v0.0.0-20191029185751-e238f04965fe h1:9kkgzfTjcHQqS6wGlEhJBJmAMI75lKyHX69w/ii+5So=
 github.com/johannesboyne/gofakes3 v0.0.0-20191029185751-e238f04965fe/go.mod h1:cPDudDcSR9fls3ZmrXgt0GU2QpQGQRJc4JBNtKyNr1s=
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
@@ -639,6 +683,8 @@ github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/kisielk/sqlstruct v0.0.0-20150923205031-648daed35d49/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE=
+github.com/kisom/goutils v1.1.0/go.mod h1:+UBTfd78habUYWFbNWTJNG+jNG/i/lGURakr4A/yNRw=
 github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.9.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
@@ -663,6 +709,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28/go.mod h1:T/T7jsxVqf9k/zYOqbgNAsANsjxTd1Yq3htjDhQ1H0c=
+github.com/lib/pq v0.0.0-20180201184707-88edab080323/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -700,6 +748,10 @@ github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp
 github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
 github.com/mattn/go-shellwords v1.0.6 h1:9Jok5pILi5S1MnDirGVTufYGtksUs/V2BWUP3ZkeUUI=
 github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
+github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/mattn/go-sqlite3 v2.0.1+incompatible h1:xQ15muvnzGBHpIpdrNi1DA5x0+TcBZzsIDwmw9uTHzw=
+github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -708,6 +760,8 @@ github.com/mholt/archiver/v3 v3.3.0/go.mod h1:YnQtqsp+94Rwd0D/rk5cnLrxusUBUXg+08
 github.com/miekg/dns v0.0.0-20181005163659-0d29b283ac0f/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.0.14 h1:9jZdLNd/P4+SfEJ0TNyxYpsK8N4GtfylBLqtbYN1sbA=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/pkcs11 v1.0.3 h1:iMwmD7I5225wv84WxIG/bmxz9AXjWvTWIbM/TYHvWtw=
+github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
 github.com/mistifyio/go-zfs v2.1.1+incompatible h1:gAMO1HM9xBRONLHHYnu5iFsOJUiJdNZo6oqSENd4eW8=
 github.com/mistifyio/go-zfs v2.1.1+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
@@ -746,12 +800,14 @@ github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk=
+github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8=
 github.com/mtrmac/gpgme v0.0.0-20170102180018-b2432428689c h1:xa+eQWKuJ9MbB9FBL/eoNvDFvveAkz2LQoz8PzX7Q/4=
 github.com/mtrmac/gpgme v0.0.0-20170102180018-b2432428689c/go.mod h1:GhAqVMEWnTcW2dxoD/SO3n2enrgWl3y6Dnx4m59GvcA=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
+github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E=
 github.com/nwaples/rardecode v1.0.0 h1:r7vGuS5akxOnR4JQSkko62RJ1ReCMXxQRPtxsiFMBOs=
 github.com/nwaples/rardecode v1.0.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
@@ -759,13 +815,16 @@ github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
@@ -782,6 +841,7 @@ github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.m
 github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
 github.com/opencontainers/selinux v1.3.0 h1:xsI95WzPZu5exzA6JzkLSfdr/DilzOhCJOqGe5TgR0g=
 github.com/opencontainers/selinux v1.3.0/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs=
+github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913 h1:TnbXhKzrTOyuvWrjI8W6pcoI9XPbLHFXCdN2dtUw7Rw=
 github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913/go.mod h1:J6OG6YJVEWopen4avK3VNQSnALmmjvniMmni/YFYAwc=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -814,6 +874,7 @@ github.com/pquerna/ffjson v0.0.0-20190813045741-dac163c6c0a9 h1:kyf9snWXHvQc+yxE
 github.com/pquerna/ffjson v0.0.0-20190813045741-dac163c6c0a9/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
+github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.1.0 h1:BQ53HtBmfOitExawJ6LokA4x8ov/z0SYYb0+HxJfRI8=
@@ -821,6 +882,7 @@ github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQ
 github.com/prometheus/client_golang v1.2.1 h1:JnMpQc6ppsNgw9QPAGF6Dod479itz7lvlsMzzNayLOI=
 github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
@@ -836,6 +898,7 @@ github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLy
 github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
@@ -844,13 +907,14 @@ 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.0.11 h1:dhbcH1+8r14OMlTSrP2RAlr+707QXcrj1iVnA/y9r5I=
-github.com/qlik-oss/k-apis v0.0.11/go.mod h1:KOFzKVIdRqp47ytnHg3+9zb8fTlnrQjO6aKiwcrCJUE=
+github.com/qlik-oss/k-apis v0.0.8 h1:8ZZefgFT+rI4PuE/sp3Wpc+d5LtZBKZuDb2G/YelTOs=
+github.com/qlik-oss/k-apis v0.0.8/go.mod h1:KOFzKVIdRqp47ytnHg3+9zb8fTlnrQjO6aKiwcrCJUE=
 github.com/qlik-oss/kustomize/api v0.3.3-0.20200206224201-2e697eccbad9 h1:iqeqTS4zjp6rPEaxmFB7pemA2CMjOEN5dYSXZaQ82uw=
 github.com/qlik-oss/kustomize/api v0.3.3-0.20200206224201-2e697eccbad9/go.mod h1:OCt7FTrRVHj4kmR2xLJJUIqu00BTr6GeF09hSmM17Kw=
 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=
+github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
@@ -888,6 +952,7 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV
 github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
 github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
@@ -913,8 +978,6 @@ github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKv
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
-github.com/spf13/cobra v0.0.6 h1:breEStsVwemnKh2/s6gMvSdMEkwW0sK8vGStnlVBMCs=
-github.com/spf13/cobra v0.0.6/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
 github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
@@ -944,11 +1007,11 @@ github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 h1:b6uOv7YOFK0
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/tchap/go-patricia v2.3.0+incompatible h1:GkY4dP3cEfEASBPPkWd+AmjYxhmDkqO9/zg7R0lSQRs=
 github.com/tchap/go-patricia v2.3.0+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I=
+github.com/theupdateframework/notary v0.6.1 h1:7wshjstgS9x9F5LuB1L5mBI2xNMObWqjz+cjWoom6l0=
+github.com/theupdateframework/notary v0.6.1/go.mod h1:MOfgIfmox8s7/7fduvB2xyPPMJCrjRLRizA8OFwpnKY=
 github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31 h1:OXcKh35JaYsGMRzpvFkLv/MEyPuL49CThT1pZ8aSml4=
-github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
@@ -965,12 +1028,16 @@ github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX
 github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/quicktemplate v1.2.0/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOVRUAfrukLPuGJ4=
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/vbatts/tar-split v0.11.1 h1:0Odu65rhcZ3JZaPHxl7tCI3V/C/Q9Zf82UFravl02dE=
 github.com/vbatts/tar-split v0.11.1/go.mod h1:LEuURwDEiWjRjwu46yU3KVGuUdVv/dcnpcEPSzR8z6g=
 github.com/vbauerster/mpb/v4 v4.11.1 h1:ZOYQSVHgmeanXsbyC44aDg76tBGCS/54Rk8VkL8dJGA=
 github.com/vbauerster/mpb/v4 v4.11.1/go.mod h1:vMLa1J/ZKC83G2lB/52XpqT+ZZtFG4aZOdKhmpRL1uM=
+github.com/weppos/publicsuffix-go v0.4.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=
+github.com/weppos/publicsuffix-go v0.5.0 h1:rutRtjBJViU/YjcI5d80t4JAVvDltS6bciJg2K1HrLU=
+github.com/weppos/publicsuffix-go v0.5.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=
 github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70=
 github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
@@ -989,6 +1056,8 @@ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofm
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
 github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 h1:j2hhcujLRHAg872RWAV5yaUrEjHEObwDv3aImCaNLek=
+github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 h1:p7OofyZ509h8DmPLh8Hn+EIIZm/xYhdZHJ9GnXHdr6U=
 github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
@@ -998,11 +1067,19 @@ github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1
 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
 github.com/zealic/xignore v0.3.3 h1:EpLXUgZY/JEzFkTc+Y/VYypzXtNz+MSOMVCGW5Q4CKQ=
 github.com/zealic/xignore v0.3.3/go.mod h1:lhS8V7fuSOtJOKsvKI7WfsZE276/7AYEqokv3UiqEAU=
+github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
+github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE=
+github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod h1:5iU54tB79AMBcySS0R2XIyZBAVmeHranShAFELYx7is=
+github.com/zmap/zcrypto v0.0.0-20190729165852-9051775e6a2e h1:mvOa4+/DXStR4ZXOks/UsjeFdn5O5JpLUtzqk9U8xXw=
+github.com/zmap/zcrypto v0.0.0-20190729165852-9051775e6a2e/go.mod h1:w7kd3qXHh8FNaczNjslXqvFQiv5mMWRXlL9klTUAHc8=
+github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb h1:vxqkjztXSaPVDc8FQCdHTaejm2x747f6yPbnu1h2xkg=
+github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb/go.mod h1:29UiAJNsiVdvTBFCJW8e3q6dcDbOoPkhMgttOSCIMMY=
 go.etcd.io/bbolt v1.3.2 h1:Z/90sZLPOeCy2PwprqkFa25PdkusRzaj9P8zm/KNyvk=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0=
+go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@@ -1025,6 +1102,7 @@ golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -1041,8 +1119,8 @@ golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d h1:9FCpayM9Egr1baVnV1SX0H87m+XB0B8S0hAMi99X/3U=
 golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d h1:1ZiEyfaQIg3Qh0EoqpwAakHVhecoE5wlSg5GjnafJGw=
-golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6 h1:Sy5bstxEqwwbYs6n0/pBuxKENqOeZUgD45Gp3Q3pqLg=
+golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1089,6 +1167,7 @@ golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190310074541-c10a0554eabf/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -1199,16 +1278,8 @@ golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200117161641-43d50277825c h1:2EA2K0k9bcvvEDlqD8xdlOhCOqq+O/p9Voqi4x9W1YU=
 golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2 h1:L/G4KZvrQn7FWLN/LlulBtBzrLUhqjiGfTWWDmrh+IQ=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200225230052-807dcd883420 h1:4RJNOV+2rLxMEfr6QIpC7GEv9MjD6ApGXTCLrNF9+eA=
-golang.org/x/tools v0.0.0-20200225230052-807dcd883420/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200226205201-eb7c56241bdb h1:RXjcsi6scaPhM5uXm7JRqP2JibKvbgMqx9zDLDB9voM=
-golang.org/x/tools v0.0.0-20200226205201-eb7c56241bdb/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d h1:7M9AXzLrJWWGdDYtBblPHBTnHtaN6KKQ98OYb35mLlY=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200228135638-5c7c66ced534 h1:XVzrScQUlfS6ssloilmEJdJhlMDtnculCx+0zmVHSA8=
-golang.org/x/tools v0.0.0-20200228135638-5c7c66ced534/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200219054238-753a1d49df85 h1:XNHaQ2CZDl/SjEZlUXGh7+OQvfLuFgmk3oNWkCFfERE=
+golang.org/x/tools v0.0.0-20200219054238-753a1d49df85/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1218,6 +1289,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
 gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
 gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
+google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
+google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
@@ -1267,6 +1340,7 @@ google.golang.org/genproto v0.0.0-20200128133413-58ce757ed39b h1:c8OBoXP3kTbDWWB
 google.golang.org/genproto v0.0.0-20200128133413-58ce757ed39b/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
+google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.0 h1:G+97AoqBnmZIT91cLG/EkCoK9NSelj64P8bOHHNmGn0=
@@ -1287,10 +1361,16 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/dancannon/gorethink.v3 v3.0.5 h1:/g7PWP7zUS6vSNmHSDbjCHQh1Rqn8Jy6zSMQxAsBSMQ=
+gopkg.in/dancannon/gorethink.v3 v3.0.5/go.mod h1:GXsi1e3N2OcKhcP6nsYABTiUejbWMFO4GY5a4pEaeEc=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/fatih/pool.v2 v2.0.0 h1:xIFeWtxifuQJGk/IEPKsTduEKcKvPmhoiVDGpC40nKg=
+gopkg.in/fatih/pool.v2 v2.0.0/go.mod h1:8xVGeu1/2jr2wm5V9SPuMht2H5AEmf5aFMGSQixtjTY=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
+gopkg.in/gorethink/gorethink.v3 v3.0.5 h1:e2Uc/Xe+hpcVQFsj6MuHlYog3r0JYpnTzwDj/y2O4MU=
+gopkg.in/gorethink/gorethink.v3 v3.0.5/go.mod h1:+3yIIHJUGMBK+wyPH+iN5TP+88ikFDfZdqTlK3Y9q8I=
 gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
@@ -1389,3 +1469,5 @@ sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:I
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
+vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 h1:O69FD9pJA4WUZlEwYatBEEkRWKQ5cKodWpdKTrCS/iQ=
+vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=
--- a/pkg/api/apis.go
+++ b/pkg/api/apis.go
@@ -1,11 +1,9 @@
 package api

 import (
-	"crypto/rsa"
 	"errors"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"os"
 	"path/filepath"

@@ -13,13 +11,6 @@ import (
 	"gopkg.in/yaml.v2"
 )

-const (
-	pushSecretFileName       = "image-registry-push-secret.yaml"
-	pullSecretFileName       = "image-registry-pull-secret.yaml"
-	qliksenseContextsDirName = "contexts"
-	qliksenseSecretsDirName  = "secrets"
-)
-
 // NewQConfig create QliksenseConfig object from file ~/.qliksense/config.yaml
 func NewQConfig(qsHome string) *QliksenseConfig {
 	configFile := filepath.Join(qsHome, "config.yaml")
@@ -48,10 +39,6 @@ func (qc *QliksenseConfig) GetCR(contextName string) (*QliksenseCR, error) {
 	return getCRObject(crFilePath)
 }

-func getUnencryptedCR() {
-
-}
-
 // GetCurrentCR create a QliksenseCR object for current context
 func (qc *QliksenseConfig) GetCurrentCR() (*QliksenseCR, error) {
 	return qc.GetCR(qc.Spec.CurrentContext)
@@ -120,11 +107,11 @@ func (qc *QliksenseConfig) BuildRepoPath(version string) string {
 }

 func (qc *QliksenseConfig) BuildRepoPathForContext(contextName, version string) string {
-	return filepath.Join(qc.QliksenseHomePath, qliksenseContextsDirName, contextName, "qlik-k8s", version)
+	return filepath.Join(qc.QliksenseHomePath, "contexts", contextName, "qlik-k8s", version)
 }

 func (qc *QliksenseConfig) BuildCurrentManifestsRoot(version string) string {
-	return qc.BuildRepoPath(version)
+	return filepath.Join(qc.BuildRepoPath(version), "manifests")
 }

 func (qc *QliksenseConfig) WriteCR(cr *QliksenseCR, contextName string) error {
@@ -154,135 +141,12 @@ func (qc *QliksenseConfig) IsContextExist(ctxName string) bool {
 	return false
 }

-func (qc *QliksenseConfig) GetCurrentContextDir() (string, error) {
-	if qcr, err := qc.GetCurrentCR(); err != nil {
-		return "", err
-	} else {
-		return filepath.Join(qc.QliksenseHomePath, qliksenseContextsDirName, qcr.Metadata.Name), nil
-	}
-}
-
-func (qc *QliksenseConfig) GetCurrentContextSecretsDir() (string, error) {
-	if currentContextDir, err := qc.GetCurrentContextDir(); err != nil {
-		return "", err
-	} else {
-		return filepath.Join(currentContextDir, qliksenseSecretsDirName), nil
-	}
-}
-
-func (qc *QliksenseConfig) setDockerConfigJsonSecret(filename string, dockerConfigJsonSecret *DockerConfigJsonSecret) error {
-	if secretsDir, err := qc.GetCurrentContextSecretsDir(); err != nil {
-		return err
-	} else if publicKey, _, err := qc.GetCurrentContextEncryptionKeyPair(); err != nil {
-		return err
-	} else if dockerConfigJsonSecretYaml, err := dockerConfigJsonSecret.ToYaml(publicKey); err != nil {
-		return err
-	} else if err := os.MkdirAll(secretsDir, os.ModePerm); err != nil {
-		return err
-	} else {
-		return ioutil.WriteFile(filepath.Join(secretsDir, filename), dockerConfigJsonSecretYaml, os.ModePerm)
-	}
-}
-
-func (qc *QliksenseConfig) SetPushDockerConfigJsonSecret(dockerConfigJsonSecret *DockerConfigJsonSecret) error {
-	return qc.setDockerConfigJsonSecret(pushSecretFileName, dockerConfigJsonSecret)
-}
-
-func (qc *QliksenseConfig) SetPullDockerConfigJsonSecret(dockerConfigJsonSecret *DockerConfigJsonSecret) error {
-	return qc.setDockerConfigJsonSecret(pullSecretFileName, dockerConfigJsonSecret)
-}
-
-func (qc *QliksenseConfig) GetPushDockerConfigJsonSecret() (*DockerConfigJsonSecret, error) {
-	return qc.GetDockerConfigJsonSecret(pushSecretFileName)
-}
-
-func (qc *QliksenseConfig) GetDockerConfigJsonSecret(name string) (*DockerConfigJsonSecret, error) {
-	dockerConfigJsonSecret := &DockerConfigJsonSecret{}
-	if secretsDir, err := qc.GetCurrentContextSecretsDir(); err != nil {
-		return nil, err
-	} else if dockerConfigJsonSecretYaml, err := ioutil.ReadFile(filepath.Join(secretsDir, name)); err != nil {
-		return nil, err
-	} else if _, privateKey, err := qc.GetCurrentContextEncryptionKeyPair(); err != nil {
-		return nil, err
-	} else if err := dockerConfigJsonSecret.FromYaml(dockerConfigJsonSecretYaml, privateKey); err != nil {
-		return nil, err
-	}
-	return dockerConfigJsonSecret, nil
-}
-
-func (qc *QliksenseConfig) getCurrentContextEncryptionKeyPairLocation() (string, error) {
-	// Check env var: QLIKSENSE_KEY_LOCATION to determine location to store keypair
-	var secretKeyPairLocation string
-	if os.Getenv("QLIKSENSE_KEY_LOCATION") != "" {
-		LogDebugMessage("Env variable: QLIKSENSE_KEY_LOCATION= %s", os.Getenv("QLIKSENSE_KEY_LOCATION"))
-		secretKeyPairLocation = os.Getenv("QLIKSENSE_KEY_LOCATION")
-	} else {
-		// QLIKSENSE_KEY_LOCATION has not been set, hence storing key pair in default location:
-		// /.qliksense/secrets/contexts/<current-context>/secrets/
-		if qcr, err := qc.GetCurrentCR(); err != nil {
-			return "", err
-		} else {
-			secretKeyPairLocation = filepath.Join(qc.QliksenseHomePath, qliksenseSecretsDirName, qliksenseContextsDirName, qcr.Metadata.Name, qliksenseSecretsDirName)
-		}
-	}
-	LogDebugMessage("SecretKeyLocation to store key pair: %s", secretKeyPairLocation)
-	return secretKeyPairLocation, nil
-}
-
-func (qc *QliksenseConfig) GetCurrentContextEncryptionKeyPair() (*rsa.PublicKey, *rsa.PrivateKey, error) {
-	secretKeyPairLocation, err := qc.getCurrentContextEncryptionKeyPairLocation()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	publicKeyFilePath := filepath.Join(secretKeyPairLocation, QliksensePublicKey)
-	privateKeyFilePath := filepath.Join(secretKeyPairLocation, QliksensePrivateKey)
-
-	// try to create the dir if it doesn't exist
-	if !FileExists(publicKeyFilePath) || !FileExists(privateKeyFilePath) {
-		LogDebugMessage("Qliksense secretKeyLocation dir does not exist, creating it now: %s", secretKeyPairLocation)
-		if err := os.MkdirAll(secretKeyPairLocation, os.ModePerm); err != nil {
-			err = fmt.Errorf("Not able to create %s dir: %v", secretKeyPairLocation, err)
-			log.Println(err)
-			return nil, nil, err
-		}
-		// generating and storing key-pair
-		err1 := GenerateAndStoreSecretKeypair(secretKeyPairLocation)
-		if err1 != nil {
-			err1 = fmt.Errorf("Not able to generate and store key pair for encryption")
-			log.Println(err1)
-			return nil, nil, err1
-		}
-	}
-
-	if publicKeyBytes, err := ReadKeys(publicKeyFilePath); err != nil {
-		LogDebugMessage("Not able to read public key")
-		return nil, nil, err
-	} else if privateKeyBytes, err := ReadKeys(privateKeyFilePath); err != nil {
-		LogDebugMessage("Not able to read private key")
-		return nil, nil, err
-	} else if rsaPublicKey, err := DecodeToPublicKey(publicKeyBytes); err != nil {
-		return nil, nil, err
-	} else if rsaPrivateKey, err := DecodeToPrivateKey(privateKeyBytes); err != nil {
-		return nil, nil, err
-	} else {
-		return rsaPublicKey, rsaPrivateKey, nil
-	}
-}
-
-func (cr *QliksenseCR) AddLabelToCr(key, value string) {
+func (cr *QliksenseCR) AddLabelToCr(key, value string) error {
 	if cr.Metadata.Labels == nil {
 		cr.Metadata.Labels = make(map[string]string)
 	}
 	cr.Metadata.Labels[key] = value
-}
-
-func (cr *QliksenseCR) GetLabelFromCr(key string) string {
-	val := ""
-	if cr.Metadata.Labels != nil {
-		val = cr.Metadata.Labels[key]
-	}
-	return val
+	return nil
 }

 func (cr *QliksenseCR) GetString() (string, error) {
@@ -293,14 +157,3 @@ func (cr *QliksenseCR) GetString() (string, error) {
 	}
 	return string(out), nil
 }
-
-func (cr *QliksenseCR) GetImageRegistry() string {
-	for _, nameValues := range cr.Spec.Configs {
-		for _, nameValue := range nameValues {
-			if nameValue.Name == "imageRegistry" {
-				return nameValue.Value
-			}
-		}
-	}
-	return ""
-}
--- a/pkg/api/context_apis.go
+++ b/pkg/api/context_apis.go
@@ -17,8 +17,6 @@ const (
 	QliksenseDefaultProfile    = "docker-desktop"
 	DefaultRotateKeys          = "yes"
 	QliksenseMetadataName      = "QliksenseConfigMetadata"
-	DefaultMongoDbUri          = "mongodb://qlik-default-mongodb:27017/qliksense?ssl=false"
-	DefaultMongoDbUriKey       = "mongoDbUri"
 )

 // AddCommonConfig adds common configs into CRs
@@ -35,7 +33,6 @@ func (qliksenseCR *QliksenseCR) AddCommonConfig(contextName string) {
 	qliksenseCR.Spec.Profile = QliksenseDefaultProfile
 	qliksenseCR.Spec.ReleaseName = contextName
 	qliksenseCR.Spec.RotateKeys = DefaultRotateKeys
-	qliksenseCR.Spec.AddToSecrets("qliksense", DefaultMongoDbUriKey, DefaultMongoDbUri, "")
 }

 // AddBaseQliksenseConfigs adds configs into config.yaml
@@ -54,25 +51,6 @@ func (qliksenseConfig *QliksenseConfig) AddBaseQliksenseConfigs(defaultQliksense
 	}
 }

-func (qliksenseConfig *QliksenseConfig) SwitchCurrentCRToVersionAndProfile(version, profile string) error {
-	if qcr, err := qliksenseConfig.GetCurrentCR(); err != nil {
-		return err
-	} else {
-		versionManifestRoot := qliksenseConfig.BuildCurrentManifestsRoot(version)
-		if (qcr.Spec.ManifestsRoot != versionManifestRoot) || (profile != "" && qcr.Spec.Profile != profile) || (qcr.GetLabelFromCr("version") != version) {
-			qcr.Spec.ManifestsRoot = versionManifestRoot
-			if profile != "" {
-				qcr.Spec.Profile = profile
-			}
-			qcr.AddLabelToCr("version", version)
-			if err := qliksenseConfig.WriteCurrentContextCR(qcr); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
 // WriteToFile (content, targetFile) writes content into specified file
 func WriteToFile(content interface{}, targetFile string) error {
 	if content == nil || targetFile == "" {
@@ -104,10 +82,12 @@ func ReadFromFile(content interface{}, sourceFile string) error {
 	contents, err := ioutil.ReadFile(sourceFile)
 	if err != nil {
 		err = fmt.Errorf("There was an error reading from file: %s, %v", sourceFile, err)
+		log.Println(err)
 		return err
 	}
 	if err := yaml.Unmarshal(contents, content); err != nil {
 		err = fmt.Errorf("An error occurred during unmarshalling: %v", err)
+		log.Println(err)
 		return err
 	}
 	return nil
--- a/pkg/api/context_apis_test.go
+++ b/pkg/api/context_apis_test.go
@@ -39,13 +39,6 @@ func TestAddCommonConfig(t *testing.T) {
 					Profile:     QliksenseDefaultProfile,
 					ReleaseName: "myqliksense",
 					RotateKeys:  DefaultRotateKeys,
-					Secrets: map[string]config.NameValues{
-						"qliksense": []config.NameValue{{
-							Name:  DefaultMongoDbUriKey,
-							Value: DefaultMongoDbUri,
-						},
-						},
-					},
 				},
 			},
 		},
--- a/pkg/api/docker_registry_secret.go
+++ b/pkg/api/docker_registry_secret.go
@@ -1,103 +0,0 @@
-package api
-
-import (
-	"crypto/rsa"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-type k8sDockerConfigJsonMapType struct {
-	Auths map[string]k8sDockerConfigJsonType `json:"auths"`
-}
-
-type k8sDockerConfigJsonType struct {
-	Username string `json:"username"`
-	Password string `json:"password"`
-	Email    string `json:"email,omitempty"`
-	Auth     string `json:"auth"`
-}
-
-func (kdcjt *k8sDockerConfigJsonType) GenerateAuth() {
-	kdcjt.Auth = base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%s:%s", kdcjt.Username, kdcjt.Password)))
-}
-
-type DockerConfigJsonSecret struct {
-	Name      string
-	Namespace string
-	Uri       string
-	Username  string
-	Password  string
-	Email     string
-}
-
-func (d *DockerConfigJsonSecret) ToYaml(encryptionKey *rsa.PublicKey) ([]byte, error) {
-	k8sDockerConfigJson := k8sDockerConfigJsonType{
-		Username: d.Username,
-		Password: d.Password,
-		Email:    d.Email,
-	}
-	k8sDockerConfigJson.GenerateAuth()
-	k8sDockerConfigJsonMap := k8sDockerConfigJsonMapType{
-		Auths: map[string]k8sDockerConfigJsonType{
-			d.Uri: k8sDockerConfigJson,
-		},
-	}
-	k8sDockerConfigJsonMapBytes, err := json.Marshal(k8sDockerConfigJsonMap)
-	if err != nil {
-		return nil, err
-	}
-	k8sDockerConfigJsonMapEncryptedBytes, err := Encrypt(k8sDockerConfigJsonMapBytes, encryptionKey)
-	if err != nil {
-		return nil, err
-	}
-
-	k8sSecret := v1.Secret{
-		TypeMeta: metav1.TypeMeta{
-			APIVersion: "v1",
-			Kind:       "Secret",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      d.Name,
-			Namespace: d.Namespace,
-		},
-		Type: v1.SecretTypeDockerConfigJson,
-		Data: map[string][]byte{
-			".dockerconfigjson": k8sDockerConfigJsonMapEncryptedBytes,
-		},
-	}
-
-	return K8sSecretToYaml(k8sSecret)
-}
-
-func (d *DockerConfigJsonSecret) FromYaml(secretBytes []byte, decryptionKey *rsa.PrivateKey) error {
-	k8sDockerConfigJsonMap := k8sDockerConfigJsonMapType{}
-	if k8sSecret, err := K8sSecretFromYaml(secretBytes); err != nil {
-		return err
-	} else if k8sSecret.TypeMeta.Kind != "Secret" {
-		return errors.New("not a Secret kind")
-	} else if k8sSecret.Type != v1.SecretTypeDockerConfigJson {
-		return errors.New("not a kubernetes.io/dockerconfigjson type")
-	} else if k8sDockerConfigJsonMapEncryptedBytes, ok := k8sSecret.Data[".dockerconfigjson"]; !ok {
-		return errors.New("secret data is missing a value for the .dockerconfigjson key")
-	} else if k8sDockerConfigJsonMapBytes, err := Decrypt(k8sDockerConfigJsonMapEncryptedBytes, decryptionKey); err != nil {
-		return errors.New("secret data is missing a value for the .dockerconfigjson key")
-	} else if err := json.Unmarshal(k8sDockerConfigJsonMapBytes, &k8sDockerConfigJsonMap); err != nil {
-		return err
-	} else {
-		d.Name = k8sSecret.ObjectMeta.Name
-		d.Namespace = k8sSecret.ObjectMeta.Namespace
-		for registry, k8sDockerConfigJson := range k8sDockerConfigJsonMap.Auths {
-			d.Uri = registry
-			d.Username = k8sDockerConfigJson.Username
-			d.Password = k8sDockerConfigJson.Password
-			d.Email = k8sDockerConfigJson.Email
-			break
-		}
-		return nil
-	}
-}
--- a/pkg/api/docker_registry_secret_test.go
+++ b/pkg/api/docker_registry_secret_test.go
@@ -1,73 +0,0 @@
-package api
-
-import (
-	"crypto/rand"
-	"crypto/rsa"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"testing"
-
-	"gopkg.in/yaml.v3"
-)
-
-func TestDockerConfigJsonSecret(t *testing.T) {
-	dockerConfigJsonSecret := DockerConfigJsonSecret{
-		Name:      "some-name",
-		Namespace: "some-namespace",
-		Uri:       "some-uri",
-		Username:  "some-username",
-		Password:  "some-password",
-		Email:     "some-email",
-	}
-	dockerConfigJsonSecretFromYaml := DockerConfigJsonSecret{}
-	validYamlMap := map[string]interface{}{}
-
-	privateKey, err := rsa.GenerateKey(rand.Reader, RSA_KEY_LENGTH)
-	if err != nil {
-		t.Fatalf("error generating RSA private key: %v\n", err)
-	}
-
-	dockerConfigJsonSecretYamlBytes, err := dockerConfigJsonSecret.ToYaml(&privateKey.PublicKey)
-	dockerConfigJsonMap := map[string]interface{}{}
-	if err != nil {
-		t.Fatalf("error converting secret to yaml: %v", err)
-	} else if err := yaml.Unmarshal(dockerConfigJsonSecretYamlBytes, &validYamlMap); err != nil {
-		t.Fatalf("error unmarshalling yaml string: %v, error: %v", string(dockerConfigJsonSecretYamlBytes), err)
-	} else if validYamlMap["apiVersion"] != "v1" ||
-		validYamlMap["kind"] != "Secret" ||
-		validYamlMap["metadata"].(map[string]interface{})["name"] != dockerConfigJsonSecret.Name ||
-		validYamlMap["metadata"].(map[string]interface{})["namespace"] != dockerConfigJsonSecret.Namespace ||
-		validYamlMap["type"] != "kubernetes.io/dockerconfigjson" {
-		t.Fatalf("error verifying validity of secret yaml: %v", string(dockerConfigJsonSecretYamlBytes))
-	} else if dockerConfigJsonBytesBase64, ok := validYamlMap["data"].(map[string]interface{})[".dockerconfigjson"]; !ok {
-		t.Fatalf("no .dockerconfigjson data key in the secret yaml: %v", string(dockerConfigJsonSecretYamlBytes))
-	} else if dockerConfigJsonEncryptedBytes, err := base64.StdEncoding.DecodeString(dockerConfigJsonBytesBase64.(string)); err != nil {
-		t.Fatalf("error decoding dockerConfigJsonBytes from base64: %v", err)
-	} else if dockerConfigJsonBytes, err := Decrypt(dockerConfigJsonEncryptedBytes, privateKey); err != nil {
-		t.Fatalf("error decrypting dockerConfigJsonBytes: %v", err)
-	} else if err := json.Unmarshal(dockerConfigJsonBytes, &dockerConfigJsonMap); err != nil {
-		t.Fatalf("error unmarshalling dockerConfigJson from json: %v", err)
-	} else if dockerConfigJson, ok := dockerConfigJsonMap["auths"].(map[string]interface{})[dockerConfigJsonSecret.Uri]; !ok {
-		t.Fatalf("dockerConfigJson map does not contain data for the registry: %v", dockerConfigJsonSecret.Uri)
-	} else if dockerConfigJson.(map[string]interface{})["username"] != dockerConfigJsonSecret.Username ||
-		dockerConfigJson.(map[string]interface{})["password"] != dockerConfigJsonSecret.Password ||
-		dockerConfigJson.(map[string]interface{})["email"] != dockerConfigJsonSecret.Email {
-		t.Fatal("dockerConfigJson map does not contain expected values")
-	} else {
-		authBase64 := dockerConfigJson.(map[string]interface{})["auth"]
-		if auth, err := base64.StdEncoding.DecodeString(authBase64.(string)); err != nil {
-			t.Fatal("error base64 decoding auth value")
-		} else if string(auth) != fmt.Sprintf("%s:%s", dockerConfigJsonSecret.Username, dockerConfigJsonSecret.Password) {
-			t.Fatal("auth value was not what we expected")
-		}
-	}
-
-	t.Logf("dockerConfigJsonSecretYaml: \n%v\n", string(dockerConfigJsonSecretYamlBytes))
-	if err := dockerConfigJsonSecretFromYaml.FromYaml(dockerConfigJsonSecretYamlBytes, privateKey); err != nil {
-		t.Fatalf("error reading secret in from yaml: %v", err)
-	} else if !reflect.DeepEqual(dockerConfigJsonSecret, dockerConfigJsonSecretFromYaml) {
-		t.Fatalf("secret: %v does not equal secret: %v", dockerConfigJsonSecret, dockerConfigJsonSecretFromYaml)
-	}
-}
--- a/pkg/api/encryption.go
+++ b/pkg/api/encryption.go
@@ -13,6 +13,8 @@ import (

 const (
 	RSA_KEY_LENGTH = 4096
+	privateKeyPath = "privKey"
+	publicKeyPath  = "pubKey"

 	QliksensePublicKey  = "qliksensePub"
 	QliksensePrivateKey = "qliksensePriv"
@@ -62,6 +64,7 @@ func writeContentToFile(keyData []byte, fileName string) error {
 		log.Printf("error writing to file (%s): %v", fileName, err)
 		return err
 	}
+	LogDebugMessage("Key saved: %s", fileName)
 	return nil
 }

--- a/pkg/api/k8s_secret_marshalling.go
+++ b/pkg/api/k8s_secret_marshalling.go
@@ -1,26 +0,0 @@
-package api
-
-import (
-	v1 "k8s.io/api/core/v1"
-	"sigs.k8s.io/yaml"
-)
-
-func K8sSecretToYaml(k8sSecret v1.Secret) ([]byte, error) {
-	k8sSecretYamlMap := map[string]interface{}{}
-	if k8sSecretYamlBytes, err := yaml.Marshal(k8sSecret); err != nil {
-		return nil, err
-	} else if err := yaml.Unmarshal(k8sSecretYamlBytes, &k8sSecretYamlMap); err != nil {
-		return nil, err
-	} else {
-		delete(k8sSecretYamlMap["metadata"].(map[string]interface{}), "creationTimestamp")
-		return yaml.Marshal(k8sSecretYamlMap)
-	}
-}
-
-func K8sSecretFromYaml(k8sSecretBytes []byte) (v1.Secret, error) {
-	k8sSecret := v1.Secret{}
-	if err := yaml.UnmarshalStrict(k8sSecretBytes, &k8sSecret); err != nil {
-		return k8sSecret, err
-	}
-	return k8sSecret, nil
-}
--- a/pkg/api/kubectl.go
+++ b/pkg/api/kubectl.go
@@ -7,15 +7,15 @@ import (
 	"os/exec"
 )

-func KubectlApply(manifests, namespace string) error {
-	return kubectlOperation(manifests, "apply", namespace)
+func KubectlApply(manifests string) error {
+	return kubectlOperation(manifests, "apply")
 }

-func KubectlDelete(manifests, namespace string) error {
-	return kubectlOperation(manifests, "delete", namespace)
+func KubectlDelete(manifests string) error {
+	return kubectlOperation(manifests, "delete")
 }

-func kubectlOperation(manifests string, oprName string, namespace string) error {
+func kubectlOperation(manifests string, oprName string) error {
 	tempYaml, err := ioutil.TempFile("", "")
 	if err != nil {
 		fmt.Println("cannot create file ", err)
@@ -23,23 +23,11 @@ func kubectlOperation(manifests string, oprName string, namespace string) error
 	}
 	tempYaml.WriteString(manifests)

-	arguments := make([]string, 0)
-	arguments = append(arguments, oprName)
-	arguments = append(arguments, "-f")
-	arguments = append(arguments, tempYaml.Name())
-
-	if oprName == "apply" {
-		arguments = append(arguments, "--validate=false")
-	}
-	if namespace != "" {
-		arguments = append(arguments, "-n")
-		arguments = append(arguments, namespace)
-	}
 	var cmd *exec.Cmd
 	if oprName == "apply" {
-		cmd = exec.Command("kubectl", arguments...)
+		cmd = exec.Command("kubectl", oprName, "-f", tempYaml.Name(), "--validate=false")
 	} else {
-		cmd = exec.Command("kubectl", arguments...)
+		cmd = exec.Command("kubectl", oprName, "-f", tempYaml.Name())
 	}

 	cmd.Stdout = os.Stdout
--- a/pkg/api/utils.go
+++ b/pkg/api/utils.go
@@ -6,13 +6,16 @@ import (
 	"log"
 	"os"
 	"regexp"
-	"strings"
-	"time"
 )

-func checkExists(filename string) os.FileInfo {
+func checkExists(filename string, isFile bool) os.FileInfo {
 	info, err := os.Stat(filename)
 	if os.IsNotExist(err) {
+		if isFile {
+			LogDebugMessage("File does not exist")
+		} else {
+			LogDebugMessage("Dir does not exist")
+		}
 		return nil
 	}
 	LogDebugMessage("File exists")
@@ -21,7 +24,7 @@ func checkExists(filename string) os.FileInfo {

 // FileExists checks if a file exists
 func FileExists(filename string) bool {
-	if fe := checkExists(filename); fe != nil && !fe.IsDir() {
+	if fe := checkExists(filename, true); fe != nil && !fe.IsDir() {
 		return true
 	}
 	return false
@@ -29,7 +32,7 @@ func FileExists(filename string) bool {

 // DirExists checks if a directory exists
 func DirExists(dirname string) bool {
-	if fe := checkExists(dirname); fe != nil && fe.IsDir() {
+	if fe := checkExists(dirname, false); fe != nil && fe.IsDir() {
 		return true
 	}
 	return false
@@ -49,6 +52,8 @@ func ReadKeys(keyFile string) ([]byte, error) {
 		err = fmt.Errorf("There was an error reading from file: %s, %v", keyFile, err)
 		log.Println(err)
 		return nil, err
+	} else {
+		LogDebugMessage("Read key as byte[]: %+v", keybyteArray)
 	}
 	return keybyteArray, nil
 }
@@ -63,7 +68,7 @@ func ProcessConfigArgs(args []string) ([]*ServiceKeyValue, error) {
 		return nil, err
 	}
 	resultSvcKV := make([]*ServiceKeyValue, len(args))
-	re1 := regexp.MustCompile(`(\w{1,}).(\w{1,})=("*[\w\-_/:0-9]+"*)`)
+	re1 := regexp.MustCompile(`(\w{1,})\[name=(\w{1,})\]=("*[\w\-_/:0-9]+"*)`)
 	for i, arg := range args {
 		LogDebugMessage("Arg received: %s", arg)
 		result := re1.FindStringSubmatch(arg)
@@ -81,33 +86,3 @@ func ProcessConfigArgs(args []string) ([]*ServiceKeyValue, error) {
 	}
 	return resultSvcKV, nil
 }
-
-func ExecuteTaskWithBlinkingStdoutFeedback(task func() (interface{}, error), feedback string) (result interface{}, err error) {
-	taskDone := make(chan bool)
-	go func() {
-		result, err = task()
-		taskDone <- true
-	}()
-	progressOnTicker := time.NewTicker(500 * time.Millisecond)
-	progressOffTicker := time.NewTicker(1000 * time.Millisecond)
-	printProgress := func(on bool) {
-		if on {
-			fmt.Printf("%s\r", feedback)
-		} else {
-			fmt.Printf("%s\r", strings.Repeat(" ", len(feedback)))
-		}
-	}
-	for {
-		select {
-		case <-taskDone:
-			progressOnTicker.Stop()
-			progressOffTicker.Stop()
-			printProgress(false)
-			return result, err
-		case <-progressOnTicker.C:
-			printProgress(true)
-		case <-progressOffTicker.C:
-			printProgress(false)
-		}
-	}
-}
--- a/pkg/qliksense/about.go
+++ b/pkg/qliksense/about.go
@@ -2,6 +2,7 @@ package qliksense

 import (
 	"bytes"
+	"errors"
 	"io"
 	"io/ioutil"
 	"os"
@@ -80,7 +81,7 @@ func (q *Qliksense) AboutDir(configDirectory, profile string) (*VersionOutput, e
 		return nil, err
 	}

-	kuzManifest, err := executeKustomizeBuildWithStdoutProgress(filepath.Join(configDirectory, "manifests", profile))
+	kuzManifest, err := executeKustomizeBuild(filepath.Join(configDirectory, "manifests", profile))
 	if err != nil {
 		return nil, err
 	}
@@ -119,7 +120,7 @@ func (q *Qliksense) getConfigDirectory(gitUrl, gitRef, profileEntered string) (d
 	}

 	var profileFromCurrentContext string
-	exists, dir, profileFromCurrentContext, err = q.configExistsInCurrentContext()
+	exists, dir, profileFromCurrentContext, err = q.ConfigExistsInCurrentContext()
 	if err != nil {
 		return "", false, "", err
 	} else if exists {
@@ -169,14 +170,16 @@ func configExistsInCurrentDirectory(profile string) (exists bool, currentDirecto
 	return exists, currentDirectory, err
 }

-func (q *Qliksense) configExistsInCurrentContext() (exists bool, directory string, profile string, err error) {
+func (q *Qliksense) ConfigExistsInCurrentContext() (exists bool, directory string, profile string, err error) {
 	qConfig := qapi.NewQConfig(q.QliksenseHome)
 	if currentCr, err := qConfig.GetCurrentCR(); err != nil {
 		return false, "", "", err
 	} else if currentCr.Spec.ManifestsRoot == "" {
 		return false, "", "", nil
+	} else if path.Base(currentCr.Spec.ManifestsRoot) != "manifests" {
+		return false, "", "", errors.New("currentCr.Spec.ManifestsRoot path should terminate with manifests/")
 	} else {
-		return true, currentCr.Spec.GetManifestsRoot(), currentCr.Spec.Profile, nil
+		return true, path.Join(currentCr.Spec.ManifestsRoot, "../"), currentCr.Spec.Profile, nil
 	}
 }

--- a/pkg/qliksense/config.go
+++ b/pkg/qliksense/config.go
@@ -2,17 +2,13 @@ package qliksense

 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
-	"strings"

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

@@ -29,15 +25,14 @@ func (q *Qliksense) ConfigApplyQK8s() error {
 		fmt.Println("cannot get the current-context cr", err)
 		return err
 	}
-
-	if qcr.Spec.Git.Repository != "" {
-		// fetching and applying manifest will be in the operator controller
-		return q.applyCR(qcr.Spec.NameSpace)
-	}
-	return q.applyConfigToK8s(qcr)
+	return q.applyConfigToK8s(qcr, "")
 }

-func (q *Qliksense) applyConfigToK8s(qcr *qapi.QliksenseCR) error {
+func (q *Qliksense) applyConfigToK8s(qcr *qapi.QliksenseCR, cmd string) error {
+	// apply qliksense-init crd first
+	mroot := qcr.Spec.GetManifestsRoot()
+	qInitMsPath := filepath.Join(mroot, Q_INIT_CRD_PATH)
+
 	if qcr.Spec.RotateKeys != "None" {
 		if err := os.Unsetenv("EJSON_KEY"); err != nil {
 			fmt.Printf("error unsetting EJSON_KEY environment variable: %v\n", err)
@@ -48,22 +43,33 @@ func (q *Qliksense) applyConfigToK8s(qcr *qapi.QliksenseCR) error {
 			return err
 		}
 	}
+	if cmd != "upgrade" {
+		qInitByte, err := executeKustomizeBuild(qInitMsPath)
+		if err != nil {
+			fmt.Println("cannot generate crds for qliksense-init", err)
+			return err
+		}
+		if err = qapi.KubectlApply(string(qInitByte)); 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())
+
 	// generate patches
 	cr.GeneratePatches(qcr.Spec, path.Join(userHomeDir, ".kube", "config"))
 	// apply generated manifests
-	profilePath := filepath.Join(qcr.Spec.GetManifestsRoot(), qcr.Spec.GetProfileDir())
+	profilePath := filepath.Join(qcr.Spec.ManifestsRoot, qcr.Spec.Profile)
 	mByte, err := executeKustomizeBuild(profilePath)
 	if err != nil {
 		fmt.Println("cannot generate manifests for "+profilePath, err)
 		return err
 	}
-	if err = qapi.KubectlApply(string(mByte), qcr.Spec.NameSpace); err != nil {
+	if err = qapi.KubectlApply(string(mByte)); err != nil {
 		return err
 	}

@@ -71,6 +77,7 @@ func (q *Qliksense) applyConfigToK8s(qcr *qapi.QliksenseCR) error {
 }

 func (q *Qliksense) ConfigViewCR() error {
+
 	//get the current context cr
 	r, err := q.getCurrentCRString()
 	if err != nil {
@@ -92,29 +99,5 @@ func (q *Qliksense) getCRString(contextName string) (string, error) {
 		fmt.Println("cannot get the context cr", err)
 		return "", err
 	}
-	out, err := yaml.Marshal(qcr)
-	if err != nil {
-		fmt.Println("cannot unmarshal cr ", err)
-		return "", err
-	}
-	var crString strings.Builder
-	crString.Write(out)
-
-	for svcName, v := range qcr.Spec.Secrets {
-		for _, item := range v {
-			if item.ValueFrom != nil && item.ValueFrom.SecretKeyRef != nil {
-				secretFilePath := filepath.Join(q.QliksenseHome, QliksenseContextsDir, qcr.Metadata.Name, QliksenseSecretsDir, svcName+".yaml")
-
-				if api.FileExists(secretFilePath) {
-					secretFile, err := ioutil.ReadFile(secretFilePath)
-					if err != nil {
-						return "", err
-					}
-					crString.WriteString("\n---\n")
-					crString.Write(secretFile)
-				}
-			}
-		}
-	}
-	return crString.String(), nil
+	return qcr.GetString()
 }
--- a/pkg/qliksense/context_configs.go
+++ b/pkg/qliksense/context_configs.go
@@ -3,130 +3,122 @@ package qliksense
 import (
 	"crypto/rsa"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
 	"strings"
 	"text/tabwriter"

-	"encoding/base64"
 	b64 "encoding/base64"
-
 	ansi "github.com/mattn/go-colorable"
 	"github.com/qlik-oss/sense-installer/pkg/api"
 	"github.com/ttacon/chalk"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

 const (
 	// Below are some constants to support qliksense context setup
 	QliksenseConfigHome        = "/.qliksense"
 	QliksenseConfigContextHome = "/.qliksense/contexts"
-	QliksenseConfigFile        = "config.yaml"
-	QliksenseContextsDir       = "contexts"
-	DefaultQliksenseContext    = "qlik-default"
-	MaxContextNameLength       = 17
-	QliksenseSecretsDir        = "secrets"

-	imageRegistryConfigKey = "imageRegistry"
-	pullSecretName         = "artifactory-docker-secret"
+	QliksenseConfigFile     = "config.yaml"
+	QliksenseContextsDir    = "contexts"
+	DefaultQliksenseContext = "qlik-default"
+	MaxContextNameLength    = 17
+	QliksenseSecretsDir     = "secrets"
 )

 // SetSecrets - set-secrets <key>=<value> commands
-func (q *Qliksense) SetSecrets(args []string, isSecretSet bool) error {
-	qConfig := api.NewQConfig(q.QliksenseHome)
+func (q *Qliksense) SetSecrets(args []string, isK8sSecret bool) error {
+	api.LogDebugMessage("Args received: %v\n", args)
+	api.LogDebugMessage("isK8sSecret: %v\n", isK8sSecret)
+
+	// retieve current context from config.yaml
 	qliksenseCR, qliksenseContextsFile, err := retrieveCurrentContextInfo(q)
 	if err != nil {
 		return err
 	}

-	// Metadata name in qliksense CR is the name of the current context
-	api.LogDebugMessage("Current context: %s", qliksenseCR.Metadata.Name)
-	rsaPublicKey, _, err := qConfig.GetCurrentContextEncryptionKeyPair()
-	if err != nil {
-		return err
+	secretKeyPairLocation := filepath.Join(q.QliksenseHome, QliksenseSecretsDir, QliksenseContextsDir, qliksenseCR.Metadata.Name, QliksenseSecretsDir)
+	api.LogDebugMessage("SecretKeyLocation to store key pair: %s", secretKeyPairLocation)
+
+	if os.Getenv("QLIKSENSE_KEY_LOCATION") != "" {
+		api.LogDebugMessage("Env variable: QLIKSENSE_KEY_LOCATION= %s", os.Getenv("QLIKSENSE_KEY_LOCATION"))
+		secretKeyPairLocation = os.Getenv("QLIKSENSE_KEY_LOCATION")
+	}
+	// Env var: QLIKSENSE_KEY_LOCATION hasn't been set, so dropping key pair in the location:
+	// /.qliksense/secrets/contexts/<current-context>/secrets/
+	api.LogDebugMessage("Using default location to store keys: %s", secretKeyPairLocation)
+
+	publicKeyFilePath := filepath.Join(secretKeyPairLocation, api.QliksensePublicKey)
+	privateKeyFilePath := filepath.Join(secretKeyPairLocation, api.QliksensePrivateKey)
+
+	// try to create the dir if it doesn't exist
+	if !api.FileExists(publicKeyFilePath) || !api.FileExists(privateKeyFilePath) {
+		api.LogDebugMessage("Qliksense secretKeyLocation dir does not exist, creating it now: %s", secretKeyPairLocation)
+		if err := os.MkdirAll(secretKeyPairLocation, os.ModePerm); err != nil {
+			err = fmt.Errorf("Not able to create %s dir: %v", secretKeyPairLocation, err)
+			log.Println(err)
+			return err
+		}
+		// generating and storing key-pair
+		err1 := api.GenerateAndStoreSecretKeypair(secretKeyPairLocation)
+		if err1 != nil {
+			err1 = fmt.Errorf("Not able to generate and store key pair for encryption")
+			log.Println(err1)
+			return err1
+		}
+	}
+
+	var rsaPublicKey *rsa.PublicKey
+	var e1 error
+
+	// Read Public Key
+	publicKeybytes, err2 := api.ReadKeys(publicKeyFilePath)
+	if err2 != nil {
+		api.LogDebugMessage("Not able to read public key")
+		return err2
+	}
+	// api.LogDebugMessage("PublicKey: %+v", publicKeybytes)
+
+	// convert []byte into RSA public key object
+	rsaPublicKey, e1 = api.DecodeToPublicKey(publicKeybytes)
+	if e1 != nil {
+		return e1
 	}

 	resultArgs, err := api.ProcessConfigArgs(args)
 	if err != nil {
 		return err
 	}
+
 	for _, ra := range resultArgs {
-		if err := q.processSecret(ra, rsaPublicKey, qliksenseCR, isSecretSet); err != nil {
-			return err
+		// Metadata name in qliksense CR is the name of the current context
+		api.LogDebugMessage("Trying to retreive current context: %+v ----- %s", qliksenseCR.Metadata.Name, qliksenseContextsFile)
+
+		// encrypt value with RSA key pair
+		valueBytes := []byte(ra.Value)
+		cipherText, e2 := api.Encrypt(valueBytes, rsaPublicKey)
+		if e2 != nil {
+			return e2
 		}
+		api.LogDebugMessage("Returned cipher text: %s", b64.StdEncoding.EncodeToString(cipherText))
+
+		if isK8sSecret {
+			// TODO: store the key value in k8s as secret
+			api.LogDebugMessage("Need to create a Kubernetes secret")
+		}
+		// TODO: Extend AddToSecrets to support adding k8s key ref. (OR) create a separate method to support that
+		// store the encrypted value in the file (OR)
+		// TODO: k8s secret name in the file
+		qliksenseCR.Spec.AddToSecrets(ra.SvcName, ra.Key, string(cipherText))
 	}
-	// write modified content into context-yaml
+
+	// write modified content into context.yaml
 	api.WriteToFile(&qliksenseCR, qliksenseContextsFile)

 	return nil
 }

-func (q *Qliksense) processSecret(ra *api.ServiceKeyValue, rsaPublicKey *rsa.PublicKey, qliksenseCR api.QliksenseCR, isSecretSet bool) error {
-	// encrypt value with RSA key pair
-	valueBytes := []byte(ra.Value)
-	cipherText, e2 := api.Encrypt(valueBytes, rsaPublicKey)
-	if e2 != nil {
-		return e2
-	}
-	base64EncodedSecret := b64.StdEncoding.EncodeToString(cipherText)
-	secretName := ""
-	if isSecretSet {
-		secretFolder := filepath.Join(q.QliksenseHome, QliksenseContextsDir, qliksenseCR.Metadata.Name, QliksenseSecretsDir)
-		secretFileName := filepath.Join(secretFolder, ra.SvcName+".yaml")
-
-		secretName = fmt.Sprintf("%s-%s-%s", qliksenseCR.Metadata.Name, ra.SvcName, "sense_installer")
-		api.LogDebugMessage("Constructed secret name: %s", secretName)
-
-		k8sSecret := v1.Secret{
-			TypeMeta: metav1.TypeMeta{
-				APIVersion: "v1",
-				Kind:       "Secret",
-			},
-			ObjectMeta: metav1.ObjectMeta{
-				Name: secretName,
-			},
-			Type: v1.SecretTypeOpaque,
-		}
-
-		if !api.DirExists(secretFolder) {
-			if err := os.MkdirAll(secretFolder, os.ModePerm); err != nil {
-				err = fmt.Errorf("Not able to create %s dir: %v", secretFolder, err)
-				log.Println(err)
-				return err
-			}
-		}
-		// if read from file errors out, we can ignore it here
-		_ = api.ReadFromFile(&k8sSecret, secretFileName)
-		if k8sSecret.Data == nil {
-			k8sSecret.Data = map[string][]byte{}
-		}
-		k8sSecret.Data[ra.Key] = []byte(base64EncodedSecret)
-
-		// Write secret to file
-		k8sSecretBytes, err := api.K8sSecretToYaml(k8sSecret)
-		if err != nil {
-			api.LogDebugMessage("Error while converting K8s secret to yaml")
-			return err
-		}
-		if err = ioutil.WriteFile(secretFileName, k8sSecretBytes, os.ModePerm); err != nil {
-			api.LogDebugMessage("Error while writing K8s secret to file")
-			return err
-		}
-		// api.WriteToFile(&k8sSecret, secretFileName)
-		api.LogDebugMessage("Created a Kubernetes secret")
-
-		// Prepare args to update CR in the next step
-		base64EncodedSecret = ""
-	}
-
-	// write into CR the keyref of the secret
-	qliksenseCR.Spec.AddToSecrets(ra.SvcName, ra.Key, base64EncodedSecret, secretName)
-	return nil
-}
-
 // SetConfigs - set-configs <key>=<value> commands
 func (q *Qliksense) SetConfigs(args []string) error {
 	// retieve current context from config.yaml
@@ -147,15 +139,11 @@ func (q *Qliksense) SetConfigs(args []string) error {

 	return nil
 }
-
 func retrieveCurrentContextInfo(q *Qliksense) (api.QliksenseCR, string, error) {
 	var qliksenseConfig api.QliksenseConfig
 	qliksenseConfigFile := filepath.Join(q.QliksenseHome, QliksenseConfigFile)

-	if err := api.ReadFromFile(&qliksenseConfig, qliksenseConfigFile); err != nil {
-		log.Println(err)
-		return api.QliksenseCR{}, "", err
-	}
+	api.ReadFromFile(&qliksenseConfig, qliksenseConfigFile)
 	currentContext := qliksenseConfig.Spec.CurrentContext
 	api.LogDebugMessage("Current-context from config.yaml: %s", currentContext)
 	if currentContext == "" {
@@ -178,10 +166,7 @@ func retrieveCurrentContextInfo(q *Qliksense) (api.QliksenseCR, string, error) {
 		log.Println(err)
 		return api.QliksenseCR{}, "", err
 	}
-	if err := api.ReadFromFile(&qliksenseCR, qliksenseContextsFile); err != nil {
-		log.Println(err)
-		return api.QliksenseCR{}, "", err
-	}
+	api.ReadFromFile(&qliksenseCR, qliksenseContextsFile)

 	api.LogDebugMessage("Read context file: %s, Read QliksenseCR: %v", qliksenseContextsFile, qliksenseCR)
 	return qliksenseCR, qliksenseContextsFile, nil
@@ -217,8 +202,6 @@ func (q *Qliksense) SetOtherConfigs(args []string) error {
 		case "storageClassName":
 			qliksenseCR.Spec.StorageClassName = argsString[1]
 			api.LogDebugMessage("Current StorageClassName after modification: %s ", qliksenseCR.Spec.StorageClassName)
-		case "manifestsRoot":
-			qliksenseCR.Spec.ManifestsRoot = argsString[1]
 		case "rotateKeys":
 			rotateKeys, err := validateInput(argsString[1])
 			if err != nil {
@@ -251,10 +234,7 @@ func (q *Qliksense) SetContextConfig(args []string) error {
 func (q *Qliksense) ListContextConfigs() error {
 	qliksenseConfigFile := filepath.Join(q.QliksenseHome, QliksenseConfigFile)
 	var qliksenseConfig api.QliksenseConfig
-	if err := api.ReadFromFile(&qliksenseConfig, qliksenseConfigFile); err != nil {
-		log.Println(err)
-		return err
-	}
+	api.ReadFromFile(&qliksenseConfig, qliksenseConfigFile)
 	out := ansi.NewColorableStdout()
 	w := tabwriter.NewWriter(out, 5, 8, 0, '\t', 0)
 	fmt.Fprintln(w, chalk.Underline.TextStyle("Context Name"), "\t", chalk.Underline.TextStyle("CR File Location"))
@@ -293,10 +273,7 @@ func (q *Qliksense) SetUpQliksenseContext(contextName string, isDefaultContext b
 	if !api.FileExists(qliksenseConfigFile) {
 		qliksenseConfig.AddBaseQliksenseConfigs(contextName)
 	} else {
-		if err := api.ReadFromFile(&qliksenseConfig, qliksenseConfigFile); err != nil {
-			log.Println(err)
-			return err
-		}
+		api.ReadFromFile(&qliksenseConfig, qliksenseConfigFile)
 		if isDefaultContext { // if config file exits but a default context is requested, we want to prevent writing to config file
 			configFileTrack = true
 		}
@@ -330,10 +307,7 @@ func (q *Qliksense) SetUpQliksenseContext(contextName string, isDefaultContext b
 		qliksenseCR.AddCommonConfig(contextName)
 		api.LogDebugMessage("Added Context: %s", contextName)
 	} else {
-		if err := api.ReadFromFile(&qliksenseCR, qliksenseContextFile); err != nil {
-			log.Println(err)
-			return err
-		}
+		api.ReadFromFile(&qliksenseCR, qliksenseContextFile)
 	}

 	api.WriteToFile(&qliksenseCR, qliksenseContextFile)
@@ -378,96 +352,3 @@ func validateInput(input string) (string, error) {
 	}
 	return input, err
 }
-
-// PrepareK8sSecret decodes and decrypts the secret value in the secret.yaml file and returns a B64encoded string
-func (q *Qliksense) PrepareK8sSecret(qliksenseCR api.QliksenseCR, targetFile string) (string, error) {
-	qConfig := api.NewQConfig(q.QliksenseHome)
-	_, rsaPrivateKey, err := qConfig.GetCurrentContextEncryptionKeyPair()
-	if err != nil {
-		return "", err
-	}
-
-	// check if targetFile exists
-	if !api.FileExists(targetFile) {
-		err := fmt.Errorf("Target file does not exist in the path provided")
-		log.Println(err)
-		return "", err
-	}
-	// read the target file
-	k8sSecret, err := readTargetfile(targetFile)
-	if err != nil {
-		return "", err
-	}
-	// retrieve value from data section
-	k8sSecret1, err := api.K8sSecretFromYaml(k8sSecret)
-	if err != nil {
-		return "", err
-	}
-
-	dataMap := k8sSecret1.Data
-	var base64EncodedSecret string
-	var resultMap = make(map[string][]byte)
-	for k, v := range dataMap {
-		// base64 decode every value
-		decodedStr, _ := base64.StdEncoding.DecodeString(string(v))
-
-		decryptedString, err := api.Decrypt(decodedStr, rsaPrivateKey)
-		if err != nil {
-			err := fmt.Errorf("Not able to decrypt message")
-			return "", err
-		}
-
-		// base64 encode the values
-		base64EncodedSecret = b64.StdEncoding.EncodeToString(decryptedString)
-		resultMap[k] = []byte(base64EncodedSecret)
-	}
-	api.LogDebugMessage("B64 encoded Map: %v\n", resultMap)
-
-	// putting the above map back into the k8sSecret struct
-	k8sSecret1.Data = resultMap
-	k8sSecretBytes, err := api.K8sSecretToYaml(k8sSecret1)
-	api.LogDebugMessage("Final Yaml: %v\n", string(k8sSecretBytes))
-	if err != nil {
-		return "", err
-	}
-
-	return string(k8sSecretBytes), nil
-}
-
-func readTargetfile(targetFile string) ([]byte, error) {
-	k8sSecret, err := ioutil.ReadFile(targetFile)
-	if err != nil {
-		err := fmt.Errorf("Unable to read the targetFile")
-		log.Println(err)
-		return nil, err
-	}
-	return k8sSecret, nil
-}
-
-func (q *Qliksense) SetImageRegistry(registry, pushUsername, pushPassword, pullUsername, pullPassword string) error {
-	qConfig := api.NewQConfig(q.QliksenseHome)
-	qliksenseCR, qliksenseContextsFile, err := retrieveCurrentContextInfo(q)
-	if err != nil {
-		return err
-	}
-	if pushUsername != "" {
-		if err := qConfig.SetPushDockerConfigJsonSecret(&api.DockerConfigJsonSecret{
-			Uri:      registry,
-			Username: pushUsername,
-			Password: pushPassword,
-		}); err != nil {
-			return err
-		} else if err := qConfig.SetPullDockerConfigJsonSecret(&api.DockerConfigJsonSecret{
-			Name:      pullSecretName,
-			Namespace: qliksenseCR.Spec.NameSpace,
-			Uri:       registry,
-			Username:  pullUsername,
-			Password:  pullPassword,
-			Email:     pullUsername,
-		}); err != nil {
-			return err
-		}
-	}
-	qliksenseCR.Spec.AddToConfigs("qliksense", imageRegistryConfigKey, registry)
-	return api.WriteToFile(&qliksenseCR, qliksenseContextsFile)
-}
--- a/pkg/qliksense/context_configs_test.go
+++ b/pkg/qliksense/context_configs_test.go
@@ -5,11 +5,8 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
-	"path"
 	"path/filepath"
 	"testing"
-
-	"github.com/qlik-oss/sense-installer/pkg/api"
 )

 var (
@@ -222,116 +219,3 @@ func TestSetConfigs(t *testing.T) {
 		})
 	}
 }
-
-func TestSetImageRegistry(t *testing.T) {
-	getQlikSense := func(tmpQlikSenseHome string) (*Qliksense, error) {
-		if err := ioutil.WriteFile(path.Join(tmpQlikSenseHome, "config.yaml"), []byte(fmt.Sprintf(`
-apiVersion: config.qlik.com/v1
-kind: QliksenseConfig
-metadata:
-  name: QliksenseConfigMetadata
-spec:
-  contexts:
-  - name: qlik-default
-    crFile: %s/contexts/qlik-default/qlik-default.yaml
-  currentContext: qlik-default
-`, tmpQlikSenseHome)), os.ModePerm); err != nil {
-			return nil, err
-		}
-
-		defaultContextDir := path.Join(tmpQlikSenseHome, "contexts", "qlik-default")
-		if err := os.MkdirAll(defaultContextDir, os.ModePerm); err != nil {
-			return nil, err
-		}
-
-		version := "foo"
-		manifestsRootDir := fmt.Sprintf("%s/repo/%s", defaultContextDir, version)
-		if err := ioutil.WriteFile(path.Join(defaultContextDir, "qlik-default.yaml"), []byte(fmt.Sprintf(`
-apiVersion: qlik.com/v1
-kind: Qliksense
-metadata:
-  name: qlik-default
-  labels:
-    version: %s
-spec:
-  profile: docker-desktop
-  manifestsRoot: %s
-  namespace: some-namespace
-`, version, manifestsRootDir)), os.ModePerm); err != nil {
-			return nil, err
-		}
-		return &Qliksense{
-			QliksenseHome: tmpQlikSenseHome,
-		}, nil
-	}
-	testCases := []struct {
-		name               string
-		registry           string
-		pushUsername       string
-		pushPassword       string
-		pullUsername       string
-		pullPassword       string
-		expectSecretsExist bool
-	}{
-		{
-			name:               "no auth",
-			registry:           "foobar",
-			pushUsername:       "",
-			pushPassword:       "",
-			pullUsername:       "",
-			pullPassword:       "",
-			expectSecretsExist: false,
-		},
-		{
-			name:               "auth",
-			registry:           "foobar",
-			pushUsername:       "foo-push",
-			pushPassword:       "bar-push",
-			pullUsername:       "foo-pull",
-			pullPassword:       "bar-pull",
-			expectSecretsExist: true,
-		},
-	}
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			tmpQlikSenseHome, err := ioutil.TempDir("", "")
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-			defer os.RemoveAll(tmpQlikSenseHome)
-
-			q, err := getQlikSense(tmpQlikSenseHome)
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-
-			if err := q.SetImageRegistry(testCase.registry, testCase.pushUsername, testCase.pushPassword,
-				testCase.pullUsername, testCase.pullPassword); err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-
-			qConfig := api.NewQConfig(q.QliksenseHome)
-			if testCase.expectSecretsExist {
-				if pushSecret, err := qConfig.GetPushDockerConfigJsonSecret(); err != nil {
-					t.Fatalf("unexpected error: %v", err)
-				} else if pushSecret.Uri != testCase.registry ||
-					pushSecret.Username != testCase.pushUsername || pushSecret.Password != testCase.pushPassword {
-					t.Fatalf("unexpected push secret content: %v", pushSecret)
-				}
-				if pullSecret, err := qConfig.GetDockerConfigJsonSecret("image-registry-pull-secret.yaml"); err != nil {
-					t.Fatalf("unexpected error: %v", err)
-				} else if pullSecret.Uri != testCase.registry ||
-					pullSecret.Name != "artifactory-docker-secret" || pullSecret.Namespace != "some-namespace" ||
-					pullSecret.Username != testCase.pullUsername || pullSecret.Password != testCase.pullPassword {
-					t.Fatalf("unexpected pull secret content: %v", pullSecret)
-				}
-			} else {
-				if _, err := qConfig.GetPushDockerConfigJsonSecret(); err == nil {
-					t.Fatal("unexpected image-registry-push-secret.yaml")
-				} else if _, err := qConfig.GetDockerConfigJsonSecret("image-registry-pull-secret.yaml"); err == nil {
-					t.Fatal("unexpected image-registry-pull-secret.yaml")
-				}
-			}
-		})
-	}
-}
--- a/pkg/qliksense/crds.go
+++ b/pkg/qliksense/crds.go
@@ -1,69 +0,0 @@
-package qliksense
-
-import (
-	"errors"
-	"fmt"
-	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-	"path/filepath"
-)
-
-type CrdCommandOptions struct {
-	All bool
-}
-
-func (q *Qliksense) ViewCrds(opts *CrdCommandOptions) error {
-	//io.WriteString(os.Stdout, q.GetCRDString())
-	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	qcr, err := qConfig.GetCurrentCR()
-	if err != nil {
-		fmt.Println("cannot get the current-context cr", err)
-		return err
-	}
-	if engineCRD, err := getQliksenseInitCrd(qcr); err != nil {
-		return err
-	} else if opts.All {
-		fmt.Printf("%s\n%s", q.GetOperatorCRDString(), engineCRD)
-	} else {
-		fmt.Printf("%s", engineCRD)
-	}
-	return nil
-}
-
-func (q *Qliksense) InstallCrds(opts *CrdCommandOptions) error {
-	// install qliksense-init crd
-	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	qcr, err := qConfig.GetCurrentCR()
-	if err != nil {
-		fmt.Println("cannot get the current-context cr", err)
-		return err
-	}
-
-	if engineCRD, err := getQliksenseInitCrd(qcr); err != nil {
-		return err
-	} else if err = qapi.KubectlApply(engineCRD, qcr.Spec.NameSpace); err != nil {
-		return err
-	}
-	if opts.All { // install opeartor crd
-		if err := qapi.KubectlApply(q.GetOperatorCRDString(), qcr.Spec.NameSpace); err != nil {
-			fmt.Println("cannot do kubectl apply on opeartor CRD", err)
-			return err
-		}
-	}
-	return nil
-}
-
-func getQliksenseInitCrd(qcr *qapi.QliksenseCR) (string, error) {
-
-	if qcr.Spec.GetManifestsRoot() == "" {
-		return "", errors.New("Cannot find manifests root. Please use `qliksense fetch <version>`")
-	}
-
-	qInitMsPath := filepath.Join(qcr.Spec.GetManifestsRoot(), Q_INIT_CRD_PATH)
-
-	qInitByte, err := executeKustomizeBuild(qInitMsPath)
-	if err != nil {
-		fmt.Println("cannot generate crds for qliksense-init", err)
-		return "", err
-	}
-	return string(qInitByte), nil
-}
--- a/pkg/qliksense/docker.go
+++ b/pkg/qliksense/docker.go
@@ -2,205 +2,235 @@ package qliksense

 import (
 	"fmt"
+	"io"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
+	"time"

 	"github.com/containers/image/v5/copy"
 	"github.com/containers/image/v5/signature"
 	"github.com/containers/image/v5/transports/alltransports"
 	imageTypes "github.com/containers/image/v5/types"
-	qapi "github.com/qlik-oss/sense-installer/pkg/api"
+	"github.com/docker/cli/cli/command"
+	cliflags "github.com/docker/cli/cli/flags"
+	"github.com/docker/distribution/reference"
+	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/pkg/jsonmessage"
+	"github.com/docker/docker/pkg/term"
+	"github.com/docker/docker/registry"
+	homedir "github.com/mitchellh/go-homedir"
+	"github.com/pkg/errors"
+
 	"golang.org/x/net/context"
-	"gopkg.in/yaml.v2"
-)
-
-type imageNameParts struct {
-	name string
-	tag  string
-}
-
-const (
-	imagesDirName           = "images"
-	imageIndexDirName       = "index"
-	imageSharedBlobsDirName = "blobs"
+	yaml "gopkg.in/yaml.v2"
 )

 // PullImages ...
-func (q *Qliksense) PullImagesForCurrentCR() error {
-	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	qcr, err := qConfig.GetCurrentCR()
-	if err != nil {
-		return err
-	}
-	version := qcr.GetLabelFromCr("version")
-	profile := qcr.Spec.Profile
-	repoDir := qcr.Spec.ManifestsRoot
+func (q *Qliksense) PullImages(gitRef, profile string, engine bool) error {
+	var (
+		image, versionFile, imagesDir, homeDir string
+		err                                    error
+		versionOut                             *VersionOutput
+	)
+	println("getting images list...")

-	imagesDir, err := setupImagesDir(q.QliksenseHome)
-	if err != nil {
+	// TODO: get getref and profile from config/cr for About function call
+	if versionOut, err = q.About(gitRef, profile); err != nil {
 		return err
 	}

-	versionOut, stored, err := q.readOrGenerateVersionOutput(imagesDir, version, repoDir, profile)
-	if err != nil {
+	if homeDir, err = homedir.Dir(); err != nil {
 		return err
 	}
+	imagesDir = filepath.Join(homeDir, ".qliksense", "images")
+	os.MkdirAll(imagesDir, os.ModePerm)
+	versionFile = filepath.Join(imagesDir, versionOut.QliksenseVersion)

-	for _, image := range versionOut.Images {
-		if err := pullImage(image, imagesDir); err != nil {
-			fmt.Printf("%v\n", err)
-			return err
-		}
-		fmt.Print("---\n")
-	}
-
-	if version != "" && !stored {
-		if err := q.writeVersionOutput(versionOut, imagesDir, version); err != nil {
-			return err
+	if _, err = os.Stat(versionFile); err != nil {
+		if os.IsNotExist(err) {
+			if yamlVersion, err := yaml.Marshal(versionOut); err != nil {
+				return err
+			} else if err = ioutil.WriteFile(versionFile, yamlVersion, os.ModePerm); err != nil {
+				return err
+			}
+		} else {
+			return errors.Errorf("Unable to determine About file %v exists", versionFile)
 		}
 	}
+	for _, image = range versionOut.Images {
+		if _, err = q.PullImage(image, engine); err != nil {
+			fmt.Print(err)
+		}
+		println("---")
+	}
+
 	return nil
 }

-func pullImage(image, imagesDir string) error {
-	srcRef, err := alltransports.ParseImageName(fmt.Sprintf("docker://%v", image))
-	if err != nil {
-		return err
+// PullImage ...
+func (q *Qliksense) PullImage(imageName string, engine bool) (map[string]string, error) {
+	if engine {
+		return q.pullDockerImage(imageName)
 	}
-	nameTag := getImageNameParts(image)
-	targetDir := filepath.Join(imagesDir, imageIndexDirName, nameTag.name, nameTag.tag)
-	if err := os.MkdirAll(targetDir, os.ModePerm); err != nil {
-		return err
+	return q.pullImage(imageName)
+}
+
+func (q *Qliksense) commandTimeoutContext(commandTimeout time.Duration) (context.Context, context.CancelFunc) {
+	ctx := context.Background()
+	var cancel context.CancelFunc = func() {}
+	if commandTimeout > 0 {
+		ctx, cancel = context.WithTimeout(ctx, commandTimeout)
+	}
+	return ctx, cancel
+}
+
+func (q *Qliksense) pullImage(imageName string) (map[string]string, error) {
+	var (
+		ctx                         context.Context
+		cancel                      context.CancelFunc
+		srcRef, destRef             imageTypes.ImageReference
+		blobDir, targetDir, homeDir string
+		segments                    []string
+		nameTag                     []string
+		err                         error
+		policyContext               *signature.PolicyContext
+	)
+	ctx, cancel = q.commandTimeoutContext(0)
+	defer cancel()
+
+	if srcRef, err = alltransports.ParseImageName("docker://" + imageName); err != nil {
+		return nil, err
+	}
+	segments = strings.Split(imageName, "/")
+	nameTag = strings.Split(segments[len(segments)-1], ":")
+	if len(nameTag) < 2 {
+		nameTag = append(nameTag, "latest")
+	}
+	if homeDir, err = homedir.Dir(); err != nil {
+		return nil, err
+	}
+	targetDir = filepath.Join(homeDir, ".qliksense", "images", nameTag[0], nameTag[1])
+
+	fmt.Printf("==> Pulling image %v:%v", nameTag[0], nameTag[1])
+	fmt.Println()
+	os.MkdirAll(targetDir, os.ModePerm)
+	blobDir = filepath.Join(homeDir, ".qliksense", "blobs")
+	os.MkdirAll(blobDir, os.ModePerm)
+
+	if destRef, err = alltransports.ParseImageName("oci:" + targetDir); err != nil {
+		return nil, err
 	}

-	destRef, err := alltransports.ParseImageName(fmt.Sprintf("oci:%v", targetDir))
-	if err != nil {
-		return err
-	}
-
-	policyContext, err := signature.NewPolicyContext(&signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}})
-	if err != nil {
-		return err
+	if policyContext, err = signature.NewPolicyContext(&signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}}); err != nil {
+		return nil, err
 	}
 	defer policyContext.Destroy()

-	fmt.Printf("==> Pulling image from %v\n", srcRef.StringWithinTransport())
-	if _, err := copy.Image(context.Background(), policyContext, destRef, srcRef, &copy.Options{
+	_, err = copy.Image(ctx, policyContext, destRef, srcRef, &copy.Options{
 		ReportWriter: os.Stdout,
 		SourceCtx: &imageTypes.SystemContext{
 			ArchitectureChoice: "amd64",
 			OSChoice:           "linux",
 		},
 		DestinationCtx: &imageTypes.SystemContext{
-			OCISharedBlobDirPath: filepath.Join(imagesDir, imageSharedBlobsDirName),
+			OCISharedBlobDirPath: blobDir,
 		},
-	}); err != nil {
-		return err
+	})
+	return nil, err
+}
+func (q *Qliksense) pullDockerImage(imageName string) (map[string]string, error) {
+	var (
+		cli          *command.DockerCli
+		dockerOutput io.Writer
+		response     io.ReadCloser
+		pullOptions  types.ImagePullOptions
+		ctx          context.Context
+		cancel       context.CancelFunc
+		ref          reference.Named
+		repoInfo     *registry.RepositoryInfo
+		authConfig   types.AuthConfig
+		encodedAuth  string
+		termFd       uintptr
+		err          error
+	)
+	ctx, cancel = q.commandTimeoutContext(0)
+	defer cancel()
+
+	if cli, err = command.NewDockerCli(); err != nil {
+		return nil, err
 	}
-	return nil
+
+	if err = cli.Initialize(cliflags.NewClientOptions()); err != nil {
+		return nil, err
+	}
+
+	if ref, err = reference.ParseNormalizedNamed(imageName); err != nil {
+		return nil, err
+	}
+	if repoInfo, err = registry.ParseRepositoryInfo(ref); err != nil {
+		return nil, err
+	}
+
+	authConfig = command.ResolveAuthConfig(ctx, cli, repoInfo.Index)
+	if encodedAuth, err = command.EncodeAuthToBase64(authConfig); err != nil {
+		return nil, err
+	}
+
+	pullOptions = types.ImagePullOptions{
+		RegistryAuth: encodedAuth,
+	}
+
+	if response, err = cli.Client().ImagePull(ctx, imageName, pullOptions); err != nil {
+		return nil, err
+	}
+	defer response.Close()
+
+	dockerOutput = ioutil.Discard
+	// if b.IsVerbose() {
+	// 	dockerOutput = b.Out
+	// }
+	dockerOutput = os.Stdout
+	termFd, _ = term.GetFdInfo(dockerOutput)
+	// Setting this to false here because Moby os.Exit(1) all over the place and this fails on WSL (only)
+	// when Term is true.
+	isTerm := false
+	if err = jsonmessage.DisplayJSONMessagesStream(response, dockerOutput, termFd, isTerm, nil); err != nil {
+		return nil, err
+	}
+	inspectData, _, err := cli.Client().ImageInspectWithRaw(ctx, imageName)
+	if err != nil {
+		return nil, err
+	}
+	return inspectData.ContainerConfig.Labels, nil
 }

-// TagAndPushImages ...
-func (q *Qliksense) PushImagesForCurrentCR() error {
-	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	qcr, err := qConfig.GetCurrentCR()
-	if err != nil {
-		return err
-	}
-	version := qcr.GetLabelFromCr("version")
-	profile := qcr.Spec.Profile
-	repoDir := qcr.Spec.ManifestsRoot
+//TagAndPushImages ...
+func (q *Qliksense) TagAndPushImages(registry string, engine bool) error {
+	var (
+		image       string
+		err         error
+		yamlVersion string
+		images      VersionOutput
+	)

-	dockerConfigJsonSecret, err := qConfig.GetPushDockerConfigJsonSecret()
-	if err != nil {
-		if os.IsNotExist(err) {
-			dockerConfigJsonSecret = &qapi.DockerConfigJsonSecret{
-				Uri: qcr.GetImageRegistry(),
-			}
-		} else {
-			return err
-		}
-	}
-
-	imagesDir, err := setupImagesDir(q.QliksenseHome)
-	if err != nil {
+	if err = yaml.Unmarshal([]byte(yamlVersion), &images); err != nil {
 		return err
 	}

-	versionOut, stored, err := q.readOrGenerateVersionOutput(imagesDir, version, repoDir, profile)
-	if err != nil {
-		return err
-	}
-
-	for _, image := range versionOut.Images {
-		if err = pushImage(image, imagesDir, dockerConfigJsonSecret); err != nil {
-			fmt.Printf("%v\n", err)
-			return err
-		}
-		fmt.Print("---\n")
-	}
-
-	if version != "" && !stored {
-		if err := q.writeVersionOutput(versionOut, imagesDir, version); err != nil {
-			return err
+	for _, image = range images.Images {
+		if err = q.TagAndPush(image, registry, engine); err != nil {
+			fmt.Print(err)
 		}
+		println("---")
 	}

 	return nil
 }

-func pushImage(image, imagesDir string, dockerConfigJsonSecret *qapi.DockerConfigJsonSecret) error {
-	imageNameParts := getImageNameParts(image)
-	srcDir := filepath.Join(imagesDir, imageIndexDirName, imageNameParts.name, imageNameParts.tag)
-	if exists, err := directoryExists(srcDir); err != nil {
-		return err
-	} else if !exists {
-		if err := pullImage(image, imagesDir); err != nil {
-			return err
-		}
-	}
-	srcRef, err := alltransports.ParseImageName(fmt.Sprintf("oci:%v", srcDir))
-	if err != nil {
-		return err
-	}
-
-	newImage := fmt.Sprintf("%v/%v:%v", dockerConfigJsonSecret.Uri, imageNameParts.name, imageNameParts.tag)
-	destRef, err := alltransports.ParseImageName(fmt.Sprintf("docker://%v", newImage))
-	if err != nil {
-		return err
-	}
-
-	policyContext, err := signature.NewPolicyContext(&signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}})
-	if err != nil {
-		return err
-	}
-	defer policyContext.Destroy()
-
-	destinationCtx := &imageTypes.SystemContext{
-		DockerInsecureSkipTLSVerify: imageTypes.OptionalBoolTrue,
-	}
-	if dockerConfigJsonSecret.Username != "" {
-		destinationCtx.DockerAuthConfig = &imageTypes.DockerAuthConfig{
-			Username: dockerConfigJsonSecret.Username,
-			Password: dockerConfigJsonSecret.Password,
-		}
-	}
-	fmt.Printf("==> Pushing image to: %v\n", destRef.StringWithinTransport())
-	if _, err = copy.Image(context.Background(), policyContext, destRef, srcRef, &copy.Options{
-		ReportWriter: os.Stdout,
-		SourceCtx: &imageTypes.SystemContext{
-			OCISharedBlobDirPath: filepath.Join(imagesDir, imageSharedBlobsDirName),
-		},
-		DestinationCtx: destinationCtx,
-	}); err != nil {
-		return err
-	}
-	return nil
-}
-
-func directoryExists(path string) (exists bool, err error) {
+func (q *Qliksense) directoryExists(path string) (exists bool, err error) {
 	if info, err := os.Stat(path); err != nil && os.IsNotExist(err) {
 		exists = false
 		err = nil
@@ -215,65 +245,166 @@ func directoryExists(path string) (exists bool, err error) {
 	return exists, err
 }

-func getImageNameParts(image string) imageNameParts {
-	segments := strings.Split(image, "/")
-	nameTag := strings.Split(segments[len(segments)-1], ":")
+//TagAndPush ...
+func (q *Qliksense) TagAndPush(image string, registryName string, engine bool) error {
+	if engine {
+		return q.tagAndDockerPush(image, registryName)
+	}
+	return q.tagAndPush(image, registryName)
+}
+
+func (q *Qliksense) tagAndPush(image string, registryName string) error {
+	var (
+		ctx                               context.Context
+		cancel                            context.CancelFunc
+		srcRef, destRef                   imageTypes.ImageReference
+		blobDir, srcDir, homeDir, newName string
+		segments                          []string
+		nameTag                           []string
+		err                               error
+		policyContext                     *signature.PolicyContext
+		srcExists                         bool
+	)
+	ctx, cancel = q.commandTimeoutContext(0)
+	defer cancel()
+
+	segments = strings.Split(image, "/")
+	nameTag = strings.Split(segments[len(segments)-1], ":")
+
 	if len(nameTag) < 2 {
 		nameTag = append(nameTag, "latest")
 	}
-	return imageNameParts{
-		name: nameTag[0],
-		tag:  nameTag[1],
-	}
-}
-
-func setupImagesDir(qliksenseHome string) (string, error) {
-	imagesDir := filepath.Join(qliksenseHome, imagesDirName)
-
-	imageIndexDir := filepath.Join(imagesDir, imageIndexDirName)
-	if err := os.MkdirAll(imageIndexDir, os.ModePerm); err != nil {
-		return "", err
-	}
-
-	sharedBlobsDir := filepath.Join(imagesDir, imageSharedBlobsDirName)
-	if err := os.MkdirAll(sharedBlobsDir, os.ModePerm); err != nil {
-		return "", err
-	}
-
-	return imagesDir, nil
-}
-
-func (q *Qliksense) readOrGenerateVersionOutput(imagesDir, version, repoDir, profile string) (versionOut *VersionOutput, stored bool, err error) {
-	if version != "" {
-		versionOut, err = q.readVersionOutput(imagesDir, version)
-		if versionOut != nil {
-			stored = true
-		}
-	}
-	if versionOut == nil {
-		if versionOut, err = q.AboutDir(repoDir, profile); err != nil {
-			return nil, false, err
-		}
-	}
-	return versionOut, stored, nil
-}
-
-func (q *Qliksense) readVersionOutput(imagesDir, version string) (*VersionOutput, error) {
-	var versionOut VersionOutput
-	versionFile := filepath.Join(imagesDir, version)
-	if versionOutBytes, err := ioutil.ReadFile(versionFile); err != nil {
-		return nil, err
-	} else if err = yaml.Unmarshal(versionOutBytes, &versionOut); err != nil {
-		return nil, err
-	}
-	return &versionOut, nil
-}
-
-func (q *Qliksense) writeVersionOutput(versionOut *VersionOutput, imagesDir, version string) error {
-	versionFile := filepath.Join(imagesDir, version)
-	if versionOutBytes, err := yaml.Marshal(versionOut); err != nil {
+	if homeDir, err = homedir.Dir(); err != nil {
 		return err
-	} else if err = ioutil.WriteFile(versionFile, versionOutBytes, os.ModePerm); err != nil {
+	}
+	srcDir = filepath.Join(homeDir, ".qliksense", "images", nameTag[0], nameTag[1])
+	if srcExists, err = q.directoryExists(srcDir); err != nil {
+		return err
+	}
+	if !srcExists {
+		if _, err = q.PullImage(image, false); err != nil {
+			return err
+		}
+	}
+	if srcRef, err = alltransports.ParseImageName("oci:" + srcDir); err != nil {
+		return err
+	}
+
+	if segments[0] == "docker.io" {
+		image = strings.Join(segments[1:], "/")
+	}
+	newName = "//" + registryName + "/" + segments[len(segments)-1]
+
+	fmt.Printf("==> Tag and push image to %v", newName)
+	fmt.Println()
+
+	if destRef, err = alltransports.ParseImageName("docker:" + newName); err != nil {
+		return err
+	}
+
+	if policyContext, err = signature.NewPolicyContext(&signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}}); err != nil {
+		return err
+	}
+	defer policyContext.Destroy()
+
+	blobDir = filepath.Join(homeDir, ".qliksense", "blobs")
+	os.MkdirAll(blobDir, os.ModePerm)
+
+	_, err = copy.Image(ctx, policyContext, destRef, srcRef, &copy.Options{
+		ReportWriter: os.Stdout,
+		SourceCtx: &imageTypes.SystemContext{
+			OCISharedBlobDirPath: blobDir,
+		},
+		DestinationCtx: &imageTypes.SystemContext{
+			DockerDaemonInsecureSkipTLSVerify: true,
+		},
+	})
+	return err
+}
+
+// PullImage ...
+func (q *Qliksense) tagAndDockerPush(image string, registryName string) error {
+	var (
+		cli              *command.DockerCli
+		dockerOutput     io.Writer
+		response         io.ReadCloser
+		pushOptions      types.ImagePushOptions
+		ctx              context.Context
+		cancel           context.CancelFunc
+		newName          string
+		segments         []string
+		imageList        []types.ImageSummary
+		imageListOptions types.ImageListOptions
+		filterArgs       filters.Args
+		ref              reference.Named
+		repoInfo         *registry.RepositoryInfo
+		authConfig       types.AuthConfig
+		encodedAuth      string
+		termFd           uintptr
+		err              error
+	)
+	// TODO: Create a real cli config context
+	ctx, cancel = q.commandTimeoutContext(0)
+	defer cancel()
+	if cli, err = command.NewDockerCli(); err != nil {
+		return err
+	}
+	if err = cli.Initialize(cliflags.NewClientOptions()); err != nil {
+		return err
+	}
+	segments = strings.Split(image, "/")
+	if segments[0] == "docker.io" {
+		image = strings.Join(segments[1:], "/")
+	}
+	newName = registryName + "/" + segments[len(segments)-1]
+
+	filterArgs = filters.NewArgs()
+	filterArgs.Add("reference", image)
+	imageListOptions = types.ImageListOptions{
+		Filters: filterArgs,
+	}
+	if imageList, err = cli.Client().ImageList(ctx, imageListOptions); err != nil {
+		return err
+	}
+	if imageList == nil || len(imageList) <= 0 {
+		fmt.Printf("Use `qliksense pull`, to pull %v for an air gap push", newName)
+		return nil
+	}
+
+	if err = cli.Client().ImageTag(ctx, image, newName); err != nil {
+		return err
+	}
+
+	if ref, err = reference.ParseNormalizedNamed(image); err != nil {
+		return err
+	}
+	if repoInfo, err = registry.ParseRepositoryInfo(ref); err != nil {
+		return err
+	}
+	authConfig = command.ResolveAuthConfig(ctx, cli, repoInfo.Index)
+	if encodedAuth, err = command.EncodeAuthToBase64(authConfig); err != nil {
+		return err
+	}
+	pushOptions = types.ImagePushOptions{
+		All:          true,
+		RegistryAuth: encodedAuth,
+	}
+
+	if response, err = cli.Client().ImagePush(ctx, newName, pushOptions); err != nil {
+		return err
+	}
+	defer response.Close()
+
+	dockerOutput = ioutil.Discard
+	// if b.IsVerbose() {
+	// 	dockerOutput = b.Out
+	// }
+	dockerOutput = os.Stdout
+	termFd, _ = term.GetFdInfo(dockerOutput)
+	// Setting this to false here because Moby os.Exit(1) all over the place and this fails on WSL (only)
+	// when Term is true.
+	isTerm := false
+	if err = jsonmessage.DisplayJSONMessagesStream(response, dockerOutput, termFd, isTerm, nil); err != nil {
 		return err
 	}
 	return nil
--- a/pkg/qliksense/docker_test.go
+++ b/pkg/qliksense/docker_test.go
@@ -1,548 +0,0 @@
-package qliksense
-
-import (
-	"bytes"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/tls"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math/big"
-	"net/http"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/containers/image/v5/copy"
-	"github.com/containers/image/v5/signature"
-	"github.com/containers/image/v5/transports/alltransports"
-	imageTypes "github.com/containers/image/v5/types"
-	"golang.org/x/net/context"
-
-	"github.com/qlik-oss/sense-installer/pkg/api"
-
-	"gopkg.in/yaml.v2"
-)
-
-func Test_locateDockerRegistryBinary(t *testing.T) {
-	binary, err := locateDockerRegistryBinary()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	cmd := exec.Command(binary, "--version")
-	out, err := cmd.Output()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	t.Logf("output: %v\n", string(out))
-}
-
-func Test_getSelfSignedCertAndKey(t *testing.T) {
-	selfSignedCert, key, err := getSelfSignedCertAndKey()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	fmt.Print(string(selfSignedCert))
-	fmt.Print(string(key))
-}
-
-type clientAuthType byte
-
-const (
-	clientAuthNotProvided clientAuthType = iota
-	clientAuthProvided
-	clientAuthProvidedButIncorrect
-)
-
-func Test_Pull_Push_ImagesForCurrentCR(t *testing.T) {
-	var testCases = []struct {
-		name              string
-		registryAuth      bool
-		clientAuth        clientAuthType
-		expectPushSuccess bool
-	}{
-		{
-			name:              "registry does not require auth and we do not provide auth",
-			registryAuth:      false,
-			clientAuth:        clientAuthNotProvided,
-			expectPushSuccess: true,
-		},
-		{
-			name:              "registry does not require auth but we provide auth",
-			registryAuth:      false,
-			clientAuth:        clientAuthProvided,
-			expectPushSuccess: true,
-		},
-		{
-			name:              "registry requires auth but we do not provide auth",
-			registryAuth:      true,
-			clientAuth:        clientAuthNotProvided,
-			expectPushSuccess: false,
-		},
-		{
-			name:              "registry requires auth but we provide wrong auth",
-			registryAuth:      true,
-			clientAuth:        clientAuthProvidedButIncorrect,
-			expectPushSuccess: false,
-		},
-		{
-			name:              "registry requires auth and we provide auth",
-			registryAuth:      true,
-			clientAuth:        clientAuthProvided,
-			expectPushSuccess: true,
-		},
-	}
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			registryURI := "127.0.0.1:5555"
-			registry, err := setupRegistryV2At(registryURI, testCase.registryAuth)
-			if registry != nil {
-				defer func() {
-					registry.Close()
-					//fmt.Printf("registry stdout:\n%v\n", registry.stdOutBuffer.String())
-					//fmt.Printf("registry stderr:\n%v\n", registry.stdErrBuffer.String())
-				}()
-			}
-			if err != nil {
-				t.Fatalf("unexpected error setting up local registry: %v", err)
-			}
-
-			tmpQlikSenseHome, err := ioutil.TempDir("", "tmp-qlik-sense-home-")
-			if err != nil {
-				t.Fatalf("unexpected error creating tmp dir: %v", err)
-			}
-			defer os.RemoveAll(tmpQlikSenseHome)
-
-			if err := setupQlikSenseHome(t, tmpQlikSenseHome, registry, testCase.clientAuth); err != nil {
-				t.Fatalf("unexpected error setting up qliksense home: %v", err)
-			}
-			q := &Qliksense{QliksenseHome: tmpQlikSenseHome}
-			var versionOut VersionOutput
-
-			if err := q.PullImagesForCurrentCR(); err != nil {
-				t.Fatalf("unexpected pull error: %v", err)
-			} else if versionOutBytes, err := ioutil.ReadFile(path.Join(tmpQlikSenseHome, "images", "foo")); err != nil {
-				t.Fatalf("unexpected error reading version file: %v", err)
-			} else if err = yaml.Unmarshal(versionOutBytes, &versionOut); err != nil {
-				t.Fatalf("unexpected error unmarshalling version file: %v", err)
-			} else if len(versionOut.Images) != 1 || versionOut.Images[0] != "alpine:latest" {
-				t.Fatal("did not find alpine:latest in the version file")
-			} else if infos, err := ioutil.ReadDir(path.Join(tmpQlikSenseHome, "images", "index", "alpine", "latest")); err != nil || len(infos) == 0 {
-				t.Fatal("expected images/index/alpine/latest directory to be non-empty")
-			} else if blobInfos, err := ioutil.ReadDir(path.Join(tmpQlikSenseHome, "images", "blobs", "sha256")); err != nil || len(blobInfos) == 0 {
-				t.Fatal("expected images/blobs/sha256 directory to be non-empty")
-			}
-
-			if testCase.expectPushSuccess {
-				if err := q.PushImagesForCurrentCR(); err != nil {
-					t.Fatalf("unexpected push error: %v", err)
-				} else if tmpImagesDir, err := ioutil.TempDir("", "tmp-images-"); err != nil {
-					t.Fatalf("unexpected error creating tmp dir: %v", err)
-				} else if err := testPullImage(fmt.Sprintf("%s/alpine:latest", registryURI), tmpImagesDir, registry); err != nil {
-					t.Fatalf("unexpected error pulling alpine:latest from the local registry: %v", err)
-				} else if infos, err := ioutil.ReadDir(path.Join(tmpImagesDir, "index", "alpine", "latest")); err != nil || len(infos) == 0 {
-					t.Fatal("expected index/alpine/latest directory to be non-empty")
-				} else if blobInfos, err := ioutil.ReadDir(path.Join(tmpImagesDir, "blobs", "sha256")); err != nil || len(blobInfos) == 0 {
-					t.Fatal("expected blobs/sha256 directory to be non-empty")
-				}
-			} else {
-				if err := q.PushImagesForCurrentCR(); err == nil {
-					t.Fatal("unexpected push success")
-				}
-			}
-		})
-	}
-}
-
-func setupQlikSenseHome(t *testing.T, tmpQlikSenseHome string, registry *testRegistryV2, clientAuth clientAuthType) error {
-	if err := ioutil.WriteFile(path.Join(tmpQlikSenseHome, "config.yaml"), []byte(fmt.Sprintf(`
-apiVersion: config.qlik.com/v1
-kind: QliksenseConfig
-metadata:
-  name: QliksenseConfigMetadata
-spec:
-  contexts:
-  - name: qlik-default
-    crFile: %s/contexts/qlik-default/qlik-default.yaml
-  currentContext: qlik-default
-`, tmpQlikSenseHome)), os.ModePerm); err != nil {
-		return err
-	}
-
-	defaultContextDir := path.Join(tmpQlikSenseHome, "contexts", "qlik-default")
-	if err := os.MkdirAll(defaultContextDir, os.ModePerm); err != nil {
-		return err
-	}
-
-	version := "foo"
-	manifestsRootDir := fmt.Sprintf("%s/repo/%s", defaultContextDir, version)
-	if err := ioutil.WriteFile(path.Join(defaultContextDir, "qlik-default.yaml"), []byte(fmt.Sprintf(`
-apiVersion: qlik.com/v1
-kind: Qliksense
-metadata:
-  name: qlik-default
-  labels:
-    version: %s
-spec:
-  profile: docker-desktop
-  configs:
-    qliksense:
-    - name: imageRegistry
-      value: %s
-  manifestsRoot: %s
-  rotateKeys: "yes"
-  releaseName: qlik-default
-`, version, registry.url, manifestsRootDir)), os.ModePerm); err != nil {
-		return err
-	}
-
-	if clientAuth == clientAuthProvided || clientAuth == clientAuthProvidedButIncorrect {
-		if registry.username == "" || clientAuth == clientAuthProvidedButIncorrect {
-			registry.username = "bad"
-		}
-		if registry.password == "" || clientAuth == clientAuthProvidedButIncorrect {
-			registry.password = "worse"
-		}
-		qConfig := api.NewQConfig(tmpQlikSenseHome)
-		if err := qConfig.SetPushDockerConfigJsonSecret(&api.DockerConfigJsonSecret{
-			Uri:      registry.url,
-			Username: registry.username,
-			Password: registry.password,
-		}); err != nil {
-			return err
-		}
-	}
-
-	profileDir := path.Join(manifestsRootDir, "manifests", "docker-desktop")
-	if err := os.MkdirAll(profileDir, os.ModePerm); err != nil {
-		return err
-	}
-	if err := ioutil.WriteFile(path.Join(profileDir, "kustomization.yaml"), []byte(`
-resources:
- deployment.yaml
-`), os.ModePerm); err != nil {
-		return err
-	}
-	if err := ioutil.WriteFile(path.Join(profileDir, "deployment.yaml"), []byte(`
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: the-deployment
-spec:
-  template:
-    spec:
-      containers:
-        - name: the-container
-          image: alpine:latest
-`), os.ModePerm); err != nil {
-		return err
-	}
-
-	transformersDir := path.Join(manifestsRootDir, "transformers")
-	if err := os.MkdirAll(transformersDir, os.ModePerm); err != nil {
-		return err
-	}
-	if err := ioutil.WriteFile(path.Join(transformersDir, "qseokversion.yaml"), []byte(`
-apiVersion: qlik.com/v1
-kind: SelectivePatch
-metadata:
-  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
-	}
-	return nil
-}
-
-type testRegistryV2 struct {
-	cmd          *exec.Cmd
-	url          string
-	dir          string
-	username     string
-	password     string
-	email        string
-	stdOutBuffer *bytes.Buffer
-	stdErrBuffer *bytes.Buffer
-}
-
-func locateDockerRegistryBinary() (string, error) {
-	if exePath, err := exec.LookPath("docker-registry"); err != nil {
-		if cwd, err := os.Getwd(); err != nil {
-			return "", err
-		} else {
-			return path.Join(cwd, "docker-registry"), nil
-		}
-	} else {
-		return exePath, nil
-	}
-}
-
-func setupRegistryV2At(url string, auth bool) (*testRegistryV2, error) {
-	reg, err := newTestRegistryV2At(url, auth)
-	if err != nil {
-		return nil, err
-	}
-
-	// Wait for registry to be ready to serve requests.
-	for i := 0; i != 50; i++ {
-		if err := reg.Ping("http"); err == nil {
-			fmt.Print("registry http ping succeeded\n")
-			break
-		} else {
-			fmt.Printf("registry http ping error: %v\n", err)
-		}
-		if err := reg.Ping("https"); err == nil {
-			fmt.Print("registry https ping succeeded\n")
-			break
-		} else {
-			fmt.Printf("registry https ping error: %v\n", err)
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
-
-	if err != nil {
-		return reg, errors.New("timeout waiting for test registry to become available")
-	}
-	return reg, nil
-}
-
-func newTestRegistryV2At(url string, auth bool) (*testRegistryV2, error) {
-	tmp, err := ioutil.TempDir("", "registry-test-")
-	if err != nil {
-		return nil, err
-	}
-	template := `version: 0.1
-loglevel: info
-storage:
-    filesystem:
-        rootdirectory: %s
-    delete:
-        enabled: true
-http:
-    addr: %s
-%s`
-	var (
-		htpasswd string
-		username string
-		password string
-		email    string
-	)
-	var env []string
-	if auth {
-		if certificate, key, err := getSelfSignedCertAndKey(); err != nil {
-			return nil, err
-		} else {
-			certPath := filepath.Join(tmp, "domain.crt")
-			if err := ioutil.WriteFile(certPath, certificate, os.FileMode(0644)); err != nil {
-				return nil, err
-			}
-			keyPath := filepath.Join(tmp, "domain.key")
-			if err := ioutil.WriteFile(keyPath, key, os.FileMode(0644)); err != nil {
-				return nil, err
-			}
-			env = append(env, fmt.Sprintf("REGISTRY_HTTP_TLS_CERTIFICATE=%v", certPath))
-			env = append(env, fmt.Sprintf("REGISTRY_HTTP_TLS_KEY=%v", keyPath))
-		}
-
-		htpasswdPath := filepath.Join(tmp, "htpasswd")
-		userpasswd := "testuser:$2y$05$sBsSqk0OpSD1uTZkHXc4FeJ0Z70wLQdAX/82UiHuQOKbNbBrzs63m"
-		username = "testuser"
-		password = "testpassword"
-		email = "test@test.org"
-		if err := ioutil.WriteFile(htpasswdPath, []byte(userpasswd), os.FileMode(0644)); err != nil {
-			return nil, err
-		}
-		htpasswd = fmt.Sprintf(`auth:
-    htpasswd:
-        realm: basic-realm
-        path: %s
-`, htpasswdPath)
-	}
-	confPath := filepath.Join(tmp, "config.yaml")
-	config, err := os.Create(confPath)
-	if err != nil {
-		return nil, err
-	}
-	if _, err := fmt.Fprintf(config, template, tmp, url, htpasswd); err != nil {
-		os.RemoveAll(tmp)
-		return nil, err
-	}
-
-	dockerRegistryBinaryPath, err := locateDockerRegistryBinary()
-	if err != nil {
-		return nil, err
-	}
-	cmd := exec.Command(dockerRegistryBinaryPath, "serve", confPath)
-	cmd.Env = env
-	stdOutBuf, stdErrBuf, err := consumeAndLogOutputs(fmt.Sprintf("registry-%s", url), cmd)
-	if err != nil {
-		return nil, err
-	}
-	if err := cmd.Start(); err != nil {
-		os.RemoveAll(tmp)
-		return nil, err
-	}
-	return &testRegistryV2{
-		cmd:          cmd,
-		url:          url,
-		dir:          tmp,
-		username:     username,
-		password:     password,
-		email:        email,
-		stdOutBuffer: stdOutBuf,
-		stdErrBuffer: stdErrBuf,
-	}, nil
-}
-
-func (t *testRegistryV2) Ping(protocol string) error {
-	tr := &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-	}
-	client := &http.Client{Transport: tr}
-
-	resp, err := client.Get(fmt.Sprintf("%v://%s/v2/", protocol, t.url))
-	if err != nil {
-		return err
-	}
-	if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusUnauthorized {
-		return fmt.Errorf("registry ping replied with an unexpected status code %d", resp.StatusCode)
-	}
-	return nil
-}
-
-func (t *testRegistryV2) Close() {
-	t.cmd.Process.Kill()
-	os.RemoveAll(t.dir)
-}
-
-func consumeAndLogOutputStream(id string, f io.ReadCloser) *bytes.Buffer {
-	buff := &bytes.Buffer{}
-	go func() {
-		defer func() {
-			f.Close()
-			fmt.Fprintf(buff, "[%s]: Closed\n", id)
-		}()
-		buf := make([]byte, 1024)
-		for {
-			fmt.Fprintf(buff, "[%s]: waiting\n", id)
-			n, err := f.Read(buf)
-			fmt.Fprintf(buff, "[%s]: got %d,%#v: %s\n", id, n, err, strings.TrimSuffix(string(buf[:n]), "\n"))
-			if n <= 0 {
-				break
-			}
-		}
-	}()
-	return buff
-}
-
-// consumeAndLogOutputs causes all output to stdout and stderr from an *exec.Cmd to be logged to c
-func consumeAndLogOutputs(id string, cmd *exec.Cmd) (*bytes.Buffer, *bytes.Buffer, error) {
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		return nil, nil, err
-	}
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		return nil, nil, err
-	}
-	return consumeAndLogOutputStream(id+" stdout", stdout), consumeAndLogOutputStream(id+" stderr", stderr), nil
-}
-
-func getSelfSignedCertAndKey() (certificate, key []byte, err error) {
-	priv, err := rsa.GenerateKey(rand.Reader, 4096)
-	if err != nil {
-		return nil, nil, err
-	}
-	serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
-	serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
-	if err != nil {
-		return nil, nil, fmt.Errorf("ailed to generate serial number: %s", err)
-	}
-	template := x509.Certificate{
-		SerialNumber: serialNumber,
-		Subject: pkix.Name{
-			Organization: []string{"Acme Co"},
-		},
-		NotBefore:             time.Now(),
-		NotAfter:              time.Now().Add(time.Hour * 24),
-		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
-		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
-		BasicConstraintsValid: true,
-	}
-
-	derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, &priv.PublicKey, priv)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to create certificate: %s", err)
-	}
-	certificate = pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
-
-	privBytes, err := x509.MarshalPKCS8PrivateKey(priv)
-	if err != nil {
-		return nil, nil, fmt.Errorf("unable to marshal private key: %v", err)
-	}
-	key = pem.EncodeToMemory(&pem.Block{Type: "PRIVATE KEY", Bytes: privBytes})
-
-	return certificate, key, nil
-}
-
-func testPullImage(image, imagesDir string, registry *testRegistryV2) error {
-	srcRef, err := alltransports.ParseImageName(fmt.Sprintf("docker://%v", image))
-	if err != nil {
-		return err
-	}
-	nameTag := getImageNameParts(image)
-	targetDir := filepath.Join(imagesDir, imageIndexDirName, nameTag.name, nameTag.tag)
-	if err := os.MkdirAll(targetDir, os.ModePerm); err != nil {
-		return err
-	}
-
-	destRef, err := alltransports.ParseImageName(fmt.Sprintf("oci:%v", targetDir))
-	if err != nil {
-		return err
-	}
-
-	policyContext, err := signature.NewPolicyContext(&signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}})
-	if err != nil {
-		return err
-	}
-	defer policyContext.Destroy()
-
-	fmt.Printf("==> Test is pulling image from %v\n", srcRef.StringWithinTransport())
-	sourceCtx := &imageTypes.SystemContext{
-		ArchitectureChoice:          "amd64",
-		OSChoice:                    "linux",
-		DockerInsecureSkipTLSVerify: imageTypes.OptionalBoolTrue,
-	}
-	if registry.username != "" {
-		sourceCtx.DockerAuthConfig = &imageTypes.DockerAuthConfig{
-			Username: registry.username,
-			Password: registry.password,
-		}
-	}
-	if _, err := copy.Image(context.Background(), policyContext, destRef, srcRef, &copy.Options{
-		ReportWriter: os.Stdout,
-		SourceCtx:    sourceCtx,
-		DestinationCtx: &imageTypes.SystemContext{
-			OCISharedBlobDirPath: filepath.Join(imagesDir, imageSharedBlobsDirName),
-		},
-	}); err != nil {
-		return err
-	}
-	return nil
-}
--- a/pkg/qliksense/install.go
+++ b/pkg/qliksense/install.go
@@ -1,7 +1,6 @@
 package qliksense

 import (
-	"errors"
 	"fmt"

 	qapi "github.com/qlik-oss/sense-installer/pkg/api"
@@ -24,18 +23,27 @@ func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions) err

 	// fetch the version
 	qConfig := qapi.NewQConfig(q.QliksenseHome)
+	fetchAndUpdateCR(qConfig, version)

+	//TODO: may need to check if CRD already installed, but doing apply does not hurt for now
+	//install crd into cluster
+	fmt.Println("Installing operator CRD")
+	if err := qapi.KubectlApply(q.GetCRDString()); err != nil {
+		fmt.Println("cannot do kubectl apply on opeartor CRD", err)
+		return err
+	}
+	// install generated manifests into cluster
+	fmt.Println("Installing generated manifests into cluster")
 	qcr, err := qConfig.GetCurrentCR()
 	if err != nil {
 		fmt.Println("cannot get the current-context cr", err)
 		return err
 	}
-
 	if opts.AcceptEULA != "" {
 		qcr.Spec.AddToConfigs("qliksense", "acceptEULA", opts.AcceptEULA)
 	}
 	if opts.MongoDbUri != "" {
-		qcr.Spec.AddToSecrets("qliksense", "mongoDbUri", opts.MongoDbUri, "")
+		qcr.Spec.AddToSecrets("qliksense", "mongoDbUri", opts.MongoDbUri)
 	}
 	if opts.StorageClass != "" {
 		qcr.Spec.StorageClassName = opts.StorageClass
@@ -47,44 +55,11 @@ func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions) err
 		qcr.Spec.RotateKeys = opts.RotateKeys
 	}
 	qConfig.WriteCurrentContextCR(qcr)
-
-	//CRD will be installed outside of operator
-	//install operator controller into the namespace
-	fmt.Println("Installing operator controller")
-	if err := qapi.KubectlApply(q.GetOperatorControllerString(), qcr.Spec.NameSpace); err != nil {
-		fmt.Println("cannot do kubectl apply on opeartor controller", err)
-		return err
-	}
-
-	if qcr.Spec.Git.Repository != "" {
-		// fetching and applying manifest will be in the operator controller
-		return q.applyCR(qcr.Spec.NameSpace)
-	}
-	if version != "" { // no need to fetch manifest root already set by some other way
-		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 cluster")
-	if err := q.applyConfigToK8s(qcr); err != nil {
+	if err := q.applyConfigToK8s(qcr, "install"); err != nil {
 		fmt.Println("cannot do kubectl apply on manifests")
 		return err
 	}

-	return q.applyCR(qcr.Spec.NameSpace)
-}
-
-func (q *Qliksense) applyCR(ns string) error {
 	// install operator cr into cluster
 	//get the current context cr
 	fmt.Println("Install operator CR into cluster")
@@ -92,9 +67,8 @@ func (q *Qliksense) applyCR(ns string) error {
 	if err != nil {
 		return err
 	}
-	if err := qapi.KubectlApply(r, ns); err != nil {
+	if err := qapi.KubectlApply(r); err != nil {
 		fmt.Println("cannot do kubectl apply on operator CR")
-		return err
 	}
 	return nil
 }
--- a/pkg/qliksense/kuz.go
+++ b/pkg/qliksense/kuz.go
@@ -4,8 +4,6 @@ import (
 	"log"
 	"os"

-	"github.com/qlik-oss/sense-installer/pkg/api"
-
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/krusty"
@@ -32,13 +30,3 @@ func executeKustomizeBuild(directory string) ([]byte, error) {
 	}
 	return resMap.AsYaml()
 }
-
-func executeKustomizeBuildWithStdoutProgress(path string) (kuzManifest []byte, err error) {
-	result, err := api.ExecuteTaskWithBlinkingStdoutFeedback(func() (interface{}, error) {
-		return executeKustomizeBuild(path)
-	}, "...")
-	if err != nil {
-		return nil, err
-	}
-	return result.([]byte), nil
-}
--- a/pkg/qliksense/operator.go
+++ b/pkg/qliksense/operator.go
@@ -2,40 +2,27 @@ package qliksense

 import (
 	"fmt"
+	"path/filepath"
 	"io"
 	"os"
-	"path/filepath"
 	"strings"
 )

-func (q *Qliksense) ViewOperator() error {
-	io.WriteString(os.Stdout, q.GetOperatorCRDString())
-	return nil
-}
-
-func (q *Qliksense) ViewOperatorController() error {
-	io.WriteString(os.Stdout, q.GetOperatorControllerString())
-	return nil
+func (q *Qliksense) ViewOperatorCrd() {
+	io.WriteString(os.Stdout, q.GetCRDString())
 }

 // this will return crd,deployment,role, rolebinding,serviceaccount for operator
-func (q *Qliksense) GetOperatorCRDString() string {
+func (q *Qliksense) GetCRDString() string {
 	result := ""
 	for _, v := range q.getFileList("crd") {
 		result = q.getYamlFromPackrFile(v)
 	}
-
-	return result
-}
-
-func (q *Qliksense) GetOperatorControllerString() string {
-	result := ""
 	for _, v := range q.getFileList("crd-deploy") {
 		result = result + q.getYamlFromPackrFile(v)
 	}
 	return result
 }
-
 func (q *Qliksense) getYamlFromPackrFile(packrFile string) string {
 	s, err := q.CrdBox.FindString(packrFile)
 	if err != nil {
--- a/pkg/qliksense/uninstall.go
+++ b/pkg/qliksense/uninstall.go
@@ -13,13 +13,9 @@ func (q *Qliksense) UninstallQK8s(contextName string) error {
 	} else if !qConfig.IsContextExist(contextName) {
 		return errors.New("context name [ " + contextName + " ] not found")
 	}
-	cr, err := qConfig.GetCurrentCR()
-	if err != nil {
-		return err
-	}
 	str, err := q.getCRString(contextName)
 	if err != nil {
 		return err
 	}
-	return qapi.KubectlDelete(str, cr.Spec.NameSpace)
+	return qapi.KubectlDelete(str)
 }
--- a/pkg/qliksense/upgrade.go
+++ b/pkg/qliksense/upgrade.go
@@ -21,7 +21,7 @@ func (q *Qliksense) UpgradeQK8s() error {
 		return err
 	}
 	qcr.Spec.RotateKeys = "no"
-	if err := q.applyConfigToK8s(qcr); err != nil {
+	if err := q.applyConfigToK8s(qcr, "upgrade"); err != nil {
 		fmt.Println("cannot do kubectl apply on manifests")
 		return err
 	}
@@ -31,7 +31,7 @@ func (q *Qliksense) UpgradeQK8s() error {
 	if err != nil {
 		return err
 	}
-	if err := qapi.KubectlApply(r, qcr.Spec.NameSpace); err != nil {
+	if err := qapi.KubectlApply(r); err != nil {
 		fmt.Println("cannot do kubectl apply on operator CR")
 	}
 	return nil