epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue with scheduler mutex. Update k8s motd with new kubedashboard

Browse Source 
url
This commit is contained in:
marcos
2017-11-24 00:45:00 -03:00
parent d758c1a303
commit 29ed79d418
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dockerfiles/k8s/motd
View File

@@ -20,9 +20,7 @@
3. (Optional) Initialize kube-dashboard: 3. (Optional) Initialize kube-dashboard:
curl -L -s https://git.io/kube-dashboard | sed 's/targetPort: 9090/targetPort: 9090\n type: LoadBalancer/' | \ curl -L -s https://raw.githubusercontent.com/kubernetes/dashboard/master/src/deploy/recommended/kubernetes-dashboard.yaml | sed 's/targetPort: 8443/targetPort: 8443\n type: LoadBalancer/' | kubectl apply -f -
kubectl apply -f -
The PWK team. The PWK team.

3
scheduler/scheduler.go
View File

@@ -310,10 +310,11 @@ func (s *scheduler) Start() error {
}) })
s.event.On(event.PLAYGROUND_NEW, func(playgroundId string, args ...interface{}) { s.event.On(event.PLAYGROUND_NEW, func(playgroundId string, args ...interface{}) {
s.mx.Lock() s.mx.Lock()
defer s.mx.Unlock()
log.Printf("EVENT: Playground New %s\n", playgroundId) log.Printf("EVENT: Playground New %s\n", playgroundId)
// Don't defer lock as updatePlaygrounds will lock again
s.mx.Unlock()
// We just update all playgrounds we manage to be safe. This is pretty fast anyway and this event should be fairly rare // We just update all playgrounds we manage to be safe. This is pretty fast anyway and this event should be fairly rare
s.updatePlaygrounds() s.updatePlaygrounds()
}) })