Merge pull request #444 from qlik-oss/fix_crds

bkuschel · web-flow · commit 6ab9317638fa · 2020-09-30T10:07:41.000-04:00
Fix crds
diff --git a/pkg/qliksense/crds.go b/pkg/qliksense/crds.go
@@ -93,11 +93,15 @@ func getQliksenseInitCrds(qcr *qapi.QliksenseCR) (string, error) {
 		}
 	}
 
-	qInitMsPath := filepath.Join(repoPath, Q_INIT_CRD_PATH)
+	qInitMsPath := filepath.Join(repoPath, "manifests", qcr.Spec.Profile, "crds")
 	if _, err := os.Lstat(qInitMsPath); err != nil {
-		// older version of qliksense-init used
-		qInitMsPath = filepath.Join(repoPath, "manifests/base/manifests/qliksense-init")
+		qInitMsPath = filepath.Join(repoPath, Q_INIT_CRD_PATH)
+		if _, err := os.Lstat(qInitMsPath); err != nil {
+			// older version of qliksense-init used
+			qInitMsPath = filepath.Join(repoPath, "manifests/base/manifests/qliksense-init")
+		}
 	}
+
 	qInitByte, err := ExecuteKustomizeBuild(qInitMsPath)
 	if err != nil {
 		fmt.Println("cannot generate crds for qliksense-init", err)

Original file line number	Diff line number	Diff line change
`@@ -93,11 +93,15 @@ func getQliksenseInitCrds(qcr *qapi.QliksenseCR) (string, error) {`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`- qInitMsPath := filepath.Join(repoPath, Q_INIT_CRD_PATH)`
	`96`	`+ qInitMsPath := filepath.Join(repoPath, "manifests", qcr.Spec.Profile, "crds")`
`97`	`97`	`if _, err := os.Lstat(qInitMsPath); err != nil {`
`98`		`- // older version of qliksense-init used`
`99`		`- qInitMsPath = filepath.Join(repoPath, "manifests/base/manifests/qliksense-init")`
	`98`	`+ qInitMsPath = filepath.Join(repoPath, Q_INIT_CRD_PATH)`
	`99`	`+ if _, err := os.Lstat(qInitMsPath); err != nil {`
	`100`	`+ // older version of qliksense-init used`
	`101`	`+ qInitMsPath = filepath.Join(repoPath, "manifests/base/manifests/qliksense-init")`
	`102`	`+ }`
`100`	`103`	`}`
	`104`	`+`
`101`	`105`	`qInitByte, err := ExecuteKustomizeBuild(qInitMsPath)`
`102`	`106`	`if err != nil {`
`103`	`107`	`fmt.Println("cannot generate crds for qliksense-init", err)`