Compare commits

..

6 Commits

Author SHA1 Message Date
Ashwathi Shiva
4b59b9cbb8 fixed another typo 2020-04-28 16:23:01 -04:00
Ashwathi Shiva
3cb0e08115 Merge branch 'master' into pf_mongo_version 2020-04-28 10:42:21 -04:00
Ashwathi Shiva
0a1f55fef3 fixed typo 2020-04-28 00:20:23 -04:00
Ashwathi Shiva
f98f26bbe7 refactored version 2020-04-27 19:34:47 -04:00
Ashwathi Shiva
aab4987965 mongo minimum version check working 2020-04-27 16:56:26 -04:00
Ashwathi Shiva
0c1360850e Updated docs and display verbose flag in help 2020-04-27 12:12:36 -04:00
2 changed files with 14 additions and 2 deletions

1
go.mod
View File

@@ -51,6 +51,7 @@ require (
golang.org/x/tools v0.0.0-20200312194400-c312e98713c2 // indirect
google.golang.org/genproto v0.0.0-20200128133413-58ce757ed39b // indirect
gopkg.in/yaml.v2 v2.2.8
gopkg.in/yaml.v3 v3.0.0-20190924164351-c8b7dadae555
k8s.io/api v0.17.2
k8s.io/apimachinery v0.17.2
k8s.io/client-go v11.0.0+incompatible

View File

@@ -53,7 +53,9 @@ func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions, kee
}
qConfig.WriteCurrentContextCR(qcr)
if err := applyImagePullSecret(qConfig); err != nil {
//if the docker pull secret exists on disk, install it in the cluster
//if it doesn't exist on disk, remove it in the cluster
if err := installOrRemoveImagePullSecret(qConfig); err != nil {
return err
}
@@ -130,13 +132,22 @@ func (q *Qliksense) getProcessedOperatorControllerString(qcr *qapi.QliksenseCR)
return operatorControllerString, nil
}
func applyImagePullSecret(qConfig *qapi.QliksenseConfig) error {
func installOrRemoveImagePullSecret(qConfig *qapi.QliksenseConfig) error {
if pullDockerConfigJsonSecret, err := qConfig.GetPullDockerConfigJsonSecret(); err == nil {
if dockerConfigJsonSecretYaml, err := pullDockerConfigJsonSecret.ToYaml(""); err != nil {
return err
} else if err := qapi.KubectlApply(string(dockerConfigJsonSecretYaml), ""); err != nil {
return err
}
} else {
deleteDockerConfigJsonSecret := qapi.DockerConfigJsonSecret{
Name: pullSecretName,
}
if deleteDockerConfigJsonSecretYaml, err := deleteDockerConfigJsonSecret.ToYaml(""); err != nil {
return err
} else if err := qapi.KubectlDelete(string(deleteDockerConfigJsonSecretYaml), ""); err != nil {
qapi.LogDebugMessage("failed deleting %v, error: %v\n", pullSecretName, err)
}
}
return nil
}