Skip to content

Commit bbcb957

Browse files
krancourkrancour
committed
Merge pull request #4203 from krancour/deisctl-scheduler-component-groups
fix(deisctl): collapse component groups
2 parents ee15c14 + 8063e9c commit bbcb957

5 files changed

Lines changed: 74 additions & 80 deletions

File tree

‎deisctl/cmd/cmd.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func startDefaultServices(b backend.Backend, stateless bool, wg *sync.WaitGroup,
179179
b.Start([]string{"publisher"}, wg, out, err)
180180
wg.Wait()
181181

182-
fmt.Fprintln(out, "Routing mesh...")
182+
fmt.Fprintln(out, "Router mesh...")
183183
b.Start([]string{"router@*"}, wg, out, err)
184184
wg.Wait()
185185
}
@@ -213,7 +213,7 @@ func Stop(targets []string, b backend.Backend) error {
213213

214214
func stopDefaultServices(b backend.Backend, stateless bool, wg *sync.WaitGroup, out, err io.Writer) {
215215

216-
fmt.Fprintln(out, "Routing mesh...")
216+
fmt.Fprintln(out, "Router mesh...")
217217
b.Stop([]string{"router@*"}, wg, out, err)
218218
wg.Wait()
219219

@@ -340,7 +340,7 @@ func installDefaultServices(b backend.Backend, stateless bool, wg *sync.WaitGrou
340340
b.Create([]string{"publisher"}, wg, out, err)
341341
wg.Wait()
342342

343-
fmt.Fprintln(out, "Routing mesh...")
343+
fmt.Fprintln(out, "Router mesh...")
344344
b.Create(getRouters(), wg, out, err)
345345
wg.Wait()
346346

@@ -383,7 +383,7 @@ func Uninstall(targets []string, b backend.Backend) error {
383383

384384
func uninstallAllServices(b backend.Backend, stateless bool, wg *sync.WaitGroup, out, err io.Writer) error {
385385

386-
fmt.Fprintln(out, "Routing mesh...")
386+
fmt.Fprintln(out, "Router mesh...")
387387
b.Destroy([]string{"router@*"}, wg, out, err)
388388
wg.Wait()
389389

‎deisctl/cmd/cmd_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ func TestStartSwarm(t *testing.T) {
269269
t.Parallel()
270270

271271
b := backendStub{}
272-
expected := []string{"swarm-node", "swarm-manager"}
272+
expected := []string{"swarm-manager", "swarm-node"}
273273

274274
Start([]string{"swarm"}, &b)
275275

@@ -547,7 +547,7 @@ func TestInstallSwarm(t *testing.T) {
547547
b := backendStub{}
548548
cb := mock.ConfigBackend{}
549549

550-
expected := []string{"swarm-node", "swarm-manager"}
550+
expected := []string{"swarm-manager", "swarm-node"}
551551

552552
Install([]string{"swarm"}, &b, &cb, fakeCheckKeys)
553553

‎deisctl/cmd/k8s.go‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@ import (
1313
func InstallK8s(b backend.Backend) error {
1414
var wg sync.WaitGroup
1515
io.WriteString(Stdout, prettyprint.DeisIfy("Installing K8s..."))
16-
fmt.Fprintln(Stdout, "K8s API Server...")
16+
fmt.Fprintln(Stdout, "K8s control plane...")
1717
b.Create([]string{"kube-apiserver"}, &wg, Stdout, Stderr)
1818
wg.Wait()
19-
fmt.Fprintln(Stdout, "K8s controller and scheduler ...")
2019
b.Create([]string{"kube-controller-manager", "kube-scheduler"}, &wg, Stdout, Stderr)
2120
wg.Wait()
22-
fmt.Fprintln(Stdout, "K8s proxy and kubelet ...")
23-
b.Create([]string{"kube-proxy", "kube-kubelet"}, &wg, Stdout, Stderr)
21+
fmt.Fprintln(Stdout, "K8s data plane...")
22+
b.Create([]string{"kube-kubelet"}, &wg, Stdout, Stderr)
23+
wg.Wait()
24+
fmt.Fprintln(Stdout, "K8s router mesh...")
25+
b.Create([]string{"kube-proxy"}, &wg, Stdout, Stderr)
2426
wg.Wait()
2527
fmt.Fprintln(Stdout, "Done.\n ")
2628
fmt.Fprintln(Stdout, "Please run `deisctl start k8s` to start K8s.")
@@ -31,14 +33,16 @@ func InstallK8s(b backend.Backend) error {
3133
func StartK8s(b backend.Backend) error {
3234
var wg sync.WaitGroup
3335
io.WriteString(Stdout, prettyprint.DeisIfy("Starting K8s..."))
34-
fmt.Fprintln(Stdout, "K8s API Server ...")
36+
fmt.Fprintln(Stdout, "K8s control plane...")
3537
b.Start([]string{"kube-apiserver"}, &wg, Stdout, Stderr)
3638
wg.Wait()
37-
fmt.Fprintln(Stdout, "K8s controller and scheduler ...")
3839
b.Start([]string{"kube-controller-manager", "kube-scheduler"}, &wg, Stdout, Stderr)
3940
wg.Wait()
40-
fmt.Fprintln(Stdout, "K8s proxy and kubelet ...")
41-
b.Start([]string{"kube-proxy", "kube-kubelet"}, &wg, Stdout, Stderr)
41+
fmt.Fprintln(Stdout, "K8s data plane...")
42+
b.Start([]string{"kube-kubelet"}, &wg, Stdout, Stderr)
43+
wg.Wait()
44+
fmt.Fprintln(Stdout, "K8s router mesh...")
45+
b.Start([]string{"kube-proxy"}, &wg, Stdout, Stderr)
4246
wg.Wait()
4347
fmt.Fprintln(Stdout, "Done.\n ")
4448
fmt.Fprintln(Stdout, "Please run `deisctl config controller set schedulerModule=k8s` to use the K8s scheduler.")
@@ -49,13 +53,15 @@ func StartK8s(b backend.Backend) error {
4953
func StopK8s(b backend.Backend) error {
5054
var wg sync.WaitGroup
5155
io.WriteString(Stdout, prettyprint.DeisIfy("Stopping K8s..."))
52-
fmt.Fprintln(Stdout, "K8s proxy and kubelet ...")
53-
b.Stop([]string{"kube-proxy", "kube-kubelet"}, &wg, Stdout, Stderr)
56+
fmt.Fprintln(Stdout, "K8s router mesh...")
57+
b.Stop([]string{"kube-proxy"}, &wg, Stdout, Stderr)
5458
wg.Wait()
55-
fmt.Fprintln(Stdout, "K8s controller and scheduler ...")
59+
fmt.Fprintln(Stdout, "K8s data plane...")
60+
b.Stop([]string{"kube-kubelet"}, &wg, Stdout, Stderr)
61+
wg.Wait()
62+
fmt.Fprintln(Stdout, "K8s control plane...")
5663
b.Stop([]string{"kube-controller-manager", "kube-scheduler"}, &wg, Stdout, Stderr)
5764
wg.Wait()
58-
fmt.Fprintln(Stdout, "K8s API Server ...")
5965
b.Stop([]string{"kube-apiserver"}, &wg, Stdout, Stderr)
6066
wg.Wait()
6167
fmt.Fprintln(Stdout, "Done.\n ")
@@ -65,14 +71,16 @@ func StopK8s(b backend.Backend) error {
6571
//UnInstallK8s uninstall K8s
6672
func UnInstallK8s(b backend.Backend) error {
6773
var wg sync.WaitGroup
68-
io.WriteString(Stdout, prettyprint.DeisIfy("Destroying K8s..."))
69-
fmt.Fprintln(Stdout, "K8s proxy and kubelet ...")
70-
b.Destroy([]string{"kube-proxy", "kube-kubelet"}, &wg, Stdout, Stderr)
74+
io.WriteString(Stdout, prettyprint.DeisIfy("Uninstalling K8s..."))
75+
fmt.Fprintln(Stdout, "K8s router mesh...")
76+
b.Destroy([]string{"kube-proxy"}, &wg, Stdout, Stderr)
77+
wg.Wait()
78+
fmt.Fprintln(Stdout, "K8s data plane...")
79+
b.Destroy([]string{"kube-kubelet"}, &wg, Stdout, Stderr)
7180
wg.Wait()
72-
fmt.Fprintln(Stdout, "K8s controller and scheduler ...")
81+
fmt.Fprintln(Stdout, "K8s control plane...")
7382
b.Destroy([]string{"kube-controller-manager", "kube-scheduler"}, &wg, Stdout, Stderr)
7483
wg.Wait()
75-
fmt.Fprintln(Stdout, "K8s API Server ...")
7684
b.Destroy([]string{"kube-apiserver"}, &wg, Stdout, Stderr)
7785
wg.Wait()
7886
fmt.Fprintln(Stdout, "Done.\n ")

‎deisctl/cmd/mesos.go‎

Lines changed: 23 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -14,68 +14,53 @@ func InstallMesos(b backend.Backend) error {
1414

1515
var wg sync.WaitGroup
1616

17-
io.WriteString(Stdout, prettyprint.DeisIfy("Installing Mesos..."))
17+
io.WriteString(Stdout, prettyprint.DeisIfy("Installing Mesos/Marathon..."))
1818

1919
installMesosServices(b, &wg, Stdout, Stderr)
2020

2121
wg.Wait()
2222

23-
fmt.Fprintln(Stdout, "Done.")
24-
fmt.Fprintln(Stdout, "")
23+
fmt.Fprintln(Stdout, "Done.\n ")
2524
fmt.Fprintln(Stdout, "Please run `deisctl start mesos` to boot up Mesos.")
2625
return nil
2726
}
2827

2928
func installMesosServices(b backend.Backend, wg *sync.WaitGroup, out, err io.Writer) {
3029

31-
fmt.Fprintln(out, "Zookeeper...")
32-
b.Create([]string{"zookeeper"}, wg, out, err)
30+
fmt.Fprintln(out, "Mesos/Marathon control plane...")
31+
b.Create([]string{"zookeeper", "mesos-master"}, wg, out, err)
3332
wg.Wait()
34-
35-
fmt.Fprintln(out, "Mesos Master...")
36-
b.Create([]string{"mesos-master"}, wg, out, err)
33+
b.Create([]string{"mesos-marathon"}, wg, out, err)
3734
wg.Wait()
3835

39-
fmt.Fprintln(out, "Mesos Slave...")
36+
fmt.Fprintln(out, "Mesos/Marathon data plane...")
4037
b.Create([]string{"mesos-slave"}, wg, out, err)
4138
wg.Wait()
42-
43-
fmt.Fprintln(out, "Marathon Framework...")
44-
b.Create([]string{"mesos-marathon"}, wg, out, err)
45-
wg.Wait()
4639
}
4740

4841
// UninstallMesos unloads and uninstalls all Mesos component definitions
4942
func UninstallMesos(b backend.Backend) error {
5043

5144
var wg sync.WaitGroup
5245

53-
io.WriteString(Stdout, prettyprint.DeisIfy("Uninstalling Mesos..."))
46+
io.WriteString(Stdout, prettyprint.DeisIfy("Uninstalling Mesos/Marathon..."))
5447

5548
uninstallMesosServices(b, &wg, Stdout, Stderr)
5649

5750
wg.Wait()
5851

59-
fmt.Fprintln(Stdout, "Done.")
52+
fmt.Fprintln(Stdout, "Done.\n ")
6053
return nil
6154
}
6255

6356
func uninstallMesosServices(b backend.Backend, wg *sync.WaitGroup, out, err io.Writer) error {
6457

65-
fmt.Fprintln(out, "Marathon Framework...")
66-
b.Destroy([]string{"mesos-marathon"}, wg, out, err)
67-
wg.Wait()
68-
69-
fmt.Fprintln(out, "Mesos Slave...")
58+
fmt.Fprintln(out, "Mesos/Marathon data plane...")
7059
b.Destroy([]string{"mesos-slave"}, wg, out, err)
7160
wg.Wait()
7261

73-
fmt.Fprintln(out, "Mesos Master...")
74-
b.Destroy([]string{"mesos-master"}, wg, out, err)
75-
wg.Wait()
76-
77-
fmt.Fprintln(out, "Zookeeper...")
78-
b.Destroy([]string{"zookeeper"}, wg, out, err)
62+
fmt.Fprintln(out, "Mesos/Marathon control plane...")
63+
b.Destroy([]string{"mesos-marathon", "mesos-master", "zookeeper"}, wg, out, err)
7964
wg.Wait()
8065

8166
return nil
@@ -86,34 +71,31 @@ func StartMesos(b backend.Backend) error {
8671

8772
var wg sync.WaitGroup
8873

89-
io.WriteString(Stdout, prettyprint.DeisIfy("Starting Mesos..."))
74+
io.WriteString(Stdout, prettyprint.DeisIfy("Starting Mesos/Marathon..."))
9075

9176
startMesosServices(b, &wg, Stdout, Stderr)
9277

9378
wg.Wait()
9479

95-
fmt.Fprintln(Stdout, "Done.")
96-
fmt.Fprintln(Stdout, "")
80+
fmt.Fprintln(Stdout, "Done.\n ")
9781
fmt.Fprintln(Stdout, "Please use `deisctl config controller set schedulerModule=mesos_marathon`")
9882
return nil
9983
}
10084

10185
func startMesosServices(b backend.Backend, wg *sync.WaitGroup, out, err io.Writer) {
10286

103-
fmt.Fprintln(out, "Zookeeper...")
87+
fmt.Fprintln(out, "Mesos/Marathon control plane...")
10488
b.Start([]string{"zookeeper"}, wg, out, err)
10589
wg.Wait()
106-
107-
fmt.Fprintln(out, "Mesos Master...")
10890
b.Start([]string{"mesos-master"}, wg, out, err)
10991
wg.Wait()
92+
b.Start([]string{"mesos-marathon"}, wg, out, err)
93+
wg.Wait()
11094

111-
fmt.Fprintln(out, "Mesos Slave...")
95+
fmt.Fprintln(out, "Mesos/Marathon data plane...")
11296
b.Start([]string{"mesos-slave"}, wg, out, err)
11397
wg.Wait()
11498

115-
fmt.Fprintln(out, "Marathon Framework...")
116-
b.Start([]string{"mesos-marathon"}, wg, out, err)
11799
wg.Wait()
118100
}
119101

@@ -122,33 +104,28 @@ func StopMesos(b backend.Backend) error {
122104

123105
var wg sync.WaitGroup
124106

125-
io.WriteString(Stdout, prettyprint.DeisIfy("Stopping Mesos..."))
107+
io.WriteString(Stdout, prettyprint.DeisIfy("Stopping Mesos/Marathon..."))
126108

127109
stopMesosServices(b, &wg, Stdout, Stderr)
128110

129111
wg.Wait()
130112

131-
fmt.Fprintln(Stdout, "Done.")
132-
fmt.Fprintln(Stdout, "")
113+
fmt.Fprintln(Stdout, "Done.\n ")
133114
fmt.Fprintln(Stdout, "Please run `deisctl start mesos` to restart Mesos.")
134115
return nil
135116
}
136117

137118
func stopMesosServices(b backend.Backend, wg *sync.WaitGroup, out, err io.Writer) {
138119

139-
fmt.Fprintln(out, "Marathon Framework...")
140-
b.Stop([]string{"mesos-marathon"}, wg, out, err)
141-
wg.Wait()
142-
143-
fmt.Fprintln(out, "Mesos Slave...")
120+
fmt.Fprintln(out, "Mesos/Marathon data plane...")
144121
b.Stop([]string{"mesos-slave"}, wg, out, err)
145122
wg.Wait()
146123

147-
fmt.Fprintln(out, "Mesos Master...")
124+
fmt.Fprintln(out, "Mesos/Marathon control plane...")
125+
b.Stop([]string{"mesos-marathon"}, wg, out, err)
126+
wg.Wait()
148127
b.Stop([]string{"mesos-master"}, wg, out, err)
149128
wg.Wait()
150-
151-
fmt.Fprintln(out, "Zookeeper...")
152129
b.Stop([]string{"zookeeper"}, wg, out, err)
153130
wg.Wait()
154131
}

‎deisctl/cmd/swarm.go‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ import (
1313
func InstallSwarm(b backend.Backend) error {
1414
var wg sync.WaitGroup
1515
io.WriteString(Stdout, prettyprint.DeisIfy("Installing Swarm..."))
16-
fmt.Fprintln(Stdout, "Swarm node and Swarm Manager...")
17-
b.Create([]string{"swarm-node", "swarm-manager"}, &wg, Stdout, Stderr)
16+
fmt.Fprintln(Stdout, "Swarm control plane...")
17+
b.Create([]string{"swarm-manager"}, &wg, Stdout, Stderr)
18+
wg.Wait()
19+
fmt.Fprintln(Stdout, "Swarm data plane...")
20+
b.Create([]string{"swarm-node"}, &wg, Stdout, Stderr)
1821
wg.Wait()
1922
fmt.Fprintln(Stdout, "Done.\n ")
2023
fmt.Fprintln(Stdout, "Please run `deisctl start swarm` to start swarm.")
@@ -25,12 +28,12 @@ func InstallSwarm(b backend.Backend) error {
2528
func StartSwarm(b backend.Backend) error {
2629
var wg sync.WaitGroup
2730
io.WriteString(Stdout, prettyprint.DeisIfy("Starting Swarm..."))
28-
fmt.Fprintln(Stdout, "swarm nodes...")
29-
b.Start([]string{"swarm-node"}, &wg, Stdout, Stderr)
30-
wg.Wait()
31-
fmt.Fprintln(Stdout, "swarm manager...")
31+
fmt.Fprintln(Stdout, "Swarm control plane...")
3232
b.Start([]string{"swarm-manager"}, &wg, Stdout, Stderr)
3333
wg.Wait()
34+
fmt.Fprintln(Stdout, "Swarm data plane...")
35+
b.Start([]string{"swarm-node"}, &wg, Stdout, Stderr)
36+
wg.Wait()
3437
fmt.Fprintln(Stdout, "Done.\n ")
3538
fmt.Fprintln(Stdout, "Please run `deisctl config controller set schedulerModule=swarm` to use the swarm scheduler.")
3639
return nil
@@ -41,8 +44,11 @@ func StopSwarm(b backend.Backend) error {
4144

4245
var wg sync.WaitGroup
4346
io.WriteString(Stdout, prettyprint.DeisIfy("Stopping Swarm..."))
44-
fmt.Fprintln(Stdout, "swarm nodes and swarm manager")
45-
b.Stop([]string{"swarm-node", "swarm-manager"}, &wg, Stdout, Stderr)
47+
fmt.Fprintln(Stdout, "Swarm data plane...")
48+
b.Stop([]string{"swarm-node"}, &wg, Stdout, Stderr)
49+
wg.Wait()
50+
fmt.Fprintln(Stdout, "Swarm control plane...")
51+
b.Stop([]string{"swarm-manager"}, &wg, Stdout, Stderr)
4652
wg.Wait()
4753

4854
fmt.Fprintln(Stdout, "Done.\n ")
@@ -52,9 +58,12 @@ func StopSwarm(b backend.Backend) error {
5258
//UnInstallSwarm uninstall Swarm
5359
func UnInstallSwarm(b backend.Backend) error {
5460
var wg sync.WaitGroup
55-
io.WriteString(Stdout, prettyprint.DeisIfy("Destroying Swarm..."))
56-
fmt.Fprintln(Stdout, "swarm nodes and swarm manager...")
57-
b.Destroy([]string{"swarm-node", "swarm-manager"}, &wg, Stdout, Stderr)
61+
io.WriteString(Stdout, prettyprint.DeisIfy("Uninstalling Swarm..."))
62+
fmt.Fprintln(Stdout, "Swarm data plane...")
63+
b.Destroy([]string{"swarm-node"}, &wg, Stdout, Stderr)
64+
wg.Wait()
65+
fmt.Fprintln(Stdout, "Swarm control plane...")
66+
b.Destroy([]string{"swarm-manager"}, &wg, Stdout, Stderr)
5867
wg.Wait()
5968
fmt.Fprintln(Stdout, "Done.\n ")
6069
return nil

0 commit comments

Comments
 (0)