remove health flags

rancher · Aug 28, 2017 · f30f2a3 · f30f2a3
1 parent cb45242
commit f30f2a3
Showing 1 changed file with 17 additions and 37 deletions.
diff --git a/cmd/run.go b/cmd/run.go
@@ -129,22 +129,6 @@ func RunCommand() cli.Command {
 				Name:  "group-add",
 				Usage: "Add additional groups to join",
 			},
-			cli.StringSliceFlag{
-				Name:  "health-cmd",
-				Usage: "Command to run to check health",
-			},
-			cli.Int64Flag{
-				Name:  "health-interval",
-				Usage: "Time between running the check (ms|s|m|h) (default 0s)",
-			},
-			cli.Int64Flag{
-				Name:  "health-retries",
-				Usage: "Consecutive failures needed to report unhealthy",
-			},
-			cli.Int64Flag{
-				Name:  "health-timeout",
-				Usage: "Maximum time to allow one check to run (ms|s|m|h) (default 0s)",
-			},
 			cli.StringFlag{
 				Name:  "hostname",
 				Usage: "Container host name",
@@ -324,27 +308,23 @@ func serviceRun(ctx *cli.Context) error {
 		CapAdd:      ctx.StringSlice("cap-add"),
 		CapDrop:     ctx.StringSlice("cap-drop"),
 		//CpuSet: ctx.String(""),
-		CgroupParent:   ctx.String("cgroup-parent"),
-		CpuSetMems:     ctx.String("cpuset-mems"),
-		CpuPeriod:      ctx.Int64("cpu-period"),
-		CpuQuota:       ctx.Int64("cpu-quota"),
-		CpuShares:      ctx.Int64("cpu-shares"),
-		Devices:        ctx.StringSlice("device"),
-		Dns:            ctx.StringSlice("dns"),
-		DnsOpt:         ctx.StringSlice("dns-opt"),
-		DnsSearch:      ctx.StringSlice("dns-search"),
-		EntryPoint:     ctx.StringSlice("entrypoint"),
-		Expose:         ctx.StringSlice("expose"),
-		GroupAdd:       ctx.StringSlice("group-add"),
-		HealthCmd:      ctx.StringSlice("health-cmd"),
-		HealthTimeout:  ctx.Int64("health-timeout"),
-		HealthInterval: ctx.Int64("health-interval"),
-		HealthRetries:  ctx.Int64("health-retries"),
-		Hostname:       ctx.String("hostname"),
-		ImageUuid:      "docker:" + ctx.Args()[0],
-		KernelMemory:   ctx.Int64("kernel-memory"),
-		Labels:         map[string]interface{}{},
-		Environment:    map[string]interface{}{},
+		CgroupParent: ctx.String("cgroup-parent"),
+		CpuSetMems:   ctx.String("cpuset-mems"),
+		CpuPeriod:    ctx.Int64("cpu-period"),
+		CpuQuota:     ctx.Int64("cpu-quota"),
+		CpuShares:    ctx.Int64("cpu-shares"),
+		Devices:      ctx.StringSlice("device"),
+		Dns:          ctx.StringSlice("dns"),
+		DnsOpt:       ctx.StringSlice("dns-opt"),
+		DnsSearch:    ctx.StringSlice("dns-search"),
+		EntryPoint:   ctx.StringSlice("entrypoint"),
+		Expose:       ctx.StringSlice("expose"),
+		GroupAdd:     ctx.StringSlice("group-add"),
+		Hostname:     ctx.String("hostname"),
+		ImageUuid:    "docker:" + ctx.Args()[0],
+		KernelMemory: ctx.Int64("kernel-memory"),
+		Labels:       map[string]interface{}{},
+		Environment:  map[string]interface{}{},
 		//LogConfig:
 		Memory:            ctx.Int64("memory"),
 		MemoryReservation: ctx.Int64("memory-reservation"),