changed to bool

.gitignore

@@ -7,5 +7,3 @@ pkg/qliksense/qliksense-packr.go
 pkg/qliksense/docker-registry
 /pkg/qliksense/tests
 .DS_Store
-
-.idea/

LICENSE

@@ -1,191 +0,0 @@
-
-                                Apache License
-                        Version 2.0, January 2004
-                    https://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-    "License" shall mean the terms and conditions for use, reproduction,
-    and distribution as defined by Sections 1 through 9 of this document.
-
-    "Licensor" shall mean the copyright owner or entity authorized by
-    the copyright owner that is granting the License.
-
-    "Legal Entity" shall mean the union of the acting entity and all
-    other entities that control, are controlled by, or are under common
-    control with that entity. For the purposes of this definition,
-    "control" means (i) the power, direct or indirect, to cause the
-    direction or management of such entity, whether by contract or
-    otherwise, or (ii) ownership of fifty percent (50%) or more of the
-    outstanding shares, or (iii) beneficial ownership of such entity.
-
-    "You" (or "Your") shall mean an individual or Legal Entity
-    exercising permissions granted by this License.
-
-    "Source" form shall mean the preferred form for making modifications,
-    including but not limited to software source code, documentation
-    source, and configuration files.
-
-    "Object" form shall mean any form resulting from mechanical
-    transformation or translation of a Source form, including but
-    not limited to compiled object code, generated documentation,
-    and conversions to other media types.
-
-    "Work" shall mean the work of authorship, whether in Source or
-    Object form, made available under the License, as indicated by a
-    copyright notice that is included in or attached to the work
-    (an example is provided in the Appendix below).
-
-    "Derivative Works" shall mean any work, whether in Source or Object
-    form, that is based on (or derived from) the Work and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship. For the purposes
-    of this License, Derivative Works shall not include works that remain
-    separable from, or merely link (or bind by name) to the interfaces of,
-    the Work and Derivative Works thereof.
-
-    "Contribution" shall mean any work of authorship, including
-    the original version of the Work and any modifications or additions
-    to that Work or Derivative Works thereof, that is intentionally
-    submitted to Licensor for inclusion in the Work by the copyright owner
-    or by an individual or Legal Entity authorized to submit on behalf of
-    the copyright owner. For the purposes of this definition, "submitted"
-    means any form of electronic, verbal, or written communication sent
-    to the Licensor or its representatives, including but not limited to
-    communication on electronic mailing lists, source code control systems,
-    and issue tracking systems that are managed by, or on behalf of, the
-    Licensor for the purpose of discussing and improving the Work, but
-    excluding communication that is conspicuously marked or otherwise
-    designated in writing by the copyright owner as "Not a Contribution."
-
-    "Contributor" shall mean Licensor and any individual or Legal Entity
-    on behalf of whom a Contribution has been received by Licensor and
-    subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-    this License, each Contributor hereby grants to You a perpetual,
-    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-    copyright license to reproduce, prepare Derivative Works of,
-    publicly display, publicly perform, sublicense, and distribute the
-    Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-    this License, each Contributor hereby grants to You a perpetual,
-    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-    (except as stated in this section) patent license to make, have made,
-    use, offer to sell, sell, import, and otherwise transfer the Work,
-    where such license applies only to those patent claims licensable
-    by such Contributor that are necessarily infringed by their
-    Contribution(s) alone or by combination of their Contribution(s)
-    with the Work to which such Contribution(s) was submitted. If You
-    institute patent litigation against any entity (including a
-    cross-claim or counterclaim in a lawsuit) alleging that the Work
-    or a Contribution incorporated within the Work constitutes direct
-    or contributory patent infringement, then any patent licenses
-    granted to You under this License for that Work shall terminate
-    as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-    Work or Derivative Works thereof in any medium, with or without
-    modifications, and in Source or Object form, provided that You
-    meet the following conditions:
-
-    (a) You must give any other recipients of the Work or
-        Derivative Works a copy of this License; and
-
-    (b) You must cause any modified files to carry prominent notices
-        stating that You changed the files; and
-
-    (c) You must retain, in the Source form of any Derivative Works
-        that You distribute, all copyright, patent, trademark, and
-        attribution notices from the Source form of the Work,
-        excluding those notices that do not pertain to any part of
-        the Derivative Works; and
-
-    (d) If the Work includes a "NOTICE" text file as part of its
-        distribution, then any Derivative Works that You distribute must
-        include a readable copy of the attribution notices contained
-        within such NOTICE file, excluding those notices that do not
-        pertain to any part of the Derivative Works, in at least one
-        of the following places: within a NOTICE text file distributed
-        as part of the Derivative Works; within the Source form or
-        documentation, if provided along with the Derivative Works; or,
-        within a display generated by the Derivative Works, if and
-        wherever such third-party notices normally appear. The contents
-        of the NOTICE file are for informational purposes only and
-        do not modify the License. You may add Your own attribution
-        notices within Derivative Works that You distribute, alongside
-        or as an addendum to the NOTICE text from the Work, provided
-        that such additional attribution notices cannot be construed
-        as modifying the License.
-
-    You may add Your own copyright statement to Your modifications and
-    may provide additional or different license terms and conditions
-    for use, reproduction, or distribution of Your modifications, or
-    for any such Derivative Works as a whole, provided Your use,
-    reproduction, and distribution of the Work otherwise complies with
-    the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-    any Contribution intentionally submitted for inclusion in the Work
-    by You to the Licensor shall be under the terms and conditions of
-    this License, without any additional terms or conditions.
-    Notwithstanding the above, nothing herein shall supersede or modify
-    the terms of any separate license agreement you may have executed
-    with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-    names, trademarks, service marks, or product names of the Licensor,
-    except as required for reasonable and customary use in describing the
-    origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-    agreed to in writing, Licensor provides the Work (and each
-    Contributor provides its Contributions) on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-    implied, including, without limitation, any warranties or conditions
-    of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-    PARTICULAR PURPOSE. You are solely responsible for determining the
-    appropriateness of using or redistributing the Work and assume any
-    risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-    whether in tort (including negligence), contract, or otherwise,
-    unless required by applicable law (such as deliberate and grossly
-    negligent acts) or agreed to in writing, shall any Contributor be
-    liable to You for damages, including any direct, indirect, special,
-    incidental, or consequential damages of any character arising as a
-    result of this License or out of the use or inability to use the
-    Work (including but not limited to damages for loss of goodwill,
-    work stoppage, computer failure or malfunction, or any and all
-    other commercial damages or losses), even if such Contributor
-    has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-    the Work or Derivative Works thereof, You may choose to offer,
-    and charge a fee for, acceptance of support, warranty, indemnity,
-    or other liability obligations and/or rights consistent with this
-    License. However, in accepting such obligations, You may act only
-    on Your own behalf and on Your sole responsibility, not on behalf
-    of any other Contributor, and only if You agree to indemnify,
-    defend, and hold each Contributor harmless for any liability
-    incurred by, or claims asserted against, such Contributor by reason
-    of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-Copyright 2019 QlikTech International AB
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

cmd/qliksense/config.go

@@ -42,20 +42,3 @@ func configViewCmd(q *qliksense.Qliksense) *cobra.Command {
 	}
 	return c
 }
-
-func configEditCmd(q *qliksense.Qliksense) *cobra.Command {
-	c := &cobra.Command{
-		Use:   "edit [context-name]",
-		Short: "Edit the context cr",
-		Long: `edit the context cr. if no context name provided default context will be edited
-		It will open the vim editor unless KUBE_EDITOR is defined`,
-		Example: `qliksense config edit [context-name]`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 1 {
-				return q.EditCR(args[0])
-			}
-			return q.EditCR("")
-		},
-	}
-	return c
-}

cmd/qliksense/context.go

@@ -115,15 +115,18 @@ func deleteContextConfigCmd(q *qliksense.Qliksense) *cobra.Command {
 	var (
 		cmd *cobra.Command
 	)
-
+	skipConfirmation := false
 	cmd = &cobra.Command{
 		Use:     "delete-context",
 		Short:   "deletes a specific context locally (not in-cluster)",
 		Example: `qliksense config delete-contexts <context_name>`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return q.DeleteContextConfig(args)
+			return q.DeleteContextConfig(args, skipConfirmation)
 		},
 	}
+	f := cmd.Flags()
+
+	f.BoolVar(&skipConfirmation, "yes", skipConfirmation, "skips confirmation")
 	return cmd
 }
 

cmd/qliksense/crds.go

@@ -22,7 +22,7 @@ func crdsViewCmd(q *qliksense.Qliksense) *cobra.Command {
 		},
 	}
 	f := c.Flags()
-	f.BoolVarP(&opts.All, "all", "", false, "Include All CRDs")
+	f.BoolVarP(&opts.All, "all", "a", false, "Include All CRDs")
 	return c
 }
 
@@ -37,6 +37,6 @@ func crdsInstallCmd(q *qliksense.Qliksense) *cobra.Command {
 		},
 	}
 	f := c.Flags()
-	f.BoolVarP(&opts.All, "all", "", false, "Include All CRDs")
+	f.BoolVarP(&opts.All, "all", "a", false, "Include All CRDs")
 	return c
 }

cmd/qliksense/eula.go

@@ -85,6 +85,7 @@ func doEnforceEula() {
 	fmt.Println(eulaText)
 	fmt.Print(eulaPrompt)
 	answer := readRuneFromTty()
+	fmt.Printf("%v\n", answer)
 	if strings.ToLower(answer) != "y" {
 		fmt.Println(eulaErrorInstruction)
 		os.Exit(1)
@@ -97,9 +98,9 @@ func readRuneFromTty() string {
 		panic(err)
 	}
 	defer t.Close()
-	answer, err := t.ReadString()
+	answer, err := t.ReadRune()
 	if err != nil {
 		panic(err)
 	}
-	return answer
+	return string(answer)
 }

cmd/qliksense/preflight.go

@@ -20,7 +20,7 @@ func preflightCmd(q *qliksense.Qliksense) *cobra.Command {
 	return preflightCmd
 }
 
-func pfDnsCheckCmd(q *qliksense.Qliksense) *cobra.Command {
+func preflightCheckDnsCmd(q *qliksense.Qliksense) *cobra.Command {
 	var preflightDnsCmd = &cobra.Command{
 		Use:     "dns",
 		Short:   "perform preflight dns check",
@@ -28,27 +28,19 @@ func pfDnsCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 		Example: `qliksense preflight dns`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight DNS check
-			fmt.Printf("Preflight DNS check\n")
-			fmt.Println("---------------------")
-			namespace, kubeConfigContents, err := preflight.InitPreflight()
+			err := qp.DownloadPreflight()
 			if err != nil {
-				fmt.Printf("Preflight DNS check FAILED\n")
-				log.Fatal(err)
+				err = fmt.Errorf("There has been an error downloading preflight: %+v", err)
+				log.Println(err)
+				return err
 			}
-			if err = qp.CheckDns(namespace, kubeConfigContents); err != nil {
-				fmt.Println(err)
-				fmt.Print("Preflight DNS check FAILED\n")
-				log.Fatal()
-			}
-			return nil
+			return qp.CheckDns()
 		},
 	}
 	return preflightDnsCmd
 }
 
-func pfK8sVersionCheckCmd(q *qliksense.Qliksense) *cobra.Command {
+func preflightCheckK8sVersionCmd(q *qliksense.Qliksense) *cobra.Command {
 	var preflightCheckK8sVersionCmd = &cobra.Command{
 		Use:     "k8s-version",
 		Short:   "check k8s version",
@@ -56,27 +48,19 @@ func pfK8sVersionCheckCmd(q *qliksense.Qliksense) *cobra.Command {
 		Example: `qliksense preflight k8s-version`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight Kubernetes minimum version check
-			fmt.Printf("Preflight kubernetes minimum version check\n")
-			fmt.Println("------------------------------------------")
-			namespace, kubeConfigContents, err := preflight.InitPreflight()
+			err := qp.DownloadPreflight()
 			if err != nil {
-				fmt.Printf("Preflight kubernetes minimum version check FAILED\n")
-				log.Fatal(err)
+				err = fmt.Errorf("There has been an error downloading preflight: %+v", err)
+				log.Println(err)
+				return err
 			}
-			if err = qp.CheckK8sVersion(namespace, kubeConfigContents); err != nil {
-				fmt.Println(err)
-				fmt.Printf("Preflight kubernetes minimum version check FAILED\n")
-				log.Fatal()
-			}
-			return nil
+			return qp.CheckK8sVersion()
 		},
 	}
 	return preflightCheckK8sVersionCmd
 }
 
-func pfAllChecksCmd(q *qliksense.Qliksense) *cobra.Command {
+func preflightAllChecksCmd(q *qliksense.Qliksense) *cobra.Command {
 	var preflightAllChecksCmd = &cobra.Command{
 		Use:     "all",
 		Short:   "perform all checks",
@@ -84,137 +68,14 @@ func pfAllChecksCmd(q *qliksense.Qliksense) *cobra.Command {
 		Example: `qliksense preflight all`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight run all checks
-			fmt.Printf("Running all preflight checks\n")
-			namespace, kubeConfigContents, err := preflight.InitPreflight()
+			err := qp.DownloadPreflight()
 			if err != nil {
-				fmt.Println(err)
-				fmt.Printf("Running preflight check suite has FAILED...\n")
-				log.Fatal()
+				err = fmt.Errorf("There has been an error downloading preflight: %+v", err)
+				log.Println(err)
+				return err
 			}
-			qp.RunAllPreflightChecks(namespace, kubeConfigContents)
-			return nil
-
+			return qp.RunAllPreflightChecks()
 		},
 	}
 	return preflightAllChecksCmd
 }
-
-func pfDeploymentCheckCmd(q *qliksense.Qliksense) *cobra.Command {
-	var pfDeploymentCheckCmd = &cobra.Command{
-		Use:     "deployment",
-		Short:   "perform preflight deploymwnt check",
-		Long:    `perform preflight deployment check to ensure that we can create deployments in the cluster`,
-		Example: `qliksense preflight deployment`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight deployments check
-			fmt.Printf("Preflight deployment check\n")
-			fmt.Println("--------------------------")
-			namespace, kubeConfigContents, err := preflight.InitPreflight()
-			if err != nil {
-				fmt.Printf("Preflight deployment check FAILED\n")
-				log.Fatal(err)
-			}
-			if err = qp.CheckDeployment(namespace, kubeConfigContents); err != nil {
-				fmt.Println(err)
-				fmt.Print("Preflight deploy check FAILED\n")
-				log.Fatal()
-			}
-			return nil
-		},
-	}
-	return pfDeploymentCheckCmd
-}
-
-func pfServiceCheckCmd(q *qliksense.Qliksense) *cobra.Command {
-	var pfServiceCheckCmd = &cobra.Command{
-		Use:     "service",
-		Short:   "perform preflight service check",
-		Long:    `perform preflight service check to ensure that we are able to create services in the cluster`,
-		Example: `qliksense preflight service`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight service check
-			fmt.Printf("Preflight service check\n")
-			fmt.Println("-----------------------")
-			namespace, kubeConfigContents, err := preflight.InitPreflight()
-			if err != nil {
-				fmt.Printf("Preflight service check FAILED\n")
-				log.Fatal(err)
-			}
-			if err = qp.CheckService(namespace, kubeConfigContents); err != nil {
-				fmt.Println(err)
-				fmt.Print("Preflight service check FAILED\n")
-				log.Fatal()
-			}
-			return nil
-		},
-	}
-	return pfServiceCheckCmd
-}
-
-func pfPodCheckCmd(q *qliksense.Qliksense) *cobra.Command {
-	var pfPodCheckCmd = &cobra.Command{
-		Use:     "pod",
-		Short:   "perform preflight pod check",
-		Long:    `perform preflight pod check to ensure we can create pods in the cluster`,
-		Example: `qliksense preflight pod`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight pod check
-			fmt.Printf("Preflight pod check\n")
-			fmt.Println("--------------------")
-			namespace, kubeConfigContents, err := preflight.InitPreflight()
-			if err != nil {
-				fmt.Printf("Preflight pod check FAILED\n")
-				log.Fatal(err)
-			}
-			if err = qp.CheckPod(namespace, kubeConfigContents); err != nil {
-				fmt.Println(err)
-				fmt.Print("Preflight pod check FAILED\n")
-				log.Fatal()
-			}
-			return nil
-		},
-	}
-	return pfPodCheckCmd
-}
-
-func pfCreateRoleCheckCmd(q *qliksense.Qliksense) *cobra.Command {
-	var preflightDnsCmd = &cobra.Command{
-		Use:     "create-role",
-		Short:   "preflight create role check",
-		Long:    `perform preflight role check to ensure we are able to create a role in the cluster`,
-		Example: `qliksense preflight create-role`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight create-role check
-			fmt.Printf("Preflight create-role check\n")
-			fmt.Println("---------------------------")
-			namespace, kubeConfigContents, err := preflight.InitPreflight()
-			if err != nil {
-				fmt.Printf("Preflight create-role check FAILED\n")
-				log.Fatal(err)
-			}
-			if err = qp.CreateRoleCheck(namespace, kubeConfigContents); err != nil {
-				fmt.Println(err)
-				fmt.Print("Preflight role-check FAILED\n")
-				log.Fatal()
-			}
-			return nil
-		},
-	}
-	return preflightDnsCmd
-}
-
-// preflightCmd.AddCommand(pfMongoCheckCmd(p))
-// preflightCmd.AddCommand(pfServiceCheckCmd(p))
-// preflightCmd.AddCommand(pfCreateRoleBindingCheckCmd(p))
-// preflightCmd.AddCommand(pfCreateServiceAccountCheckCmd(p))
-// preflightCmd.AddCommand(pfCreateRBCheckCmd(p))

