Update warning strings for installer

NetApp · Jun 28, 2018 · a0805a4 · a0805a4
1 parent cc391bb
commit a0805a4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/cli/cmd/install.go b/cli/cmd/install.go
@@ -199,8 +199,8 @@ func discoverInstallationEnvironment() error {
 	// Default deployment image to what etcd was built with
 	if etcdImage == "" {
 		etcdImage = tridentconfig.BuildEtcdImage
-	} else if etcdImage != tridentconfig.BuildEtcdImage {
-		log.Warning("The specified etcd image is different than the version Trident is tested with.")
+	} else if !strings.Contains(etcdImage, tridentconfig.BuildEtcdVersion) {
+		log.Warningf("Trident was qualified with etcd %s. You appear to be using a different version.", tridentconfig.BuildEtcdVersion)
 	}
 
 	// Ensure we're on Linux

diff --git a/persistent_store/etcdv2.go b/persistent_store/etcdv2.go
@@ -94,10 +94,7 @@ func (p *EtcdClientV2) checkEtcdVersion() {
 	if comparison, err := buildEtcdVersion.Compare(version.Server); err != nil {
 		log.Errorf("Could not parse etcd version '%s': %v", version.Server, err)
 	} else if comparison != 0 {
-		log.WithFields(log.Fields{
-			"currentEtcdVersion":   version.Server,
-			"preferredEtcdVersion": config.BuildEtcdVersion,
-		}).Warning("The detected etcd version is different than the version Trident is tested with.")
+		log.Warningf("Trident was qualified with etcd %s. You appear to be using a different version.", config.BuildEtcdVersion)
 	} else {
 		log.WithFields(log.Fields{
 			"etcdVersion": version.Server,

diff --git a/persistent_store/etcdv3.go b/persistent_store/etcdv3.go
@@ -146,10 +146,7 @@ func (p *EtcdClientV3) checkEtcdVersion() {
 	if comparison, err := buildEtcdVersion.Compare(status.Version); err != nil {
 		log.Errorf("Could not parse etcd version '%s': %v", status.Version, err)
 	} else if comparison != 0 {
-		log.WithFields(log.Fields{
-			"currentEtcdVersion":   status.Version,
-			"preferredEtcdVersion": config.BuildEtcdVersion,
-		}).Warning("The detected etcd version is different than the version Trident is tested with.")
+		log.Warningf("Trident was qualified with etcd %s. You appear to be using a different version.", config.BuildEtcdVersion)
 	} else {
 		log.WithFields(log.Fields{
 			"etcdVersion": status.Version,