Merge pull request #7 from WanderaOrg/initializer-cmd

Fixed config conditions, pass through Verbose flag to init containers
wandera · Mar 15, 2018 · 624a9b1 · 624a9b1
2 parents 7379047 + aa3b341
commit 624a9b1
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/config/cmd/initializer.go b/config/cmd/initializer.go
@@ -225,15 +225,15 @@ func calculateDynamicConfig(c *config, a map[string]string, deployment *v1.Deplo
 	var d = dynamicConfig{}
 	var ok bool
 
-	if d.containerName, ok = a[c.AnnotationPrefix+"container-name"]; ok {
+	if d.containerName, ok = a[c.AnnotationPrefix+"container-name"]; !ok {
 		d.containerName = c.DefaultContainerName
 	}
 
-	if d.volumeName, ok = a[c.AnnotationPrefix+"volume-name"]; ok {
+	if d.volumeName, ok = a[c.AnnotationPrefix+"volume-name"]; !ok {
 		d.volumeName = c.DefaultVolumeName
 	}
 
-	if d.volumeMount, ok = a[c.AnnotationPrefix+"volume-mount"]; ok {
+	if d.volumeMount, ok = a[c.AnnotationPrefix+"volume-mount"]; !ok {
 		d.volumeMount = c.DefaultVolumeMount
 	}
 
@@ -277,6 +277,10 @@ func calculateImageArgs(c *config, a map[string]string, deployment *v1.Deploymen
 		application = deployment.Name
 	}
 
+	if Verbose {
+		extra = append(extra, "-v")
+	}
+
 	return append([]string{"get", mode, "--source", source, "--application", application, "--profile", profile, "--label", label}, extra...), nil
 }