Merge pull request #1170 from humblec/env

Make env also used while naming provisioner.
kubernetes-retired · May 14, 2019 · 88aaa1c · 88aaa1c
2 parents 65ee173 + b984892
commit 88aaa1c
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/gluster/block/cmd/glusterblock-provisioner/glusterblock-provisioner.go b/gluster/block/cmd/glusterblock-provisioner/glusterblock-provisioner.go
@@ -905,12 +905,10 @@ func main() {
 	provName := provisionerName
 	provEnvName := os.Getenv(provisionerNameKey)
 
-	// Precedence is given for ProvisionerNameKey
-	if provEnvName != "" && *id != "" {
+	// Precedence is given for ProvisionerNameKey if both are set
+	if provEnvName != "" && *id != "" || provEnvName != "" {
 		provName = provEnvName
-	}
-
-	if provEnvName == "" && *id != "" {
+	} else if *id != "" {
 		provName = *id
 	}