deploy: Allow specifying the stack name.

Signed-off-by: Matthieu Nottale <[email protected]>

Author: Matthieu Nottale

cmd/deploy.go

@@ -29,7 +29,7 @@ then deployed similarly to 'docker stack deploy'.`,
 		if err != nil {
 			return err
 		}
-		return renderer.Deploy(firstOrEmpty(args), deployComposeFiles, deploySettingsFiles, d, deployOrchestrator, deployKubeConfig, deployNamespace)
+		return renderer.Deploy(firstOrEmpty(args), deployComposeFiles, deploySettingsFiles, d, deployStackName, deployOrchestrator, deployKubeConfig, deployNamespace)
 	},
 }
 
@@ -39,6 +39,7 @@ var deployEnv []string
 var deployOrchestrator string
 var deployKubeConfig string
 var deployNamespace string
+var deployStackName string
 
 func init() {
 	rootCmd.AddCommand(deployCmd)
@@ -47,6 +48,7 @@ func init() {
 	deployCmd.Flags().StringVarP(&deployOrchestrator, "orchestrator", "o", "swarm", "Orchestrator to deploy on (swarm, kubernetes)")
 	deployCmd.Flags().StringVarP(&deployKubeConfig, "kubeconfig", "k", "", "kubeconfig file to use")
 	deployCmd.Flags().StringVarP(&deployNamespace, "namespace", "n", "default", "namespace to deploy into")
+	deployCmd.Flags().StringVarP(&deployStackName, "name", "d", "", "stack name (default: app name)")
 	if internal.Experimental == "on" {
 		deployCmd.Flags().StringArrayVarP(&deployComposeFiles, "compose-files", "c", []string{}, "Override Compose files")
 	}

renderer/deploy.go

@@ -15,7 +15,7 @@ import (
 
 // Deploy deploys this app, merging in settings files, other compose files, end env
 func Deploy(appname string, composeFiles []string, settingsFile []string, env map[string]string,
-	orchestrator string, kubeconfig string, namespace string) error {
+	stackName string, orchestrator string, kubeconfig string, namespace string) error {
 	appname, cleanup, err := packager.Extract(appname)
 	if err != nil {
 		return err
@@ -31,10 +31,13 @@ func Deploy(appname string, composeFiles []string, settingsFile []string, env ma
 			Orchestrator: orchestrator,
 		},
 	})
+	if stackName == "" {
+		stackName = utils.AppNameFromDir(appname)
+	}
 	if orchestrator == "swarm" {
 		ctx := context.Background()
 		return swarm.DeployCompose(ctx, cli, rendered, options.Deploy{
-			Namespace: utils.AppNameFromDir(appname),
+			Namespace: stackName,
 		})
 	}
 	// kube mode
@@ -45,5 +48,5 @@ func Deploy(appname string, composeFiles []string, settingsFile []string, env ma
 	if err != nil {
 		return err
 	}
-	return kubernetes.DeployStack(kubeCli, options.Deploy{Namespace: utils.AppNameFromDir(appname)}, rendered)
+	return kubernetes.DeployStack(kubeCli, options.Deploy{Namespace: stackName}, rendered)
 }