use DefValuePerCommand

Author: nkubala

cmd/skaffold/app/cmd/dev.go

@@ -55,9 +55,6 @@ func runDev(ctx context.Context, out io.Writer) error {
 		}()
 	}
 
-	// force skaffold labels to be applied in dev mode - port forwarding and log tailing won't work without them
-	opts.AddSkaffoldLabels = true
-
 	for {
 		select {
 		case <-ctx.Done():

cmd/skaffold/app/cmd/flags.go

@@ -432,10 +432,15 @@ var flagRegistry = []Flag{
 		DefinedOn:     []string{"dev", "debug"},
 	},
 	{
-		Name:          "add-skaffold-labels",
-		Usage:         "Add Skaffold-specific labels to rendered manifest. Custom labels will still be applied. Helpful for GitOps model where Skaffold is not the deployer.",
-		Value:         &opts.AddSkaffoldLabels,
-		DefValue:      false,
+		Name:     "add-skaffold-labels",
+		Usage:    "Add Skaffold-specific labels to rendered manifest. Custom labels will still be applied. Helpful for GitOps model where Skaffold is not the deployer.",
+		Value:    &opts.AddSkaffoldLabels,
+		DefValue: false,
+		DefValuePerCommand: map[string]interface{}{
+			"dev":   true,
+			"debug": true,
+			"run":   true,
+		},
 		FlagAddMethod: "BoolVar",
 		DefinedOn:     []string{"render"},
 		IsEnum:        true,

cmd/skaffold/app/cmd/run.go

@@ -41,9 +41,6 @@ func NewCmdRun() *cobra.Command {
 }
 
 func doRun(ctx context.Context, out io.Writer) error {
-	// force skaffold labels to be applied in run mode - log tailing won't work without them
-	opts.AddSkaffoldLabels = true
-
 	return withRunner(ctx, out, func(r runner.Runner, configs []*latest_v1.SkaffoldConfig) error {
 		bRes, err := r.Build(ctx, out, targetArtifacts(opts, configs))
 		if err != nil {