cmd/qliksense/pull_push.go

@@ -20,7 +20,28 @@ func pullQliksenseImages(q *qliksense.Qliksense) *cobra.Command {
 			if err != nil {
 				return err
 			}
-			return q.PullImages(version, opts.Profile)
+
+			qConfig := qapi.NewQConfig(q.QliksenseHome)
+			if version == "" {
+				if qcr, err := qConfig.GetCurrentCR(); err != nil {
+					return err
+				} else {
+					version = qcr.GetLabelFromCr("version")
+				}
+			}
+
+			if version != "" {
+				if !qConfig.IsRepoExistForCurrent(version) {
+					if err := q.FetchQK8s(version); err != nil {
+						return err
+					}
+				}
+				if err := qConfig.SwitchCurrentCRToVersionAndProfile(version, opts.Profile); err != nil {
+					return err
+				}
+			}
+
+			return q.PullImagesForCurrentCR()
 		},
 	}
 	f := cmd.Flags()

cmd/qliksense/root.go

@@ -12,7 +12,6 @@ import (
 	"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/preflight"
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -101,10 +100,6 @@ func getRootCmd(p *qliksense.Qliksense) *cobra.Command {
 				if err := p.SetUpQliksenseDefaultContext(); err != nil {
 					panic(err)
 				}
-				pf := preflight.NewPreflightConfig(p.QliksenseHome)
-				if err := pf.Initialize(); err != nil {
-					panic(err)
-				}
 				globalEulaPostRun(cmd, p)
 			}
 		},
