fixing typos,etc.

PremiereGlobal · May 15, 2020 · 7ec589a · 7ec589a
1 parent 68b7ada
commit 7ec589a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/pkg/vault/token.go b/pkg/vault/token.go
@@ -20,7 +20,6 @@ func (v *Vault) GetCurrentTokenTTL() (time.Duration, error) {
 		//We have an unexpiring token
 		return 24 * time.Hour, nil
 	}
-	v.log.Debug("Data:", secret.Data)
 	if err != nil {
 		return 0, err
 	}

diff --git a/stimpacks/deploy/docker.go b/stimpacks/deploy/docker.go
@@ -34,23 +34,23 @@ func (d *Deploy) startDeployContainer(instance *Instance) {
 	}
 
 	var envs []string
-	deprecatedHelmVersionSet := false
+	deprecatedHelmVersionSet := ""
 	for _, e := range instance.Spec.EnvironmentVars {
 		if e.Name == "HELM_VERSION" {
 			d.log.Warn("The use of the HELM_VERSION environment variable for specifying Helm versions has been deprecated.  Use the `.spec.tools.helm` configuration for specifying the helm version to use.  See https://github.com/PremiereGlobal/stim/blob/master/docs/DEPLOY.md for more details.")
-			deprecatedHelmVersionSet = true
+			deprecatedHelmVersionSet = e.Value
 		}
 		envs = append(envs, fmt.Sprintf("%s=%s", e.Name, e.Value))
 	}
 
 	if _, ok := instance.Spec.Tools["helm"]; ok {
-		if !deprecatedHelmVersionSet {
+		if deprecatedHelmVersionSet == "" {
 			envs = append(envs, fmt.Sprintf("HELM_VERSION=%s", downloader.GetBaseVersion(instance.Spec.Tools["helm"].Version)))
 		} else {
-			d.log.Warn("Both `spec.tools.helm` and the deprecated HELM_VERSION environment variable are set.  HELM_VERSION is taking precedence")
+			d.log.Warn("Both `spec.tools.helm` and the deprecated HELM_VERSION environment variable are set.  HELM_VERSION of '{}' is taking precedence", deprecatedHelmVersionSet)
 		}
-	} else if !deprecatedHelmVersionSet {
-		d.log.Warn("Auto-detection of Helm v2 versions now deprecated.  Use the `.spec.tools.helm` configuration for specifying the helm version to use. See https://github.com/PremiereGlobal/stim/blob/master/docs/DEPLOY.md for more details.")
+	} else if deprecatedHelmVersionSet == "" {
+		d.log.Warn("Auto-detection of Helm v2 versions is now deprecated.  Use the `.spec.tools.helm` configuration for specifying the helm version to use. See https://github.com/PremiereGlobal/stim/blob/master/docs/DEPLOY.md for more details.")
 		// DEPRECATION: Auto-matching helm version is deprecated and the env variable below should be uncommented
 		// once this feature is removed
 		// envs = append(envs, "HELM_MATCH_SERVER=false")