Compare commits

..

10 Commits

Author SHA1 Message Date
Ashwathi Shiva
18299540e7 added comment 2020-06-25 16:19:04 -04:00
Ashwathi Shiva
20a57e9e2f Merge branch 'master' into preflight_openssl_verify
# Conflicts:
#	pkg/preflight/verify_ca.go
2020-06-25 16:16:41 -04:00
Ashwathi Shiva
117c3f7380 verify only server cert, not intermediate certs at this point 2020-06-25 16:13:39 -04:00
Ashwathi Shiva
b0ce7b2ed3 doc updates and minor additions 2020-06-24 10:00:18 -04:00
Ashwathi Shiva
7557315483 minor change 2020-06-24 00:13:08 -04:00
Ashwathi Shiva
f2a39dd637 preflight openssl verify included into all preflight checks 2020-06-24 00:03:22 -04:00
Ashwathi Shiva
06c154c630 Merge branch 'master' into preflight_openssl_verify 2020-06-23 23:56:13 -04:00
Ashwathi Shiva
45a2ac07a2 Openssl verify mongodbUrl and DiscoverUrl working 2020-06-23 23:55:04 -04:00
Ashwathi Shiva
ba4c64cf2b retrieve mongourl from CR 2020-06-18 09:05:17 -04:00
Ashwathi Shiva
30e3e189b5 initial commit: qliksense preflight verify-ca-chain 2020-06-18 00:00:53 -04:00
2 changed files with 4 additions and 8 deletions

2
go.mod
View File

@@ -20,7 +20,7 @@ require (
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
github.com/containers/image/v5 v5.29.3
github.com/containers/image/v5 v5.1.0
github.com/docker/go-metrics v0.0.1 // indirect
github.com/go-git/go-git/v5 v5.1.0
github.com/gobuffalo/envy v1.9.0 // indirect

View File

@@ -93,15 +93,11 @@ func getQliksenseInitCrds(qcr *qapi.QliksenseCR) (string, error) {
}
}
qInitMsPath := filepath.Join(repoPath, "manifests", qcr.Spec.Profile, "crds")
qInitMsPath := filepath.Join(repoPath, Q_INIT_CRD_PATH)
if _, err := os.Lstat(qInitMsPath); err != nil {
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")
}
// 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)