@@ -190,8 +185,6 @@ func rootCmd(p *qliksense.Qliksense) *cobra.Command {
 	// add clean-config-repo-patches command as a sub-command to the app config sub-command
 	configCmd.AddCommand(cleanConfigRepoPatchesCmd(p))
 
-	// open editor for config
-	configCmd.AddCommand(configEditCmd(p))
 	// add uninstall command
 	cmd.AddCommand(uninstallCmd(p))
 
@@ -202,17 +195,11 @@ func rootCmd(p *qliksense.Qliksense) *cobra.Command {
 
 	// add preflight command
 	preflightCmd := preflightCmd(p)
-	preflightCmd.AddCommand(pfDnsCheckCmd(p))
-	preflightCmd.AddCommand(pfK8sVersionCheckCmd(p))
-	preflightCmd.AddCommand(pfAllChecksCmd(p))
-	// preflightCmd.AddCommand(pfMongoCheckCmd(p))
-	preflightCmd.AddCommand(pfDeploymentCheckCmd(p))
-	preflightCmd.AddCommand(pfServiceCheckCmd(p))
-	preflightCmd.AddCommand(pfPodCheckCmd(p))
-	preflightCmd.AddCommand(pfCreateRoleCheckCmd(p))
-	// preflightCmd.AddCommand(pfCreateRoleBindingCheckCmd(p))
-	// preflightCmd.AddCommand(pfCreateServiceAccountCheckCmd(p))
-	// preflightCmd.AddCommand(pfCreateRBCheckCmd(p))
+	preflightCmd.AddCommand(preflightCheckDnsCmd(p))
+	preflightCmd.AddCommand(preflightCheckK8sVersionCmd(p))
+	preflightCmd.AddCommand(preflightAllChecksCmd(p))
+	//preflightCmd.AddCommand(preflightCheckMongoCmd(p))
+	//preflightCmd.AddCommand(preflightCheckAllCmd(p))
 
 	cmd.AddCommand(preflightCmd)
 	cmd.AddCommand(loadCrFile(p))

docs/preflight_checks.md

@@ -29,20 +29,19 @@ The expected output should be similar to the one shown below.
 ```console
 $ qliksense preflight dns
 
-Preflight DNS check
----------------------
-Created deployment "dep-dns-preflight-check"
-Created service "svc-dns-pf-check"
-Created pod: pf-pod-1
-Fetching pod: pf-pod-1
-Fetching pod: pf-pod-1
-Exec-ing into the container...
-Preflight DNS check: PASSED
-Completed preflight DNS check
-Cleaning up resources...
-Deleted pod: pf-pod-1
-Deleted service: svc-dns-pf-check
-Deleted deployment: dep-dns-preflight-check
+Creating resources to run preflight checks
+deployment.apps/qnginx001 created
+service/qnginx001 created
+pod/qnginx001-6db5fc95c5-s9sl2 condition met
+  Running Preflight checks ⠇
+--- PASS DNS check
+      --- DNS check passed
+--- PASS   cluster-preflight-checks
+PASS
+
+DNS check completed, cleaning up resources now
+service "qnginx001" deleted
+deployment.extensions "qnginx001" deleted
 
 ```
 
@@ -52,61 +51,16 @@ The command to run this check and the expected similar output are as shown below
 ```console
 $ qliksense preflight k8s-version
 
-Preflight kubernetes minimum version check
-------------------------------------------
-Kubernetes API Server version: v1.15.5
-Current K8s Version: 1.15.5
-Current 1.15.5 is greater than minimum required version:1.11.0, hence good to go
-Preflight minimum kubernetes version check: PASSED
-Completed Preflight kubernetes minimum version check
+Minimum Kubernetes version supported: 1.11.0
+Client Version: version.Info{Major:"1", Minor:"17", GitVersion:"v1.17.3", GitCommit:"06ad960bfd03b39c8310aaf92d1e7c12ce618213", GitTreeState:"clean", BuildDate:"2020-02-13T18:08:14Z", GoVersion:"go1.13.8", Compiler:"gc", Platform:"darwin/amd64"}
+Server Version: version.Info{Major:"1", Minor:"15", GitVersion:"v1.15.5", GitCommit:"20c265fef0741dd71a66480e35bd69f18351daea", GitTreeState:"clean", BuildDate:"2019-10-15T19:07:57Z", GoVersion:"go1.12.10", Compiler:"gc", Platform:"linux/amd64"}
+  Running Preflight checks ⠇
+--- PASS Required Kubernetes Version
+      --- Good to go.
+--- PASS   cluster-preflight-checks
+PASS
 
-```
-
-### Service check
-We use the commmand below to test if we are able to create a service in the cluster.
-```console
-$ qliksense preflight service
-
-Preflight service check
------------------------
-
-Preflight service check: 
-Created service "svc-pf-check"
-Preflight service creation check: PASSED
-Cleaning up resources...
-Deleted service: svc-pf-check
-Completed preflight service check
-```
-
-### Deployment check
-We use the commmand below to test if we are able to create a deployment in the cluster. After the test exexutes, we wait until the created deployment terminates before we exit the command. 
-```console
-$ qliksense preflight deployment
-
-Preflight deployment check
------------------------
-Preflight deployment check: 
-Created deployment "deployment-preflight-check"
-Preflight Deployment check: PASSED
-Cleaning up resources...
-Deleted deployment: deployment-preflight-check
-Completed preflight deployment check
-```
-
-### Pod check
-We use the commmand below to test if we are able to create a pod in the cluster.
-```console
-$ qliksense preflight pod
-
-Preflight pod check
---------------------
-
-Preflight pod check: 
-Created pod: pod-pf-check
-Preflight pod creation check: PASSED
-Cleaning up resources...
-Deleted pod: pod-pf-check
-Completed preflight pod check
+Minimum kubernetes version check completed
 ```
 
 ### Running all checks
@@ -116,31 +70,31 @@ $ qliksense preflight all
 
 Running all preflight checks
 
-Preflight DNS check
--------------------
-Created deployment "dep-dns-preflight-check"
-Created service "svc-dns-pf-check"
-Created pod: pf-pod-1
-Fetching pod: pf-pod-1
-Fetching pod: pf-pod-1
-Exec-ing into the container...
-Preflight DNS check: PASSED
-Completed preflight DNS check
-Cleaning up resources...
-Deleted pod: pf-pod-1
-Deleted service: svc-dns-pf-check
-Deleted deployment: dep-dns-preflight-check
+Running DNS check...
+Creating resources to run preflight checks
+deployment.apps/qnginx001 created
+service/qnginx001 created
+pod/qnginx001-6db5fc95c5-grwv2 condition met
+  Running Preflight checks ⠇
+--- PASS DNS check
+      --- DNS check passed
+--- PASS   cluster-preflight-checks
+PASS
 
-Preflight kubernetes minimum version check
-------------------------------------------
-Kubernetes API Server version: v1.15.5
-Current K8s Version: 1.15.5
-Current 1.15.5 is greater than minimum required version:1.11.0, hence good to go
-Preflight minimum kubernetes version check: PASSED
-Completed Preflight kubernetes minimum version check
-...
-...
-All preflight checks have PASSED
+DNS check completed, cleaning up resources now
+service "qnginx001" deleted
+deployment.extensions "qnginx001" deleted
+
+Running minimum kubernetes version check...
+Minimum Kubernetes version supported: 1.11.0
+Client Version: version.Info{Major:"1", Minor:"17", GitVersion:"v1.17.3", GitCommit:"06ad960bfd03b39c8310aaf92d1e7c12ce618213", GitTreeState:"clean", BuildDate:"2020-02-13T18:08:14Z", GoVersion:"go1.13.8", Compiler:"gc", Platform:"darwin/amd64"}
+Server Version: version.Info{Major:"1", Minor:"15", GitVersion:"v1.15.5", GitCommit:"20c265fef0741dd71a66480e35bd69f18351daea", GitTreeState:"clean", BuildDate:"2019-10-15T19:07:57Z", GoVersion:"go1.12.10", Compiler:"gc", Platform:"linux/amd64"}
+  Running Preflight checks ⠧
+--- PASS Required Kubernetes Version
+      --- Good to go.
+--- PASS   cluster-preflight-checks
+PASS
+
+Minimum kubernetes version check completed
 Completed running all preflight checks
-
 ```

go.mod

@@ -10,13 +10,12 @@ replace (
 	k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48
 	k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51
 
-	sigs.k8s.io/kustomize/api => github.com/qlik-oss/kustomize/api v0.3.3-0.20200402170547-2e8140160c36
+	sigs.k8s.io/kustomize/api => github.com/qlik-oss/kustomize/api v0.3.3-0.20200206224201-2e697eccbad9
 )
 
 require (
 	cloud.google.com/go v0.52.0 // indirect
 	cloud.google.com/go/storage v1.5.0 // indirect
-	github.com/Masterminds/semver/v3 v3.0.3
 	github.com/Shopify/ejson v1.2.1
 	github.com/aws/aws-sdk-go v1.28.9 // indirect
 	github.com/bugsnag/bugsnag-go v1.5.3 // indirect
@@ -42,7 +41,7 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/pkg/errors v0.8.1
-	github.com/qlik-oss/k-apis v0.0.34
+	github.com/qlik-oss/k-apis v0.0.22
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/rogpeppe/go-internal v1.5.2 // indirect
 	github.com/spf13/cobra v0.0.6
@@ -60,7 +59,6 @@ require (
 	k8s.io/api v0.17.0
 	k8s.io/apimachinery v0.17.0
 	k8s.io/client-go v11.0.0+incompatible
-	k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51
 	sigs.k8s.io/kustomize/api v0.3.2
 	sigs.k8s.io/yaml v1.1.0
 )

go.sum

@@ -131,8 +131,6 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 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/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=
-github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 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=
@@ -563,8 +561,6 @@ github.com/hashicorp/go-retryablehttp v0.6.3/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-rootcerts v1.0.1 h1:DMo4fmknnz0E0evoNYnV48RjWndOsmd6OW+09R3cEP8=
 github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
-github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=
-github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
 github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
@@ -572,7 +568,6 @@ github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdv
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0=
 github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
@@ -852,12 +847,10 @@ github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
 github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
 github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/qlik-oss/k-apis v0.0.34 h1:lOC21wz/nNZNmSfTXZSJCOm1BulaZfdg7tAuYb7knAE=
-github.com/qlik-oss/k-apis v0.0.34/go.mod h1:DNiWYqCqPIN216l7+1rccArNIYPb1Le7kYDcPSyNp+Q=
-github.com/qlik-oss/kustomize/api v0.3.3-0.20200401055330-fa528324112a h1:Vzod5XB+e25ENy5Lse0pXNmSYSDFxSEYhH/6Sj7twPg=
-github.com/qlik-oss/kustomize/api v0.3.3-0.20200401055330-fa528324112a/go.mod h1:tSQaDZ4Jt9KwYvD7LlMUPi5nkiGOno3PAKl5/XqEfxs=
-github.com/qlik-oss/kustomize/api v0.3.3-0.20200402170547-2e8140160c36 h1:BuT+cnXPQ6mcOWTDS1S8GXy65LAEMdPuNQCC36rMq28=
-github.com/qlik-oss/kustomize/api v0.3.3-0.20200402170547-2e8140160c36/go.mod h1:tSQaDZ4Jt9KwYvD7LlMUPi5nkiGOno3PAKl5/XqEfxs=
+github.com/qlik-oss/k-apis v0.0.22 h1:tntQEeRqDYkBi2Ku5+xt7ABGMeFPck7+DOKrHUnpzwI=
+github.com/qlik-oss/k-apis v0.0.22/go.mod h1:DNiWYqCqPIN216l7+1rccArNIYPb1Le7kYDcPSyNp+Q=
+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=
@@ -968,7 +961,6 @@ github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVM
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
@@ -1003,8 +995,6 @@ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMx
 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/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/yujunz/go-getter v1.4.1-lite h1:FhvNc94AXMZkfqUwfMKhnQEC9phkphSGdPTL7tIdhOM=
-github.com/yujunz/go-getter v1.4.1-lite/go.mod h1:sbmqxXjyLunH1PkF3n7zSlnVeMvmYUuIl9ZVs/7NyCc=
 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=
 github.com/yvasiyarov/gorelic v0.0.6 h1:qMJQYPNdtJ7UNYHjX38KXZtltKTqimMuoQjNnSVIuJg=

pkg/api/apis.go

@@ -133,17 +133,6 @@ func (qc *QliksenseConfig) GetCRFilePath(contextName string) string {
 	}
 	return crFilePath
 }
-
-func (cr *QliksenseCR) IsRepoExist() bool {
-	if cr.Spec.ManifestsRoot == "" {
-		return false
-	}
-	if _, err := os.Lstat(cr.Spec.ManifestsRoot); err != nil {
-		return false
-	}
-	return true
-}
-
 func (qc *QliksenseConfig) IsRepoExist(contextName, version string) bool {
 	if _, err := os.Lstat(qc.BuildRepoPathForContext(contextName, version)); err != nil {
 		return false
@@ -170,10 +159,10 @@ func (qc *QliksenseConfig) BuildCurrentManifestsRoot(version string) string {
 	return qc.BuildRepoPath(version)
 }
 
-func (qc *QliksenseConfig) WriteCR(cr *QliksenseCR) error {
-	crf := qc.GetCRFilePath(cr.GetName())
+func (qc *QliksenseConfig) WriteCR(cr *QliksenseCR, contextName string) error {
+	crf := qc.GetCRFilePath(contextName)
 	if crf == "" {
-		return errors.New("context name " + cr.GetName() + " not found")
+		return errors.New("context name " + contextName + " not found")
 	}
 
 	return qc.TransformAndWriteCr(cr, crf)
@@ -194,7 +183,7 @@ func (qc *QliksenseConfig) CreateOrWriteCrAndContext(cr *QliksenseCR) error {
 		crf = filepath.Join(cDir, cr.GetName()+".yaml")
 		ctx := Context{
 			Name:   cr.GetName(),
-			CrFile: "contexts/" + cr.GetName() + "/" + cr.GetName() + ".yaml", //filepath.Join("contexts", cr.GetName(), cr.GetName()+".yaml"),
+			CrFile: filepath.Join("contexts", cr.GetName(), cr.GetName()+".yaml"),
 		}
 		qc.AddToContexts(ctx)
 
@@ -209,8 +198,6 @@ func (qc *QliksenseConfig) CreateOrWriteCrAndContext(cr *QliksenseCR) error {
 func (qc *QliksenseConfig) TransformAndWriteCr(cr *QliksenseCR, file string) error {
 	if strings.HasPrefix(cr.Spec.ManifestsRoot, qc.QliksenseHomePath) {
 		cr.Spec.ManifestsRoot = strings.Replace(cr.Spec.ManifestsRoot, qc.QliksenseHomePath+"/", "", 1)
-		cr.Spec.ManifestsRoot = strings.Replace(cr.Spec.ManifestsRoot, qc.QliksenseHomePath+"\\", "", 1)
-		cr.Spec.ManifestsRoot = strings.Replace(cr.Spec.ManifestsRoot, "\\", "/", -1)
 	}
 	if err := WriteToFile(cr, file); err != nil {
 		return err
@@ -227,7 +214,7 @@ func (qc *QliksenseConfig) AddToContexts(ctx Context) error {
 	return nil
 }
 func (qc *QliksenseConfig) WriteCurrentContextCR(cr *QliksenseCR) error {
-	return qc.WriteCR(cr)
+	return qc.WriteCR(cr, qc.Spec.CurrentContext)
 }
 
 func (qc *QliksenseConfig) IsContextExist(ctxName string) bool {

pkg/api/kubectl.go

@@ -98,21 +98,20 @@ func kubectlOperation(manifests string, oprName string, namespace string) error
 	return nil
 }
 
-func KubectlDirectOps(opr []string, namespace string) (string, error) {
+func KubectlDirectOps(opr []string, namespace string) error {
 	arguments := []string{}
 	if namespace != "" {
 		arguments = append(arguments, "-n", namespace)
 	}
 	arguments = append(arguments, opr...)
-	var out bytes.Buffer
+
 	cmd := exec.Command("kubectl", arguments...)
 	LogDebugMessage("Kubectl command: %s %v\n", "kubectl", arguments)
 	sterrBuffer := &bytes.Buffer{}
 	cmd.Stderr = sterrBuffer
-	cmd.Stdout = &out
+	cmd.Stdout = os.Stdout
 	if err := cmd.Run(); err != nil {
-		return "", fmt.Errorf("kubectl %v failed with: %v, %v\n", opr, err, sterrBuffer.String())
+		return fmt.Errorf("kubectl %v failed with: %v, %v\n", opr, err, sterrBuffer.String())
 	}
-	s := out.String()
-	return s, nil
+	return nil
 }

pkg/api/kubectl_test.go

@@ -24,7 +24,7 @@ func TestKubectlDirectOps(t *testing.T) {
 	ns := GetKubectlNamespace()
 	opr := fmt.Sprintf("version")
 	opr1 := strings.Fields(opr)
-	_, err := KubectlDirectOps(opr1, ns)
+	err := KubectlDirectOps(opr1, ns)
 	if err != nil {
 		t.Log(err)
 		t.Fail()

pkg/api/utils.go

@@ -70,7 +70,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,}).(\w{1,})=("*[\w\-?=_/:0-9]+"*)`)
 	for i, arg := range args {
 		LogDebugMessage("Arg received: %s", arg)
 		result := re1.FindStringSubmatch(arg)

pkg/preflight/all_checks.go

@@ -4,58 +4,13 @@ import (
 	"fmt"
 )
 
-func (qp *QliksensePreflight) RunAllPreflightChecks(namespace string, kubeConfigContents []byte) {
-
-	checkCount := 0
-	// Preflight minimum kuberenetes version check
-	fmt.Printf("\nPreflight kubernetes minimum version check\n")
-	fmt.Println("------------------------------------------")
-	if err := qp.CheckK8sVersion(namespace, kubeConfigContents); err != nil {
-		fmt.Printf("Preflight kubernetes minimum version check: FAILED\n")
-	} else {
-		checkCount++
-	}
-
-	// Preflight deployment check
-	fmt.Printf("\nPreflight deployment check\n")
-	fmt.Println("-----------------------")
-	if err := qp.CheckDeployment(namespace, kubeConfigContents); err != nil {
-		fmt.Printf("Preflight deployment check: FAILED\n")
-	} else {
-		checkCount++
-	}
-
-	// Preflight service check
-	fmt.Printf("\nPreflight service check\n")
-	fmt.Println("-----------------------")
-	if err := qp.CheckService(namespace, kubeConfigContents); err != nil {
-		fmt.Printf("Preflight service check: FAILED\n")
-	} else {
-		checkCount++
-	}
-
-	// Preflight pod check
-	fmt.Printf("\nPreflight pod check\n")
-	fmt.Println("-----------------------")
-	if err := qp.CheckPod(namespace, kubeConfigContents); err != nil {
-		fmt.Printf("Preflight pod check: FAILED\n")
-	} else {
-		checkCount++
-	}
-
-	// Preflight DNS check
-	fmt.Printf("\nPreflight DNS check\n")
-	fmt.Println("-------------------")
-	if err := qp.CheckDns(namespace, kubeConfigContents); err != nil {
-		fmt.Printf("Preflight DNS check: FAILED\n")
-	} else {
-		checkCount++
-	}
-
-	if checkCount == 5 {
-		fmt.Printf("\nAll preflight checks have PASSED\n")
-	} else {
-		fmt.Printf("\n1 or more preflight checks have FAILED\n")
-	}
+func (qp *QliksensePreflight) RunAllPreflightChecks() error {
+	//run all preflight checks
+	fmt.Println("Running all preflight checks")
+	fmt.Printf("\nRunning DNS check...\n")
+	qp.CheckDns()
+	fmt.Printf("\nRunning minimum kubernetes version check...\n")
+	qp.CheckK8sVersion()
 	fmt.Println("Completed running all preflight checks")
+	return nil
 }

pkg/preflight/deployability.go

@@ -1,119 +0,0 @@
-package preflight
-
-import (
-	"fmt"
-
-	"k8s.io/client-go/kubernetes"
-)
-
-func (qp *QliksensePreflight) CheckDeployment(namespace string, kubeConfigContents []byte) error {
-	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
-	if err != nil {
-		err = fmt.Errorf("Kube config error: %v\n", err)
-		fmt.Print(err)
-		return err
-	}
-
-	// Deployment check
-	fmt.Printf("Preflight deployment check: \n")
-	err = qp.checkPfDeployment(clientset, namespace, "deployment-preflight-check")
-	if err != nil {
-		fmt.Println("Preflight Deployment check: FAILED")
-		return err
-	}
-	fmt.Println("Completed preflight deployment check")
-
-	return nil
-}
-
-func (qp *QliksensePreflight) CheckService(namespace string, kubeConfigContents []byte) error {
-	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
-	if err != nil {
-		err = fmt.Errorf("error: unable to create a kubernetes client: %v\n", err)
-		fmt.Println(err)
-		return err
-	}
-	// Service check
-	fmt.Printf("\nPreflight service check: \n")
-	err = checkPfService(clientset, namespace)
-	if err != nil {
-		fmt.Println("Preflight Service check: FAILED")
-		return err
-	}
-	fmt.Println("Completed preflight service check")
-	return nil
-}
-
-func (qp *QliksensePreflight) CheckPod(namespace string, kubeConfigContents []byte) error {
-	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
-	if err != nil {
-		err = fmt.Errorf("error: unable to create a kubernetes client: %v\n", err)
-		fmt.Print(err)
-		return err
-	}
-	// Pod check
-	fmt.Printf("\nPreflight pod check: \n")
-
-	err = qp.checkPfPod(clientset, namespace)
-	if err != nil {
-		fmt.Println("Preflight Pod check: FAILED")
-		return err
-	}
-	fmt.Println("Completed preflight pod check")
-	return nil
-}
-
-func (qp *QliksensePreflight) checkPfPod(clientset *kubernetes.Clientset, namespace string) error {
-	// create a pod
-	podName := "pod-pf-check"
-	pod, err := createPreflightTestPod(clientset, namespace, podName, qp.GetPreflightConfigObj().GetImageName(nginx))
-	if err != nil {
-		err = fmt.Errorf("error: unable to create pod %s - %v\n", podName, err)
-		return err
-	}
-	defer deletePod(clientset, namespace, podName)
-
-	if err := waitForPod(clientset, namespace, pod); err != nil {
-		return err
-	}
-
-	fmt.Println("Preflight pod creation check: PASSED")
-	fmt.Println("Cleaning up resources...")
-	return nil
-}
-
-func checkPfService(clientset *kubernetes.Clientset, namespace string) error {
-	// creating service
-	serviceName := "svc-pf-check"
-	pfService, err := createPreflightTestService(clientset, namespace, serviceName)
-	if err != nil {
-		err = fmt.Errorf("error: unable to create service : %s\n", serviceName)
-		return err
-	}
-	defer deleteService(clientset, namespace, serviceName)
-	_, err = getService(clientset, namespace, pfService.GetName())
-	if err != nil {
-		err = fmt.Errorf("error: unable to retrieve service: %s\n", serviceName)
-		return err
-	}
-	fmt.Println("Preflight service creation check: PASSED")
-	fmt.Println("Cleaning up resources...")
-	return nil
-}
-
-func (qp *QliksensePreflight) checkPfDeployment(clientset *kubernetes.Clientset, namespace, depName string) error {
-	// check if we are able to create a deployment
-	// depName :=
-	pfDeployment, err := createPreflightTestDeployment(clientset, namespace, depName, qp.GetPreflightConfigObj().GetImageName(nginx))
-	if err != nil {
-		err = fmt.Errorf("error: unable to create deployment: %v\n", err)
-		return err
-	}
-	defer deleteDeployment(clientset, namespace, depName)
-	if err := waitForDeployment(clientset, namespace, pfDeployment); err != nil {
-		return err
-	}
-	fmt.Println("Preflight Deployment check: PASSED")
-	fmt.Println("Cleaning up resources...")
-	return nil
-}

pkg/preflight/dns_check.go

@@ -1,81 +1,128 @@
 package preflight
 
 import (
+	"bytes"
 	"fmt"
-	"strings"
+	"html/template"
+	"io/ioutil"
+	"path/filepath"
 
 	"github.com/qlik-oss/sense-installer/pkg/api"
 )
 
-const (
-	nginx  = "nginx"
-	netcat = "netcat"
-)
+const dnsCheckYAML = `
+apiVersion: troubleshoot.replicated.com/v1beta1
+kind: Preflight
+metadata:
+  name: cluster-preflight-checks
+  namespace: {{ . }}
+spec:
+  collectors:
+    - run: 
+        collectorName: spin-up-pod
+        args: ["-z", "-v", "-w 1", "qnginx001", "80"]
+        command: ["nc"]
+        image: subfuzion/netcat:latest
+        imagePullPolicy: IfNotPresent
+        name: spin-up-pod-check-dns
+        namespace: {{ . }}
+        timeout: 30s
 
-func (qp *QliksensePreflight) CheckDns(namespace string, kubeConfigContents []byte) error {
-	clientset, clientConfig, err := getK8SClientSet(kubeConfigContents, "")
+  analyzers:
+    - textAnalyze:
+        checkName: DNS check
+        collectorName: spin-up-pod-check-dns
+        fileName: spin-up-pod.txt
+        regex: succeeded
+        outcomes:
+          - fail:
+              message: DNS check failed
+          - pass:
+              message: DNS check passed
+`
+
+func (qp *QliksensePreflight) CheckDns() error {
+	// retrieve namespace
+	namespace := api.GetKubectlNamespace()
+
+	api.LogDebugMessage("Namespace: %s\n", namespace)
+
+	tmpl, err := template.New("dnsCheckYAML").Parse(dnsCheckYAML)
+	if err != nil {
+		fmt.Printf("cannot parse template: %v", err)
+		return err
+	}
+	tempYaml, err := ioutil.TempFile("", "")
+	if err != nil {
+		fmt.Printf("cannot create file: %v", err)
+		return err
+	}
+	api.LogDebugMessage("Temp Yaml file: %s\n", tempYaml.Name())
+
+	b := bytes.Buffer{}
+	err = tmpl.Execute(&b, namespace)
 	if err != nil {
-		err = fmt.Errorf("error: unable to create a kubernetes client: %v\n", err)
 		fmt.Println(err)
 		return err
 	}
 
-	// creating deployment
-	depName := "dep-dns-preflight-check"
-	dnsDeployment, err := createPreflightTestDeployment(clientset, namespace, depName, qp.GetPreflightConfigObj().GetImageName(nginx))
-	if err != nil {
-		err = fmt.Errorf("error: unable to create deployment: %v\n", err)
-		fmt.Println(err)
-		return err
-	}
-	defer deleteDeployment(clientset, namespace, depName)
+	tempYaml.WriteString(b.String())
 
-	if err := waitForDeployment(clientset, namespace, dnsDeployment); err != nil {
-		return err
-	}
+	// creating Kubectl resources
+	appName := "qnginx001"
+	const PreflightChecksDirName = "preflight_checks"
 
-	// creating service
-	serviceName := "svc-dns-pf-check"
-	dnsService, err := createPreflightTestService(clientset, namespace, serviceName)
-	if err != nil {
-		err = fmt.Errorf("error: unable to create service : %s\n", serviceName)
-		return err
-	}
-	defer deleteService(clientset, namespace, serviceName)
+	fmt.Println("Creating resources to run preflight checks")
 
-	// create a pod
-	podName := "pf-pod-1"
-	dnsPod, err := createPreflightTestPod(clientset, namespace, podName, qp.GetPreflightConfigObj().GetImageName(netcat))
+	// kubectl create deployment
+	opr := fmt.Sprintf("create deployment %s --image=nginx", appName)
+	err = initiateK8sOps(opr, namespace)
 	if err != nil {
-		err = fmt.Errorf("error: unable to create pod : %s\n", podName)
-		return err
-	}
-	defer deletePod(clientset, namespace, podName)
-
-	if err := waitForPod(clientset, namespace, dnsPod); err != nil {
-		return err
-	}
-	if len(dnsPod.Spec.Containers) == 0 {
-		err := fmt.Errorf("error: there are no containers in the pod")
-		fmt.Println(err)
-		return err
-	}
-	api.LogDebugMessage("Exec-ing into the container...")
-	stdout, stderr, err := executeRemoteCommand(clientset, clientConfig, dnsPod.Name, dnsPod.Spec.Containers[0].Name, namespace, []string{"nc", "-z", "-v", "-w 1", dnsService.Name, "80"})
-	if err != nil {
-		err = fmt.Errorf("error: unable to execute dns check in the cluster: %v", err)
 		fmt.Println(err)
 		return err
 	}
 
-	if strings.HasSuffix(stdout, "succeeded!") || strings.HasSuffix(stderr, "succeeded!") {
-		fmt.Println("Preflight DNS check: PASSED")
-	} else {
-		fmt.Println("Preflight DNS check: FAILED")
+	defer func() {
+		// Deleting deployment..
+		opr = fmt.Sprintf("delete deployment %s", appName)
+		// we want to delete the k8s resource here, we dont care a lot about an error here
+		_ = initiateK8sOps(opr, namespace)
+		api.LogDebugMessage("delete deployment executed")
+	}()
+
+	// create service
+	opr = fmt.Sprintf("create service clusterip %s --tcp=80:80", appName)
+	err = initiateK8sOps(opr, namespace)
+	if err != nil {
+		fmt.Println(err)
+		return err
 	}
 
-	fmt.Println("Completed preflight DNS check")
-	fmt.Println("Cleaning up resources...")
+	defer func() {
+		// delete service
+		opr = fmt.Sprintf("delete service %s", appName)
+		// we want to delete the k8s resource here, we dont care a lot about an error here
+		_ = initiateK8sOps(opr, namespace)
+		api.LogDebugMessage("delete service executed")
+	}()
 
+	//kubectl -n $namespace wait --for=condition=ready pod -l app=$appName --timeout=120s
+	opr = fmt.Sprintf("wait --for=condition=ready pod -l app=%s --timeout=120s", appName)
+	err = initiateK8sOps(opr, namespace)
+	if err != nil {
+		fmt.Println(err)
+		return err
+	}
+	api.LogDebugMessage("kubectl wait executed")
+
+	// call preflight
+	preflightCommand := filepath.Join(qp.Q.QliksenseHome, PreflightChecksDirName, preflightFileName)
+
+	err = invokePreflight(preflightCommand, tempYaml)
+	if err != nil {
+		fmt.Println(err)
+		return err
+	}
+	fmt.Println("DNS check completed, cleaning up resources now")
 	return nil
 }

pkg/preflight/preflight_apis.go

@@ -1,109 +0,0 @@
-package preflight
-
-import (
-	"os"
-	"path/filepath"
-
-	api "github.com/qlik-oss/sense-installer/pkg/api"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-type PreflightConfig struct {
-	metav1.TypeMeta   `json:",inline" yaml:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
-	Spec              *PreflightSpec `json:"spec" yaml:"spec"`
-	QliksenseHomePath string         `json:"-" yaml:"-"`
-}
-
-type PreflightSpec struct {
-	MinK8sVersion string            `json:"minK8sVersion,omitempty" yaml:"minK8sVersion,omitempty"`
-	Images        map[string]string `json:"images,omitempty" yaml:"images,omitempty"`
-}
-
-//NewPreflightConfigEmpty create empty PreflightConfig object
-func NewPreflightConfigEmpty(qHome string) *PreflightConfig {
-	p := &PreflightConfig{
-		QliksenseHomePath: qHome,
-		TypeMeta: metav1.TypeMeta{
-			APIVersion: "config.qlik.com/v1",
-			Kind:       "PreflightConfig",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name: "PreflightConfigMetadata",
-		},
-		Spec: &PreflightSpec{},
-	}
-	return p
-}
-
-//NewPreflightConfig create empty PreflightConfig object if preflit/preflight-config.yaml not exist
-func NewPreflightConfig(qHome string) *PreflightConfig {
-	p := NewPreflightConfigEmpty(qHome)
-	conFile := p.GetConfigFilePath()
-	if _, err := os.Lstat(conFile); err != nil {
-		return p
-	}
-	p = &PreflightConfig{}
-	if err := api.ReadFromFile(p, conFile); err != nil {
-		return nil
-	}
-	return p
-}
-
-//GetConfigFilePath return preflight-config.yaml file path
-func (p *PreflightConfig) GetConfigFilePath() string {
-	return filepath.Join(p.QliksenseHomePath, "preflight", "preflight-config.yaml")
-}
-
-//Write write PreflightConfig object into the ~/.qliksense/preflight/preflight-config.yaml file
-func (p *PreflightConfig) Write() error {
-	pDir := filepath.Join(p.QliksenseHomePath, "preflight")
-	if err := os.MkdirAll(pDir, os.ModePerm); err != nil {
-		return err
-	}
-	return api.WriteToFile(p, p.GetConfigFilePath())
-}
-
-func (p *PreflightConfig) AddMinK8sV(version string) {
-	if p.Spec == nil {
-		p.Spec = &PreflightSpec{}
-	}
-	p.Spec.MinK8sVersion = version
-}
-
-func (p *PreflightConfig) AddImage(imageFor, imageName string) {
-	if p.Spec.Images == nil {
-		p.Spec.Images = make(map[string]string)
-	}
-	p.Spec.Images[imageFor] = imageName
-}
-
-func (p *PreflightConfig) GetImageName(imageFor string) string {
-	if p.Spec.Images == nil {
-		return ""
-	}
-	return p.Spec.Images[imageFor]
-}
-func (p *PreflightConfig) GetMinK8sVersion() string {
-	return p.Spec.MinK8sVersion
-}
-func (p *PreflightConfig) IsExistOnDisk() bool {
-	if _, err := os.Lstat(p.GetConfigFilePath()); err != nil {
-		return false
-	}
-	return true
-}
-
-func (p *PreflightConfig) GetImageMap() map[string]string {
-	return p.Spec.Images
-}
-
-func (p *PreflightConfig) Initialize() error {
-	if p.IsExistOnDisk() {
-		return nil
-	}
-	p.AddMinK8sV("1.15")
-	p.AddImage("nginx", "nginx")
-	p.AddImage("netcat", "subfuzion/netcat")
-	return p.Write()
-}

pkg/preflight/preflight_apis_test.go

@@ -1,41 +0,0 @@
-package preflight
-
-import (
-	"io/ioutil"
-	"testing"
-
-	api "github.com/qlik-oss/sense-installer/pkg/api"
-)
-
-func Test_Initalize(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "")
-	if err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-	pf := NewPreflightConfig(tempDir)
-	if err := pf.Initialize(); err != nil {
-		t.Log()
-		t.FailNow()
-	}
-	p := &PreflightConfig{
-		QliksenseHomePath: tempDir,
-	}
-	if err := api.ReadFromFile(p, pf.GetConfigFilePath()); err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-	if p.GetMinK8sVersion() != "1.15" {
-		t.Log("expected k8 version: 1.15, but got " + p.GetMinK8sVersion())
-		t.Fail()
-	}
-	p.AddImage("test", "testimage")
-	if err := p.Write(); err != nil {
-		t.Log(err)
-		t.Fail()
-	}
-	p2 := NewPreflightConfig(tempDir)
-	if p2.GetImageName("test") != "testimage" {
-		t.Log("expected image name: testimage, got: " + p2.GetImageName("test"))
-	}
-}

pkg/preflight/preflight_utils.go

@@ -3,75 +3,139 @@ package preflight
 import (
 	"bytes"
 	"fmt"
-	"io"
-	"io/ioutil"
-	"net/url"
+	"log"
+	"os"
+	"os/exec"
 	"path/filepath"
+	"runtime"
 	"strings"
-	"time"
 
-	"github.com/mitchellh/go-homedir"
-
-	"k8s.io/apimachinery/pkg/util/wait"
-
-	"k8s.io/client-go/util/retry"
-
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/client-go/tools/remotecommand"
-	"k8s.io/kubectl/pkg/scheme"
-
-	"github.com/pkg/errors"
-	"github.com/qlik-oss/sense-installer/pkg/api"
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
-	appsv1 "k8s.io/api/apps/v1"
-	apiv1 "k8s.io/api/core/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes"
-	restclient "k8s.io/client-go/rest"
 
-	k8serrors "k8s.io/apimachinery/pkg/api/errors"
+	"github.com/qlik-oss/sense-installer/pkg/api"
 )
 
-var gracePeriod int64 = 0
-
 type QliksensePreflight struct {
 	Q *qliksense.Qliksense
 }
 
-func (qp *QliksensePreflight) GetPreflightConfigObj() *PreflightConfig {
-	return NewPreflightConfig(qp.Q.QliksenseHome)
+const (
+	// preflight releases have the same version
+	preflightRelease       = "v0.9.26"
+	preflightLinuxFile     = "preflight_linux_amd64.tar.gz"
+	preflightMacFile       = "preflight_darwin_amd64.tar.gz"
+	preflightWindowsFile   = "preflight_windows_amd64.zip"
+	PreflightChecksDirName = "preflight_checks"
+	preflightFileName      = "preflight"
+)
+
+var preflightBaseURL = fmt.Sprintf("https://github.com/replicatedhq/troubleshoot/releases/download/%s/", preflightRelease)
+
+func (qp *QliksensePreflight) DownloadPreflight() error {
+	const preflightExecutable = "preflight"
+
+	preflightInstallDir := filepath.Join(qp.Q.QliksenseHome, PreflightChecksDirName)
+	platform := runtime.GOOS
+
+	exists, err := checkInstalled(preflightInstallDir, preflightExecutable)
+	if err != nil {
+		err = fmt.Errorf("There has been an error when trying to determine if preflight installer exists")
+		log.Println(err)
+		return err
+	}
+	if exists {
+		// preflight exist, no need to download again.
+		api.LogDebugMessage("Preflight already exists, proceeding to perform checks")
+		return nil
+	}
+
+	// Create the Preflight-check directory, download and install preflight
+	if !api.DirExists(preflightInstallDir) {
+		api.LogDebugMessage("%s does not exist, creating now\n", preflightInstallDir)
+		if err := os.Mkdir(preflightInstallDir, os.ModePerm); err != nil {
+			err = fmt.Errorf("Not able to create %s dir: %v", preflightInstallDir, err)
+			log.Println(err)
+			return nil
+		}
+	}
+	api.LogDebugMessage("Preflight-checks install Dir: %s exists", preflightInstallDir)
+
+	preflightUrl, preflightFile, err := determinePlatformSpecificUrls(platform)
+	if err != nil {
+		err = fmt.Errorf("There was an error when trying to determine platform specific paths")
+		return err
+	}
+
+	// Download Preflight
+	err = downloadAndExplode(preflightUrl, preflightInstallDir, preflightFile)
+	if err != nil {
+		return err
+	}
+	fmt.Println("Downloaded Preflight")
+
+	return nil
 }
 
-func InitPreflight() (string, []byte, error) {
-	api.LogDebugMessage("Reading .kube/config file...")
+func checkInstalled(preflightInstallDir, preflightExecutable string) (bool, error) {
+	installerExists := true
+	preflightInstaller := filepath.Join(preflightInstallDir, preflightExecutable)
+	if api.DirExists(preflightInstallDir) {
+		if !api.FileExists(preflightInstaller) {
+			installerExists = false
+			api.LogDebugMessage("Preflight install directory exists, but preflight installer does not exist")
+		}
+	} else {
+		installerExists = false
+	}
+	return installerExists, nil
+}
 
-	homeDir, err := homedir.Dir()
+func downloadAndExplode(url, installDir, file string) error {
+	err := api.DownloadFile(url, installDir, file)
 	if err != nil {
-		err = fmt.Errorf("Unable to deduce home dir\n")
-		return "", nil, err
+		return err
 	}
-	api.LogDebugMessage("Kube config location: %s\n\n", filepath.Join(homeDir, ".kube", "config"))
+	api.LogDebugMessage("Downloaded File: %s", file)
 
-	kubeConfig := filepath.Join(homeDir, ".kube", "config")
-	kubeConfigContents, err := ioutil.ReadFile(kubeConfig)
+	fileToUntar := filepath.Join(installDir, file)
+	api.LogDebugMessage("File to explode: %s", file)
+
+	err = api.ExplodePackage(installDir, fileToUntar)
 	if err != nil {
-		err = fmt.Errorf("Unable to deduce home dir\n")
-		return "", nil, err
+		return err
 	}
-	// retrieve namespace
-	namespace := api.GetKubectlNamespace()
-	// if namespace comes back empty, we will run checks in the default namespace
-	if namespace == "" {
-		namespace = "default"
+
+	return nil
+}
+
+func determinePlatformSpecificUrls(platform string) (string, string, error) {
+
+	var preflightUrl, preflightFile string
+
+	if runtime.GOARCH != `amd64` {
+		err := fmt.Errorf("%s architecture is not supported", runtime.GOARCH)
+		return "", "", err
 	}
-	api.LogDebugMessage("Namespace: %s\n", namespace)
-	return namespace, kubeConfigContents, nil
+
+	switch platform {
+	case "windows":
+		preflightFile = preflightWindowsFile
+	case "darwin":
+		preflightFile = preflightMacFile
+	case "linux":
+		preflightFile = preflightLinuxFile
+	default:
+		err := fmt.Errorf("Unable to download the preflight executable for the underlying platform\n")
+		return "", "", err
+	}
+	preflightUrl = fmt.Sprintf("%s%s", preflightBaseURL, preflightFile)
+
+	return preflightUrl, preflightFile, nil
 }
 
 func initiateK8sOps(opr, namespace string) error {
 	opr1 := strings.Fields(opr)
-	_, err := api.KubectlDirectOps(opr1, namespace)
+	err := api.KubectlDirectOps(opr1, namespace)
 	if err != nil {
 		fmt.Println(err)
 		return err
@@ -79,429 +143,45 @@ func initiateK8sOps(opr, namespace string) error {
 	return nil
 }
 
-func int32Ptr(i int32) *int32 { return &i }
+func invokePreflight(preflightCommand string, yamlFile *os.File) error {
+	arguments := []string{}
+	arguments = append(arguments, yamlFile.Name(), "--interactive=false")
+	cmd := exec.Command(preflightCommand, arguments...)
 
-func retryOnError(mf func() error) error {
-	return retry.OnError(wait.Backoff{
-		Duration: 1 * time.Second,
-		Factor:   1,
-		Jitter:   0.1,
-		Steps:    5,
-	}, func(err error) bool {
-		return k8serrors.IsConflict(err) || k8serrors.IsGone(err) || k8serrors.IsServerTimeout(err) ||
-			k8serrors.IsServiceUnavailable(err) || k8serrors.IsTimeout(err) || k8serrors.IsTooManyRequests(err)
-	}, mf)
-}
+	sterrBuffer := &bytes.Buffer{}
+	cmd.Stdout = sterrBuffer
+	cmd.Stderr = sterrBuffer
+	if err := cmd.Run(); err != nil {
+		return fmt.Errorf("Error when running preflight command: %v\n", err)
+	}
+	ind := strings.Index(sterrBuffer.String(), "---")
+	output := sterrBuffer.String()
+	if ind > -1 {
+		output = fmt.Sprintf("%s\n%s", output[:ind], output[ind:])
+	}
+	fmt.Printf("%v\n", output)
 
-func getK8SClientSet(kubeconfig []byte, contextName string) (*kubernetes.Clientset, *rest.Config, error) {
-	var clientConfig *rest.Config
-	var err error
-	if len(kubeconfig) == 0 {
-		clientConfig, err = rest.InClusterConfig()
-		if err != nil {
-			err = errors.Wrap(err, "Unable to load in-cluster kubeconfig")
-			fmt.Println(err)
-			return nil, nil, err
-		}
-	} else {
-		config, err := clientcmd.Load(kubeconfig)
-		if err != nil {
-			err = errors.Wrap(err, "Unable to load kubeconfig")
-			fmt.Println(err)
-			return nil, nil, err
-		}
-		if contextName != "" {
-			config.CurrentContext = contextName
-		}
-		clientConfig, err = clientcmd.NewDefaultClientConfig(*config, &clientcmd.ConfigOverrides{}).ClientConfig()
-		if err != nil {
-			err = errors.Wrap(err, "Unable to create client config from config")
-			fmt.Println(err)
-			return nil, nil, err
-		}
-	}
-	clientset, err := kubernetes.NewForConfig(clientConfig)
-	if err != nil {
-		err = errors.Wrap(err, "Unable to create clientset")
-		fmt.Println(err)
-		return nil, nil, err
-	}
-	return clientset, clientConfig, nil
-}
+	// Maybe good to retain this part in case we need to process the output in future.
+	// We are going to look for the first occurance of PASS or FAIL from the end
+	// there are also some space-like deceiving characters which are being hard to get by
 
-func createPreflightTestDeployment(clientset *kubernetes.Clientset, namespace string, depName string, imageName string) (*appsv1.Deployment, error) {
-	deploymentsClient := clientset.AppsV1().Deployments(namespace)
-	deployment := &appsv1.Deployment{
-		ObjectMeta: v1.ObjectMeta{
-			Name: depName,
-		},
-		Spec: appsv1.DeploymentSpec{
-			Replicas: int32Ptr(1),
-			Selector: &v1.LabelSelector{
-				MatchLabels: map[string]string{
-					"app": "preflight-check",
-				},
-			},
-			Template: apiv1.PodTemplateSpec{
-				ObjectMeta: v1.ObjectMeta{
-					Labels: map[string]string{
-						"app":   "preflight-check",
-						"label": "preflight-check-label",
-					},
-				},
-				Spec: apiv1.PodSpec{
-					Containers: []apiv1.Container{
-						{
-							Name:  "dep",
-							Image: imageName,
-							Ports: []apiv1.ContainerPort{
-								{
-									Name:          "http",
-									Protocol:      apiv1.ProtocolTCP,
-									ContainerPort: 80,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
+	//outputArr := strings.Fields(strings.TrimSpace(output))
+	//trackSuccess := false
+	//trackPrg := false
 
-	// Create Deployment
-	var result *appsv1.Deployment
-	if err := retryOnError(func() (err error) {
-		result, err = deploymentsClient.Create(deployment)
-		return err
-	}); err != nil {
-		err = errors.Wrapf(err, "error: unable to create deployments in the %s namespace", namespace)
-		fmt.Println(err)
-		return nil, err
-	}
-	fmt.Printf("Created deployment %q\n", result.GetObjectMeta().GetName())
+	//for i := len(outputArr) - 1; i >= 0; i-- {
+	//	if strings.TrimSpace(outputArr[i]) != "" {
+	//		if outputArr[i] == "PASS" {
+	//			trackSuccess = true
+	//			trackPrg = true
+	//		} else if outputArr[i] == "FAIL" {
+	//			trackPrg = true
+	//		}
+	//	}
+	//	if trackPrg {
+	//		break
+	//	}
+	//}
 
-	return deployment, nil
-}
-
-func getDeployment(clientset *kubernetes.Clientset, namespace, depName string) (*appsv1.Deployment, error) {
-	deploymentsClient := clientset.AppsV1().Deployments(namespace)
-	var deployment *appsv1.Deployment
-	if err := retryOnError(func() (err error) {
-		deployment, err = deploymentsClient.Get(depName, v1.GetOptions{})
-		return err
-	}); err != nil {
-		err = errors.Wrapf(err, "error: unable to get deployments in the %s namespace", namespace)
-		api.LogDebugMessage("%v\n", err)
-		return nil, err
-	}
-	return deployment, nil
-}
-
-func deleteDeployment(clientset *kubernetes.Clientset, namespace, name string) error {
-	deploymentsClient := clientset.AppsV1().Deployments(namespace)
-	// Create Deployment
-	deletePolicy := v1.DeletePropagationForeground
-	deleteOptions := v1.DeleteOptions{
-		PropagationPolicy:  &deletePolicy,
-		GracePeriodSeconds: &gracePeriod,
-	}
-
-	if err := retryOnError(func() (err error) {
-		return deploymentsClient.Delete(name, &deleteOptions)
-	}); err != nil {
-		fmt.Println(err)
-		return err
-	}
-	if err := waitForDeploymentToDelete(clientset, namespace, name); err != nil {
-		return err
-	}
-	fmt.Printf("Deleted deployment: %s\n", name)
 	return nil
 }
-
-func createPreflightTestService(clientset *kubernetes.Clientset, namespace string, svcName string) (*apiv1.Service, error) {
-	iptr := int32Ptr(80)
-	servicesClient := clientset.CoreV1().Services(namespace)
-	service := &apiv1.Service{
-		ObjectMeta: v1.ObjectMeta{
-			Name:      svcName,
-			Namespace: namespace,
-			Labels: map[string]string{
-				"app": "preflight-check",
-			},
-		},
-		Spec: apiv1.ServiceSpec{
-			Ports: []apiv1.ServicePort{
-				{Name: "port1",
-					Port: *iptr,
-				},
-			},
-			Selector: map[string]string{
-				"app": "preflight-check",
-			},
-			ClusterIP: "",
-		},
-	}
-	var result *apiv1.Service
-	if err := retryOnError(func() (err error) {
-		result, err = servicesClient.Create(service)
-		return err
-	}); err != nil {
-		fmt.Println(err)
-		return nil, err
-	}
-	fmt.Printf("Created service %q\n", result.GetObjectMeta().GetName())
-
-	return service, nil
-}
-
-func getService(clientset *kubernetes.Clientset, namespace, svcName string) (*apiv1.Service, error) {
-	servicesClient := clientset.CoreV1().Services(namespace)
-	var svc *apiv1.Service
-	if err := retryOnError(func() (err error) {
-		svc, err = servicesClient.Get(svcName, v1.GetOptions{})
-		return err
-	}); err != nil {
-		err = errors.Wrapf(err, "unable to get services in the %s namespace", namespace)
-		fmt.Println(err)
-		return nil, err
-	}
-
-	return svc, nil
-}
-
-func deleteService(clientset *kubernetes.Clientset, namespace, name string) error {
-	servicesClient := clientset.CoreV1().Services(namespace)
-	// Create Deployment
-	deletePolicy := v1.DeletePropagationForeground
-	deleteOptions := v1.DeleteOptions{
-		PropagationPolicy: &deletePolicy,
-	}
-	if err := retryOnError(func() (err error) {
-		return servicesClient.Delete(name, &deleteOptions)
-	}); err != nil {
-		fmt.Println(err)
-		return err
-	}
-	fmt.Printf("Deleted service: %s\n", name)
-	return nil
-}
-
-func deletePod(clientset *kubernetes.Clientset, namespace, name string) error {
-
-	podsClient := clientset.CoreV1().Pods(namespace)
-	deletePolicy := v1.DeletePropagationForeground
-	deleteOptions := v1.DeleteOptions{
-		PropagationPolicy:  &deletePolicy,
-		GracePeriodSeconds: &gracePeriod,
-	}
-	if err := retryOnError(func() (err error) {
-		return podsClient.Delete(name, &deleteOptions)
-	}); err != nil {
-		fmt.Println(err)
-		return err
-	}
-	if err := waitForPodToDelete(clientset, namespace, name); err != nil {
-		return err
-	}
-	fmt.Printf("Deleted pod: %s\n", name)
-	return nil
-}
-
-func createPreflightTestPod(clientset *kubernetes.Clientset, namespace string, podName string, imageName string) (*apiv1.Pod, error) {
-	// build the pod definition we want to deploy
-	pod := &apiv1.Pod{
-		ObjectMeta: v1.ObjectMeta{
-			Name:      podName,
-			Namespace: namespace,
-			Labels: map[string]string{
-				"app": "demo",
-			},
-		},
-		Spec: apiv1.PodSpec{
-			Containers: []apiv1.Container{
-				{
-					Name:            "cnt",
-					Image:           imageName,
-					ImagePullPolicy: apiv1.PullIfNotPresent,
-					Command: []string{
-						"sleep",
-						"3600",
-					},
-				},
-			},
-		},
-	}
-
-	// now create the pod in kubernetes cluster using the clientset
-	if err := retryOnError(func() (err error) {
-		pod, err = clientset.CoreV1().Pods(namespace).Create(pod)
-		return err
-	}); err != nil {
-		fmt.Println(err)
-		return nil, err
-	}
-	fmt.Printf("Created pod: %s\n", pod.Name)
-	return pod, nil
-}
-
-func getPod(clientset *kubernetes.Clientset, namespace, podName string) (*apiv1.Pod, error) {
-	api.LogDebugMessage("Fetching pod: %s\n", podName)
-	var pod *apiv1.Pod
-	if err := retryOnError(func() (err error) {
-		pod, err = clientset.CoreV1().Pods(namespace).Get(podName, v1.GetOptions{})
-		return err
-	}); err != nil {
-		api.LogDebugMessage("%v\n", err)
-		return nil, err
-	}
-	return pod, nil
-}
-
-func execute(method string, url *url.URL, config *restclient.Config, stdin io.Reader, stdout, stderr io.Writer, tty bool) error {
-	exec, err := remotecommand.NewSPDYExecutor(config, method, url)
-	if err != nil {
-		return err
-	}
-	return exec.Stream(remotecommand.StreamOptions{
-		Stdin:  stdin,
-		Stdout: stdout,
-		Stderr: stderr,
-		Tty:    tty,
-	})
-}
-
-func executeRemoteCommand(clientset *kubernetes.Clientset, config *rest.Config, podName, containerName, namespace string, command []string) (string, string, error) {
-	tty := false
-	req := clientset.CoreV1().RESTClient().Post().
-		Resource("pods").
-		Name(podName).
-		Namespace(namespace).
-		SubResource("exec").
-		Param("container", containerName)
-	req.VersionedParams(&apiv1.PodExecOptions{
-		Container: containerName,
-		Command:   command,
-		Stdin:     false,
-		Stdout:    true,
-		Stderr:    true,
-		TTY:       tty,
-	}, scheme.ParameterCodec)
-
-	var stdout, stderr bytes.Buffer
-	err := execute("POST", req.URL(), config, nil, &stdout, &stderr, tty)
-	return strings.TrimSpace(stdout.String()), strings.TrimSpace(stderr.String()), err
-}
-
-func waitForDeployment(clientset *kubernetes.Clientset, namespace string, pfDeployment *appsv1.Deployment) error {
-	timeout := time.NewTicker(2 * time.Minute)
-	defer timeout.Stop()
-	var d *appsv1.Deployment
-	var err error
-WAIT:
-	for {
-		d, err = getDeployment(clientset, namespace, pfDeployment.GetName())
-		if err != nil {
-			err = fmt.Errorf("error: unable to retrieve deployment: %s\n", pfDeployment.GetName())
-			fmt.Println(err)
-			return err
-		}
-		select {
-		case <-timeout.C:
-			break WAIT
-		default:
-			if int(d.Status.ReadyReplicas) > 0 {
-				break WAIT
-			}
-		}
-		time.Sleep(5 * time.Second)
-	}
-	if int(d.Status.ReadyReplicas) == 0 {
-		err = fmt.Errorf("error: deployment took longer than expected to spin up pods")
-		fmt.Println(err)
-		return err
-	}
-	return nil
-}
-
-func waitForPod(clientset *kubernetes.Clientset, namespace string, pod *apiv1.Pod) error {
-	var err error
-	if len(pod.Spec.Containers) > 0 {
-		timeout := time.NewTicker(2 * time.Minute)
-		defer timeout.Stop()
-		podName := pod.Name
-	OUT:
-		for {
-			pod, err = getPod(clientset, namespace, podName)
-			if err != nil {
-				err = fmt.Errorf("error: unable to retrieve %s pod by name", podName)
-				fmt.Println(err)
-				return err
-			}
-			select {
-			case <-timeout.C:
-				break OUT
-			default:
-				if len(pod.Status.ContainerStatuses) > 0 && pod.Status.ContainerStatuses[0].Ready {
-					break OUT
-				}
-			}
-			time.Sleep(5 * time.Second)
-		}
-		if len(pod.Status.ContainerStatuses) == 0 || !pod.Status.ContainerStatuses[0].Ready {
-			err = fmt.Errorf("error: container is taking much longer than expected")
-			fmt.Println(err)
-			return err
-		}
-		return nil
-	}
-	err = fmt.Errorf("error: there are no containers in the pod")
-	fmt.Println(err)
-	return err
-}
-
-func waitForPodToDelete(clientset *kubernetes.Clientset, namespace, podName string) error {
-	var err error
-	timeout := time.NewTicker(2 * time.Minute)
-	defer timeout.Stop()
-OUT:
-	for {
-		_, err = getPod(clientset, namespace, podName)
-		if err != nil {
-			return nil
-		}
-		select {
-		case <-timeout.C:
-			break OUT
-		default:
-
-		}
-		time.Sleep(5 * time.Second)
-	}
-	err = fmt.Errorf("error: delete pod is taking unusually long")
-	fmt.Println(err)
-	return err
-}
-
-func waitForDeploymentToDelete(clientset *kubernetes.Clientset, namespace, deploymentName string) error {
-	var err error
-	timeout := time.NewTicker(2 * time.Minute)
-	defer timeout.Stop()
-OUT:
-	for {
-		_, err = getDeployment(clientset, namespace, deploymentName)
-		if err != nil {
-			return nil
-		}
-		select {
-		case <-timeout.C:
-			break OUT
-		default:
-
-		}
-		time.Sleep(5 * time.Second)
-	}
-	err = fmt.Errorf("error: delete deployment is taking unusually long")
-	fmt.Println(err)
-	return err
-}

pkg/preflight/preflight_utils_test.go

@@ -20,7 +20,7 @@ func Test_initiateK8sOps(t *testing.T) {
 			name: "valid case",
 			args: args{
 				opr:       fmt.Sprintf("version"),
-				namespace: "test-ns",
+				namespace: "ash-ns",
 			},
 			wantErr: false,
 		},
@@ -28,7 +28,7 @@ func Test_initiateK8sOps(t *testing.T) {
 			name: "invalid case",
 			args: args{
 				opr:       fmt.Sprintf("versions"),
-				namespace: "test-ns",
+				namespace: "ash-ns",
 			},
 			wantErr: true,
 		},
@@ -41,3 +41,50 @@ func Test_initiateK8sOps(t *testing.T) {
 		})
 	}
 }
+
+func Test_determinePlatformSpecificUrls(t *testing.T) {
+	type args struct {
+		platform string
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    string
+		want1   string
+		wantErr bool
+	}{
+		{
+			name: "valid platform",
+			args: args{
+				platform: "windows",
+			},
+			want:    fmt.Sprintf("%s%s", preflightBaseURL, preflightWindowsFile),
+			want1:   preflightWindowsFile,
+			wantErr: false,
+		},
+		{
+			name: "invalid platform",
+			args: args{
+				platform: "unix",
+			},
+			want:    "",
+			want1:   "",
+			wantErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, got1, err := determinePlatformSpecificUrls(tt.args.platform)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("determinePlatformSpecificUrls() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("determinePlatformSpecificUrls() got = %v, want %v", got, tt.want)
+			}
+			if got1 != tt.want1 {
+				t.Errorf("determinePlatformSpecificUrls() got1 = %v, want %v", got1, tt.want1)
+			}
+		})
+	}
+}

pkg/preflight/role_check.go

@@ -1,12 +0,0 @@
-package preflight
-
-func (qp *QliksensePreflight) CreateRoleCheck(namespace string, kubeConfigContents []byte) error {
-
-	// create service account
-
-	// create role
-
-	// create rolebinding
-
-	return nil
-}

pkg/preflight/version_check.go

@@ -1,56 +1,84 @@
 package preflight
 
 import (
+	"bytes"
 	"fmt"
+	"io/ioutil"
+	"path/filepath"
+	"text/template"
 
-	"github.com/Masterminds/semver/v3"
-	"k8s.io/apimachinery/pkg/version"
+	"github.com/qlik-oss/sense-installer/pkg/api"
 )
 
-func (qp *QliksensePreflight) CheckK8sVersion(namespace string, kubeConfigContents []byte) error {
+const minK8sVersion = "1.11.0"
+const checkVersionYAML = `
+apiVersion: troubleshoot.replicated.com/v1beta1
+kind: Preflight
+metadata:
+  name: cluster-preflight-checks
+  namespace: {{ .namespace }}
+spec:
+  analyzers:
+    - clusterVersion:
+        outcomes:
+          - fail:
+              when: "< {{ .minK8sVersion }}"
+              message: The application requires at least Kubernetes {{ .minK8sVersion }} or later.
+              uri: https://www.kubernetes.io
+          - pass:
+              when: ">= {{ .minK8sVersion }}"
+              message: Good to go.
+`
 
-	var currentVersion *semver.Version
+func (qp *QliksensePreflight) CheckK8sVersion() error {
+	// retrieve namespace
+	namespace := api.GetKubectlNamespace()
 
-	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
+	api.LogDebugMessage("Namespace: %s\n", namespace)
+
+	tmpl, err := template.New("checkVersionYAML").Parse(checkVersionYAML)
 	if err != nil {
-		err = fmt.Errorf("Unable to create clientset: %v\n", err)
+		fmt.Printf("cannot parse template: %v", err)
 		return err
 	}
-	var serverVersion *version.Info
-	if err := retryOnError(func() (err error) {
-		serverVersion, err = clientset.ServerVersion()
-		return err
-	}); err != nil {
-		err = fmt.Errorf("Unable to get server version: %v\n", err)
-		//fmt.Println(err)
+	tempYaml, err := ioutil.TempFile("", "")
+	if err != nil {
+		fmt.Printf("cannot create file: %v", err)
 		return err
 	}
-	fmt.Printf("Kubernetes API Server version: %s\n", serverVersion.String())
+	api.LogDebugMessage("Temp Yaml file: %s\n", tempYaml.Name())
 
-	// Compare K8s version on the cluster with minimum supported k8s version
-	currentVersion, err = semver.NewVersion(serverVersion.String())
+	b := bytes.Buffer{}
+	err = tmpl.Execute(&b, map[string]string{
+		"namespace":     namespace,
+		"minK8sVersion": minK8sVersion,
+	})
 	if err != nil {
-		err = fmt.Errorf("Unable to convert server version into semver version: %v\n", err)
-		//fmt.Println(err)
-		return err
-	}
-	//fmt.Printf("Current K8s Version: %v\n", currentVersion)
-
-	minK8sVersionSemver, err := semver.NewVersion(qp.GetPreflightConfigObj().GetMinK8sVersion())
-	if err != nil {
-		err = fmt.Errorf("Unable to convert minimum Kubernetes version into semver version:%v\n", err)
 		fmt.Println(err)
 		return err
 	}
 
-	if currentVersion.GreaterThan(minK8sVersionSemver) {
-		//fmt.Printf("\n\nCurrent %s Component version: %s is less than minimum required version:%s\n", component, currentComponentVersion, componentVersionFromDependenciesYaml)
-		fmt.Printf("Current %s is greater than minimum required version:%s\n", currentVersion, minK8sVersionSemver)
-		fmt.Println("Preflight minimum kubernetes version check: PASSED")
-	} else {
-		fmt.Printf("Current %s is less than minimum required version:%s\n", currentVersion, minK8sVersionSemver)
-		fmt.Println("Preflight minimum kubernetes version check: FAILED")
+	tempYaml.WriteString(b.String())
+	//api.LogDebugMessage("Temp yaml contents: %s", b.String())
+	fmt.Printf("Minimum Kubernetes version supported: %s\n", minK8sVersion)
+
+	// current kubectl version
+	opr := fmt.Sprintf("version")
+	err = initiateK8sOps(opr, namespace)
+	if err != nil {
+		fmt.Println(err)
+		return err
 	}
-	fmt.Printf("Completed Preflight kubernetes minimum version check\n")
+
+	// call preflight
+	preflightCommand := filepath.Join(qp.Q.QliksenseHome, PreflightChecksDirName, preflightFileName)
+
+	err = invokePreflight(preflightCommand, tempYaml)
+	if err != nil {
+		fmt.Println(err)
+		return err
+	}
+
+	fmt.Println("Minimum kubernetes version check completed")
 	return nil
 }

pkg/qliksense/about.go

@@ -94,7 +94,7 @@ func (q *Qliksense) getConfigDirectory(gitUrl, gitRef, profileEntered string) (d
 	}
 
 	if gitRef != "" {
-		if dir, err = DownloadFromGitRepoToTmpDir(gitUrl, gitRef); err != nil {
+		if dir, err = downloadFromGitRepoToTmpDir(gitUrl, gitRef); err != nil {
 			return "", false, "", err
 		} else {
 			return dir, true, profile, nil
@@ -120,15 +120,14 @@ func (q *Qliksense) getConfigDirectory(gitUrl, gitRef, profileEntered string) (d
 		return dir, false, profile, nil
 	}
 
-	if dir, err = DownloadFromGitRepoToTmpDir(gitUrl, "master"); err != nil {
+	if dir, err = downloadFromGitRepoToTmpDir(gitUrl, "master"); err != nil {
 		return "", false, "", err
 	} else {
 		return dir, true, profile, nil
 	}
 }
 
-//DownloadFromGitRepoToTmpDir download git repo to a temporary directory
-func DownloadFromGitRepoToTmpDir(gitUrl, gitRef string) (string, error) {
+func downloadFromGitRepoToTmpDir(gitUrl, gitRef string) (string, error) {
 	if tmpDir, err := ioutil.TempDir("", ""); err != nil {
 		return "", err
 	} else {

pkg/qliksense/apply.go

@@ -15,29 +15,8 @@ func (q *Qliksense) ApplyCRFromReader(r io.Reader, opts *InstallCommandOptions,
 	if err != nil {
 		return err
 	}
-	if IsQliksenseInstalled(cr.GetName()) {
-		// it is needed in case want to upgrade from one version to another
-		if cr.Spec.ManifestsRoot == "" && cr.Spec.Git == nil {
-			if err := q.FetchQK8s(cr.GetLabelFromCr("version")); err != nil {
-				return err
-			}
-		}
-		return q.UpgradeQK8s(keepPatchFiles)
+	if err := q.InstallQK8s(cr.GetLabelFromCr("version"), opts, keepPatchFiles); err != nil {
+		return err
 	}
-	return q.InstallQK8s(cr.GetLabelFromCr("version"), opts, keepPatchFiles)
-}
-
-func IsQliksenseInstalled(crName string) bool {
-	args := []string{
-		"get",
-		"qliksense",
-		crName,
-		"-ogo-template",
-		`--template='{{ .metadata.name}}'`,
-	}
-	_, err := qapi.KubectlDirectOps(args, "")
-	if err != nil {
-		return false
-	}
-	return true
+	return nil
 }

pkg/qliksense/config.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"os/exec"
 	"path"
 	"path/filepath"
 	"strings"
@@ -89,7 +88,7 @@ func (q *Qliksense) applyConfigToK8s(qcr *qapi.QliksenseCR) error {
 	cr.GeneratePatches(&qcr.KApiCr, path.Join(userHomeDir, ".kube", "config"))
 	// apply generated manifests
 	profilePath := filepath.Join(qcr.Spec.GetManifestsRoot(), qcr.Spec.GetProfileDir())
-	mByte, err := ExecuteKustomizeBuild(profilePath)
+	mByte, err := executeKustomizeBuild(profilePath)
 	if err != nil {
 		fmt.Println("cannot generate manifests for "+profilePath, err)
 		return err
@@ -164,54 +163,3 @@ func (q *Qliksense) getCurrentCrDependentResourceAsString() (string, error) {
 	crString.WriteString("\n---\n")
 	return crString.String(), nil
 }
-
-func (q *Qliksense) EditCR(contextName string) error {
-	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	if contextName == "" {
-		cr, err := qConfig.GetCurrentCR()
-		if err != nil {
-			return err
-		}
-		contextName = cr.GetName()
-	}
-	crFilePath := qConfig.GetCRFilePath(contextName)
-	tempFile, err := ioutil.TempFile("", "*.yaml")
-	if err != nil {
-		return err
-	}
-	crContent, err := ioutil.ReadFile(crFilePath)
-	if err != nil {
-		return err
-	}
-	if err := ioutil.WriteFile(tempFile.Name(), crContent, os.ModePerm); err != nil {
-		return nil
-	}
-	cmd := exec.Command(getKubeEditorTool(), tempFile.Name())
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	err = cmd.Run()
-	if err != nil {
-		return err
-	}
-	newCr, err := qapi.GetCRObject(tempFile.Name())
-	if err != nil {
-		return errors.New("cannot save the cr. Someting wrong in the file format. It is not saved\n" + err.Error())
-	}
-	oldCr, err := qapi.GetCRObject(crFilePath)
-
-	if oldCr.GetName() != newCr.GetName() {
-		return errors.New("cr name cannot be chagned")
-	}
-	if newCr.Validate() {
-		return qConfig.WriteCR(newCr)
-	}
-	return nil
-}
-
-func getKubeEditorTool() string {
-	editor := os.Getenv("KUBE_EDITOR")
-	if editor == "" {
-		editor = "vim"
-	}
-	return editor
-}

pkg/qliksense/confirmation.go

@@ -0,0 +1,24 @@
+package qliksense
+
+import (
+	"fmt"
+	"log"
+	"strings"
+)
+
+func AskForConfirmation(s string) bool {
+	for {
+		fmt.Printf("%s [y/n]: ", s)
+		var response string
+		_, err := fmt.Scanln(&response)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		if strings.EqualFold(response, "y") || strings.EqualFold(response, "yes") {
+			return true
+		} else if strings.EqualFold(response, "n") || strings.EqualFold(response, "no") {
+			return false
+		}
+	}
+}

pkg/qliksense/context_configs.go

@@ -3,18 +3,17 @@ package qliksense
 import (
 	"crypto/rsa"
 	"fmt"
-
-	"github.com/qlik-oss/k-apis/pkg/config"
-	"github.com/robfig/cron/v3"
-
 	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
-	"reflect"
 	"strings"
 	"text/tabwriter"
 
+	"github.com/robfig/cron/v3"
+
+	"github.com/qlik-oss/k-apis/pkg/config"
+
 	b64 "encoding/base64"
 
 	ansi "github.com/mattn/go-colorable"
@@ -40,7 +39,7 @@ const (
 // SetSecrets - set-secrets <key>=<value> commands
 func (q *Qliksense) SetSecrets(args []string, isSecretSet bool) error {
 	qConfig := api.NewQConfig(q.QliksenseHome)
-	qliksenseCR, err := qConfig.GetCurrentCR()
+	qliksenseCR, qliksenseContextsFile, err := retrieveCurrentContextInfo(q)
 	if err != nil {
 		return err
 	}
@@ -62,7 +61,9 @@ func (q *Qliksense) SetSecrets(args []string, isSecretSet bool) error {
 		}
 	}
 	// write modified content into context-yaml
-	return qConfig.WriteCR(qliksenseCR)
+	api.WriteToFile(&qliksenseCR, qliksenseContextsFile)
+
+	return nil
 }
 
 func (q *Qliksense) processSecret(ra *api.ServiceKeyValue, rsaPublicKey *rsa.PublicKey, qliksenseCR *api.QliksenseCR, isSecretSet bool) error {
@@ -130,8 +131,7 @@ func (q *Qliksense) processSecret(ra *api.ServiceKeyValue, rsaPublicKey *rsa.Pub
 // SetConfigs - set-configs <key>=<value> commands
 func (q *Qliksense) SetConfigs(args []string) error {
 	// retieve current context from config.yaml
-	qConfig := api.NewQConfig(q.QliksenseHome)
-	qliksenseCR, err := qConfig.GetCurrentCR()
+	qliksenseCR, qliksenseContextsFile, err := retrieveCurrentContextInfo(q)
 	if err != nil {
 		return err
 	}
@@ -144,66 +144,54 @@ func (q *Qliksense) SetConfigs(args []string) error {
 		qliksenseCR.Spec.AddToConfigs(ra.SvcName, ra.Key, ra.Value)
 	}
 	// write modified content into context.yaml
-	return qConfig.WriteCR(qliksenseCR)
+	api.WriteToFile(&qliksenseCR, qliksenseContextsFile)
+
+	return nil
 }
 
-func caseInsenstiveFieldByName(v reflect.Value, name string) reflect.Value {
-	name = strings.ToLower(name)
-	return v.FieldByNameFunc(func(n string) bool { return strings.ToLower(n) == name })
-}
+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 nil, "", err
+	}
+	currentContext := qliksenseConfig.Spec.CurrentContext
+	api.LogDebugMessage("Current-context from config.yaml: %s", currentContext)
+	if currentContext == "" {
+		// current-context is empty
+		err := fmt.Errorf(`Please run the "qliksense config set-context <context-name>" first before viewing the current context info`)
+		log.Println(err)
+		return nil, "", err
+	}
+	// read the context.yaml file
+	qliksenseCR := &api.QliksenseCR{}
+	if currentContext == "" {
+		// current-context is empty
+		err := fmt.Errorf(`Please run the "qliksense config set-context <context-name>" first before viewing the current context info`)
+		log.Println(err)
+		return nil, "", err
+	}
+	qliksenseContextsFile := filepath.Join(q.QliksenseHome, QliksenseContextsDir, currentContext, currentContext+".yaml")
+	if !api.FileExists(qliksenseContextsFile) {
+		err := fmt.Errorf("Context file does not exist.\nPlease try re-running `qliksense config set-context <context-name>` and then `qliksense config view` again")
+		log.Println(err)
+		return nil, "", err
+	}
+	if err := api.ReadFromFile(qliksenseCR, qliksenseContextsFile); err != nil {
+		log.Println(err)
+		return nil, "", err
+	}
 
-func validateCR(key string, keySub string, value string, crSpec *api.QliksenseCR) (bool, *api.QliksenseCR) {
-	cr := reflect.ValueOf(crSpec.Spec)
-	keyValid := caseInsenstiveFieldByName(reflect.Indirect(cr), key)
-	if !keyValid.IsValid() {
-		//not in main spec
-		fmt.Println(key, "is an invalid key")
-		return false, crSpec
-	} else if keySub == "" {
-		if key == "rotatekeys" {
-			if _, err := validateInput(value); err != nil {
-				return false, crSpec
-			}
-		}
-	}
-	// checks if it is git or gitops
-	if keySub != "" {
-		if !keyValid.IsNil() {
-			if !caseInsenstiveFieldByName(reflect.Indirect(keyValid), keySub).IsValid() {
-				fmt.Println(keySub, "is an invalid key")
-				return false, crSpec
-			} else {
-				// verify gitops enabled and gitops schedule
-				switch keySub {
-				case "schedule":
-					if _, err := cron.ParseStandard(value); err != nil {
-						fmt.Println("Please enter string with standard cron scheduling syntax ")
-						return false, crSpec
-					}
-				case "enabled":
-					if !strings.EqualFold(value, "yes") && !strings.EqualFold(value, "no") {
-						fmt.Println("Please use yes or no for key enabled")
-						return false, crSpec
-					}
-				}
-			}
-		} else {
-			switch key {
-			case "gitops":
-				crSpec.Spec.GitOps = &config.GitOps{}
-			case "git":
-				crSpec.Spec.Git = &config.Repo{}
-			}
-		}
-	}
-	return true, crSpec
+	api.LogDebugMessage("Read context file: %s, Read QliksenseCR: %v", qliksenseContextsFile, qliksenseCR)
+
+	return qliksenseCR, qliksenseContextsFile, nil
 }
 
 // SetOtherConfigs - set profile/storageclassname/git.repository/manifestRoot commands
 func (q *Qliksense) SetOtherConfigs(args []string) error {
 	// retieve current context from config.yaml
-	qConfig := api.NewQConfig(q.QliksenseHome)
-	qliksenseCR, err := qConfig.GetCurrentCR()
+	qliksenseCR, qliksenseContextsFile, err := retrieveCurrentContextInfo(q)
 	if err != nil {
 		return err
 	}
@@ -217,40 +205,72 @@ func (q *Qliksense) SetOtherConfigs(args []string) error {
 
 	for _, arg := range args {
 		argsString := strings.Split(arg, "=")
-		key := strings.ToLower(argsString[0])
-		value := argsString[1]
-		// check if key is for git or gitops (sub objects)
-		keySplit := strings.Split(key, ".")
-		key = keySplit[0]
-		keySub := ""
-
-		if len(keySplit) == 2 {
-			keySub = strings.ToLower(keySplit[1])
-		}
-
-		valid := true
-		valid, qliksenseCR = validateCR(key, keySub, value, qliksenseCR)
-		field := caseInsenstiveFieldByName(reflect.Indirect(reflect.ValueOf(qliksenseCR.Spec)), key)
-		if !valid {
+		switch argsString[0] {
+		case "profile":
+			qliksenseCR.Spec.Profile = argsString[1]
+			api.LogDebugMessage("Current profile after modification: %s ", qliksenseCR.Spec.Profile)
+		case "git.repository":
+			if qliksenseCR.Spec.Git == nil {
+				qliksenseCR.Spec.Git = &config.Repo{}
+			}
+			qliksenseCR.Spec.Git.Repository = argsString[1]
+			api.LogDebugMessage("Current git repository after modification: %s ", qliksenseCR.Spec.Git.Repository)
+		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 {
+				return err
+			}
+			qliksenseCR.Spec.RotateKeys = rotateKeys
+			api.LogDebugMessage("Current rotateKeys after modification: %s ", qliksenseCR.Spec.RotateKeys)
+		case "gitops.enabled":
+			if qliksenseCR.Spec.GitOps == nil {
+				qliksenseCR.Spec.GitOps = &config.GitOps{}
+			}
+			if strings.EqualFold(argsString[1], "yes") || strings.EqualFold(argsString[1], "no") {
+				qliksenseCR.Spec.GitOps.Enabled = argsString[1]
+				api.LogDebugMessage("Current gitOps enabled status : %s ", qliksenseCR.Spec.GitOps.Enabled)
+			} else {
+				err := fmt.Errorf("Please use yes or no")
+				log.Println(err)
+				return err
+			}
+		case "gitops.schedule":
+			if qliksenseCR.Spec.GitOps == nil {
+				qliksenseCR.Spec.GitOps = &config.GitOps{}
+			}
+			if _, err := cron.ParseStandard(argsString[1]); err != nil {
+				err := fmt.Errorf("Please enter string with standard cron scheduling syntax ")
+				return err
+			}
+			qliksenseCR.Spec.GitOps.Schedule = argsString[1]
+			api.LogDebugMessage("Current gitOps schedule is : %s ", qliksenseCR.Spec.GitOps.Schedule)
+		case "gitops.watchbranch":
+			if qliksenseCR.Spec.GitOps == nil {
+				qliksenseCR.Spec.GitOps = &config.GitOps{}
+			}
+			qliksenseCR.Spec.GitOps.WatchBranch = argsString[1]
+			api.LogDebugMessage("Current gitOps watchbranch is : %s ", qliksenseCR.Spec.GitOps.WatchBranch)
+		case "gitops.image":
+			if qliksenseCR.Spec.GitOps == nil {
+				qliksenseCR.Spec.GitOps = &config.GitOps{}
+			}
+			qliksenseCR.Spec.GitOps.Image = argsString[1]
+			api.LogDebugMessage("Current gitOps image is : %s ", qliksenseCR.Spec.GitOps.Image)
+		default:
 			err := fmt.Errorf("Please enter one of: profile, storageClassName,rotateKeys, manifestRoot, git.repository or gitops arguments to configure the current context")
+			log.Println(err)
 			return err
-		} else if strings.EqualFold("", keySub) {
-			// set spec for everything excluding git and gitops
-			if field.CanSet() {
-				field.SetString(value)
-			}
-		} else {
-			// set spec for git or gitops
-			subField := caseInsenstiveFieldByName(reflect.Indirect(field), keySub)
-			if subField.CanSet() {
-				subField.SetString(value)
-			}
 		}
-
-		fmt.Println(chalk.Green.Color("Successfully added to Custom Resource Spec"))
 	}
 	// write modified content into context.yaml
-	return qConfig.WriteCR(qliksenseCR)
+	api.WriteToFile(&qliksenseCR, qliksenseContextsFile)
+
+	return nil
 }
 
 // SetContextConfig - set the context for qliksense kubernetes resources to live in
@@ -292,7 +312,7 @@ func (q *Qliksense) ListContextConfigs() error {
 	return nil
 }
 
-func (q *Qliksense) DeleteContextConfig(args []string) error {
+func (q *Qliksense) DeleteContextConfig(args []string, flag bool) error {
 	if len(args) == 1 {
 		qliksenseConfigFile := filepath.Join(q.QliksenseHome, QliksenseConfigFile)
 		var qliksenseConfig api.QliksenseConfig
@@ -334,9 +354,17 @@ func (q *Qliksense) DeleteContextConfig(args []string) error {
 					}
 					newLength := len(qliksenseConfig.Spec.Contexts)
 					if currentLength != newLength {
-						api.WriteToFile(&qliksenseConfig, qliksenseConfigFile)
-						fmt.Fprintln(out, chalk.Yellow.Color(chalk.Underline.TextStyle("Warning: Active resources may still be running in-cluster")))
-						fmt.Fprintln(out, chalk.Green.Color("Successfully deleted context: "), chalk.Bold.TextStyle(args[0]))
+						ans := flag
+						if ans == false {
+							ans = AskForConfirmation("Are You Sure? ")
+						}
+						if ans == true {
+							api.WriteToFile(&qliksenseConfig, qliksenseConfigFile)
+							fmt.Fprintln(out, chalk.Yellow.Color(chalk.Underline.TextStyle("Warning: Active resources may still be running in-cluster")))
+							fmt.Fprintln(out, chalk.Green.Color("Successfully deleted context: "), chalk.Bold.TextStyle(args[0]))
+						} else {
+							return nil
+						}
 					} else {
 						err := fmt.Errorf(chalk.Red.Color("Context not found"))
 						return err
@@ -354,12 +382,6 @@ func (q *Qliksense) DeleteContextConfig(args []string) error {
 
 // SetUpQliksenseDefaultContext - to setup dir structure for default qliksense context
 func (q *Qliksense) SetUpQliksenseDefaultContext() error {
-	if api.FileExists(filepath.Join(q.QliksenseHome, "config.yaml")) {
-		qliksenseConfig := api.NewQConfig(q.QliksenseHome)
-		if qliksenseConfig.IsContextExist(DefaultQliksenseContext) {
-			return nil
-		}
-	}
 	return q.SetUpQliksenseContext(DefaultQliksenseContext)
 }
 
@@ -390,8 +412,7 @@ func (q *Qliksense) SetUpQliksenseContext(contextName string) error {
 	}
 
 	if qliksenseConfig.IsContextExist(contextName) {
-		qliksenseConfig.Spec.CurrentContext = contextName
-		return qliksenseConfig.Write()
+		return nil
 	}
 	qliksenseCR := &api.QliksenseCR{}
 	qliksenseCR.AddCommonConfig(contextName)
@@ -483,7 +504,7 @@ func readTargetfile(targetFile string) ([]byte, error) {
 
 func (q *Qliksense) SetImageRegistry(registry, pushUsername, pushPassword, pullUsername, pullPassword string) error {
 	qConfig := api.NewQConfig(q.QliksenseHome)
-	qliksenseCR, err := qConfig.GetCurrentCR()
+	qliksenseCR, qliksenseContextsFile, err := retrieveCurrentContextInfo(q)
 	if err != nil {
 		return err
 	}
@@ -510,7 +531,7 @@ func (q *Qliksense) SetImageRegistry(registry, pushUsername, pushPassword, pullU
 	}
 
 	qliksenseCR.Spec.AddToConfigs("qliksense", imageRegistryConfigKey, registry)
-	return qConfig.WriteCR(qliksenseCR)
+	return api.WriteToFile(&qliksenseCR, qliksenseContextsFile)
 }
 
 func (q *Qliksense) SetEulaAccepted() error {

pkg/qliksense/context_configs_test.go

@@ -224,8 +224,7 @@ func Test_retrieveCurrentContextInfo(t *testing.T) {
 	q := &Qliksense{
 		QliksenseHome: testDir,
 	}
-	qConfig := api.NewQConfig(q.QliksenseHome)
-	_, err := qConfig.GetCurrentCR()
+	_, _, err := retrieveCurrentContextInfo(q)
 	if err != nil {
 		t.FailNow()
 	}
@@ -328,7 +327,7 @@ func TestSetOtherConfigs(t *testing.T) {
 				q: &Qliksense{
 					QliksenseHome: testDir,
 				},
-				args: []string{"profile=minikube", "rotateKeys=yes", "storageClassName=efs", "gitops.enabled=yes", "gitops.schedule=30 * * * *", "git.repository=master", "git.username=foo", "git.accesstoken=1234"},
+				args: []string{"profile=minikube", "rotateKeys=yes", "storageClassName=efs", "gitops.enabled=yes", "gitops.schedule=30 * * * *"},
 			},
 			wantErr: false,
 		},
@@ -338,7 +337,7 @@ func TestSetOtherConfigs(t *testing.T) {
 				q: &Qliksense{
 					QliksenseHome: testDir,
 				},
-				args: []string{"someconfig=somevalue, gitops.schedule=bar", "gitops.enabled=bar", "git.foo=bar", "rotatekeys=bar"},
+				args: []string{"someconfig=somevalue, gitops.schedule=bar", "gitops.enabled=bar"},
 			},
 			wantErr: true,
 		},
@@ -929,9 +928,10 @@ func TestDeleteContexts(t *testing.T) {
 			q := New(tt.args.qlikSenseHome)
 			var arg []string
 			arg = append(arg, tt.args.contextName)
-			if err := q.DeleteContextConfig(arg); (err != nil) != tt.wantErr {
+			if err := q.DeleteContextConfig(arg, true); (err != nil) != tt.wantErr {
 				t.Errorf("DeleteContext() error = %v, wantErr %v", err, tt.wantErr)
 			}
+
 		})
 	}
 

pkg/qliksense/crds.go

@@ -59,13 +59,13 @@ func getQliksenseInitCrd(qcr *qapi.QliksenseCR) (string, error) {
 	if qcr.Spec.GetManifestsRoot() != "" {
 		repoPath = qcr.Spec.GetManifestsRoot()
 	} else {
-		if repoPath, err = DownloadFromGitRepoToTmpDir(defaultConfigRepoGitUrl, "master"); err != nil {
+		if repoPath, err = downloadFromGitRepoToTmpDir(defaultConfigRepoGitUrl, "master"); err != nil {
 			return "", err
 		}
 	}
 
 	qInitMsPath := filepath.Join(repoPath, Q_INIT_CRD_PATH)
-	qInitByte, err := ExecuteKustomizeBuild(qInitMsPath)
+	qInitByte, err := executeKustomizeBuild(qInitMsPath)
 	if err != nil {
 		fmt.Println("cannot generate crds for qliksense-init", err)
 		return "", err

pkg/qliksense/crds_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestGetQliksenseInitCrd(t *testing.T) {
-	someTmpRepoPath, err := DownloadFromGitRepoToTmpDir(defaultConfigRepoGitUrl, "master")
+	someTmpRepoPath, err := downloadFromGitRepoToTmpDir(defaultConfigRepoGitUrl, "master")
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}

pkg/qliksense/docker.go

@@ -1,7 +1,6 @@
 package qliksense
 
 import (
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -28,29 +27,6 @@ const (
 	imageSharedBlobsDirName = "blobs"
 )
 
-func (q *Qliksense) PullImages(version, profile string) error {
-	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	if version != "" {
-		if err := q.FetchQK8s(version); err != nil {
-			return err
-		}
-	}
-	qcr, err := qConfig.GetCurrentCR()
-	if err != nil {
-		return err
-	}
-	if !qcr.IsRepoExist() {
-		return errors.New("ManifestsRoot not found")
-	}
-	if profile != "" {
-		qcr.Spec.Profile = profile
-		if e := qConfig.WriteCR(qcr); e != nil {
-			return e
-		}
-	}
-	return q.PullImagesForCurrentCR()
-}
-
 // PullImages ...
 func (q *Qliksense) PullImagesForCurrentCR() error {
 	qConfig := qapi.NewQConfig(q.QliksenseHome)

pkg/qliksense/get_installable_versions.go

@@ -24,7 +24,7 @@ func (q *Qliksense) GetInstallableVersions(opts *LsRemoteCmdOptions) error {
 	if qcr.Spec.GetManifestsRoot() != "" {
 		repoPath = qcr.Spec.GetManifestsRoot()
 	} else {
-		repoPath, err = DownloadFromGitRepoToTmpDir(defaultConfigRepoGitUrl, "master")
+		repoPath, err = downloadFromGitRepoToTmpDir(defaultConfigRepoGitUrl, "master")
 		if err != nil {
 			return err
 		}

pkg/qliksense/install.go

@@ -94,11 +94,10 @@ func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions, kee
 			return q.applyCR(dcr)
 		}
 	}
-	if version == "" {
-		version = qcr.GetLabelFromCr("version")
-	}
-	if err := fetchAndUpdateCR(qConfig, version); err != nil {
-		return err
+	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()

pkg/qliksense/kuz.go

@@ -1,10 +1,8 @@
 package qliksense
 
 import (
-	"bufio"
 	"log"
 	"os"
-	"strings"
 
 	"github.com/qlik-oss/sense-installer/pkg/api"
 
@@ -15,8 +13,7 @@ import (
 	"sigs.k8s.io/kustomize/api/types"
 )
 
-//ExecuteKustomizeBuild execute kustomize to the directory and return manifest as byte array
-func ExecuteKustomizeBuild(directory string) ([]byte, error) {
+func executeKustomizeBuild(directory string) ([]byte, error) {
 	return executeKustomizeBuildForFileSystem(directory, filesys.MakeFsOnDisk())
 }
 
@@ -42,26 +39,10 @@ func executeKustomizeBuildForFileSystem(directory string, fSys filesys.FileSyste
 
 func executeKustomizeBuildWithStdoutProgress(path string) (kuzManifest []byte, err error) {
 	result, err := api.ExecuteTaskWithBlinkingStdoutFeedback(func() (interface{}, error) {
-		return ExecuteKustomizeBuild(path)
+		return executeKustomizeBuild(path)
 	}, "...")
 	if err != nil {
 		return nil, err
 	}
 	return result.([]byte), nil
 }
-
-//GetYamlsFromMultiDoc filter yaml docs from multiyaml based on kind
-func GetYamlsFromMultiDoc(multiYaml string, kind string) string {
-	yamlDocs := strings.Split(string(multiYaml), "---")
-	resultDocs := ""
-	for _, doc := range yamlDocs {
-		scanner := bufio.NewScanner(strings.NewReader(doc))
-		for scanner.Scan() {
-			if strings.HasPrefix(scanner.Text(), "kind: "+kind) {
-				resultDocs = resultDocs + "\n---\n" + doc
-				break
-			}
-		}
-	}
-	return resultDocs
-}

pkg/qliksense/kuz_test.go

@@ -20,7 +20,7 @@ import (
 	kapis_git "github.com/qlik-oss/k-apis/pkg/git"
 )
 
-func Test_ExecuteKustomizeBuild(t *testing.T) {
+func Test_executeKustomizeBuild(t *testing.T) {
 	tmpDir, err := ioutil.TempDir("", "")
 	if err != nil {
 		t.Fatalf("unexpected error: %v\n", err)
@@ -41,7 +41,7 @@ configMapGenerator:
 		t.Fatalf("error writing kustomization file to path: %v error: %v\n", kustomizationYamlFilePath, err)
 	}
 
-	result, err := ExecuteKustomizeBuild(tmpDir)
+	result, err := executeKustomizeBuild(tmpDir)
 	if err != nil {
 		t.Fatalf("unexpected kustomize error: %v\n", err)
 	}
@@ -86,7 +86,7 @@ func Test_executeKustomizeBuild_onQlikConfig_regenerateKeys(t *testing.T) {
 
 	generateKeys(cr, "won't-use")
 
-	yamlResources, err := ExecuteKustomizeBuild(path.Join(configPath, "manifests", "base", "resources", "users"))
+	yamlResources, err := executeKustomizeBuild(path.Join(configPath, "manifests", "base", "resources", "users"))
 	if err != nil {
 		t.Fatalf("unexpected kustomize error: %v\n", err)
 	}
@@ -139,97 +139,3 @@ func getEjsonKeyDir(defaultKeyDir string) string {
 	}
 	return ejsonKeyDir
 }
-
-func Test_GetYamlDocKindFromMultiDoc(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "")
-	if err != nil {
-		t.Fatalf("unexpected error: %v\n", err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	kustomizationYamlFilePath := path.Join(tmpDir, "kustomization.yaml")
-	testResFileYamlFilePath := path.Join(tmpDir, "test-file.yaml")
-	kustomizationYaml := `
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- test-file.yaml
-`
-	testYaml := `
-apiVersion: v1
-data:
-  foo: bar
-kind: ConfigMap
-metadata:
-  name: foo-config
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    app: qix-sessions
-    chart: qix-sessions-4.0.10
-    heritage: Helm
-    release: qliksense
-  name: qliksense-qix-sessions
-  namespace: default
-   ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: Role
-metadata:
-  labels:
-    app: chronos
-    chart: chronos-1.5.7
-    heritage: Helm
-    release: qliksense
-  name: qliksense-chronos
-  namespace: default
-  rules:
-  - apiGroups:
-    - ""
-    resources:
-    - endpoints
-    verbs:
-    - get
-    - update
-`
-	err = ioutil.WriteFile(kustomizationYamlFilePath, []byte(kustomizationYaml), os.ModePerm)
-	if err != nil {
-		t.Fatalf("error writing kustomization file to path: %v error: %v\n", kustomizationYamlFilePath, err)
-	}
-	err = ioutil.WriteFile(testResFileYamlFilePath, []byte(testYaml), os.ModePerm)
-	if err != nil {
-		t.Fatalf("error writing test-file to path: %v error: %v\n", testResFileYamlFilePath, err)
-	}
-	result, err := ExecuteKustomizeBuild(tmpDir)
-	if err != nil {
-		t.Fatalf("unexpected kustomize error: %v\n", err)
-	}
-	resultYaml := GetYamlsFromMultiDoc(string(result), "Role")
-
-	expectedK8sYaml := `
----
-
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: Role
-metadata:
-  labels:
-    app: chronos
-    chart: chronos-1.5.7
-    heritage: Helm
-    release: qliksense
-  name: qliksense-chronos
-  namespace: default
-  rules:
-  - apiGroups:
-    - ""
-    resources:
-    - endpoints
-    verbs:
-    - get
-    - update
-`
-	if resultYaml != expectedK8sYaml {
-		t.Fatalf("expected k8s yaml: [%v] but got: [%v]\n", expectedK8sYaml, resultYaml)
-	}
-}

pkg/qliksense/load_cr.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"strings"
+	"os"
 
 	qapi "github.com/qlik-oss/sense-installer/pkg/api"
 )
@@ -41,10 +41,9 @@ func (q *Qliksense) loadCrStringIntoFileSystem(crstr string, overwriteExistingCo
 		if !overwriteExistingContext {
 			return "", errors.New("Context with name: " + cr.GetName() + " already exists. " +
 				"Please delete the existing context first using the delete-context command or specify the --overwrite flag.")
+		} else if err := os.RemoveAll(qConfig.GetContextPath(cr.GetName())); err != nil {
+			return "", err
 		}
-		// else if err := os.RemoveAll(qConfig.GetContextPath(cr.GetName())); err != nil {
-		// 	return "", err
-		// }
 	}
 	if err := qConfig.CreateContextDirs(cr.GetName()); err != nil {
 		return "", err
@@ -70,15 +69,8 @@ func (q *Qliksense) loadCrStringIntoFileSystem(crstr string, overwriteExistingCo
 		}
 	}
 
-	// update manifestsRoot in case already exist
-	if existingCr, err := qConfig.GetCR(cr.GetName()); err == nil {
-		// cr exists, so update the manifestsRoot if version exist
-		newV := cr.GetLabelFromCr("version")
-		if strings.HasSuffix(existingCr.Spec.ManifestsRoot, newV) {
-			cr.Spec.ManifestsRoot = existingCr.Spec.ManifestsRoot
-		}
-	}
 	// write to disk
+
 	if err = qConfig.CreateOrWriteCrAndContext(cr); err != nil {
 		return "", err
 	}

pkg/qliksense/upgrade.go

@@ -28,20 +28,21 @@ func (q *Qliksense) UpgradeQK8s(keepPatchFiles bool) error {
 		return err
 	}
 	qcr.Spec.RotateKeys = "no"
-
-	dcr, err := qConfig.GetDecryptedCr(qcr)
-	if err != nil {
+	if dcr, err := qConfig.GetDecryptedCr(qcr); err != nil {
 		return err
-	}
-	if dcr.Spec.Git != nil && dcr.Spec.Git.Repository != "" {
-		// fetching and applying manifest will be in the operator controller
-		// get decrypted cr
-		return q.applyCR(dcr)
-	}
-	err = q.applyConfigToK8s(dcr)
-	if err != nil {
+	} else if err := q.applyConfigToK8s(dcr); err != nil {
 		fmt.Println("cannot do kubectl apply on manifests")
 		return err
 	}
-	return q.applyCR(dcr)
+
+	fmt.Println("Install operator CR into cluster")
+	r, err := qcr.GetString()
+	if err != nil {
+		return err
+	}
+	if err := qapi.KubectlApply(r, ""); err != nil {
+		fmt.Println("cannot do kubectl apply on operator CR")
+	}
+	return nil
+
 }