Skip to content

Commit 9d46ba7

Browse files
dmitshurgopherbot
authored andcommitted
cmd/coordinator: disable Kubernetes mode in local "dev" mode
Restore the local "dev" mode after the refactor in CL 422956. The development environment doesn't have KubeServices set to anything, so KubeServices.Location() was otherwise panicking. While here, also do fewer things in background of "dev" mode unless appropriate dev flags are turned on. For golang/go#65913. Change-Id: Ib7409c28e39f2dbf98e08a4bcbd21cd45cb81aa1 Reviewed-on: https://go-review.googlesource.com/c/build/+/567496 Reviewed-by: Dmitri Shuralyov <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Michael Knyszek <[email protected]> Auto-Submit: Dmitri Shuralyov <[email protected]>
1 parent b305989 commit 9d46ba7

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

cmd/coordinator/coordinator.go

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -247,16 +247,20 @@ func main() {
247247

248248
gce := pool.NewGCEConfiguration()
249249

250-
goKubeClient, err := gke.NewClient(context.Background(),
251-
gce.BuildEnv().KubeServices.Name,
252-
gce.BuildEnv().KubeServices.Location(),
253-
gke.OptNamespace(gce.BuildEnv().KubeServices.Namespace),
254-
gke.OptProject(gce.BuildEnv().ProjectName),
255-
gke.OptTokenSource(gce.GCPCredentials().TokenSource))
256-
if err != nil {
257-
log.Fatalf("connecting to GKE failed: %v", err)
250+
if gce.BuildEnv().KubeServices.Name != "" {
251+
goKubeClient, err := gke.NewClient(context.Background(),
252+
gce.BuildEnv().KubeServices.Name,
253+
gce.BuildEnv().KubeServices.Location(),
254+
gke.OptNamespace(gce.BuildEnv().KubeServices.Namespace),
255+
gke.OptProject(gce.BuildEnv().ProjectName),
256+
gke.OptTokenSource(gce.GCPCredentials().TokenSource))
257+
if err != nil {
258+
log.Fatalf("connecting to GKE failed: %v", err)
259+
}
260+
go monitorGitMirror(goKubeClient)
261+
} else {
262+
log.Println("Kubernetes services disabled due to empty KubeServices.Name")
258263
}
259-
go monitorGitMirror(goKubeClient)
260264

261265
if *mode == "prod" || (*mode == "dev" && *devEnableEC2) {
262266
// TODO(golang.org/issues/38337) the coordinator will use a package scoped pool
@@ -364,7 +368,9 @@ func main() {
364368
if *mode == "dev" {
365369
// TODO(crawshaw): do more in dev mode
366370
gce.BuildletPool().SetEnabled(*devEnableGCE)
367-
go findWorkLoop()
371+
if *devEnableGCE || *devEnableEC2 {
372+
go findWorkLoop()
373+
}
368374
} else {
369375
go gce.BuildletPool().CleanUpOldVMs()
370376

0 commit comments

Comments
 (0)