Merge pull request #485 from mboersma/fix-hardcoded-namespace

mboersma · web-flow · commit 7fd02cb11317 · 2017-02-15T11:05:17.000-07:00
fix(gitreceive/build.go): watch pods in the appropriate namespace
diff --git a/pkg/gitreceive/build.go b/pkg/gitreceive/build.go
@@ -237,7 +237,7 @@ func build(
 		return fmt.Errorf("creating builder pod (%s)", err)
 	}
 
-	pw := k8s.NewPodWatcher(kubeClient, "deis")
+	pw := k8s.NewPodWatcher(kubeClient, conf.PodNamespace)
 	stopCh := make(chan struct{})
 	defer close(stopCh)
 	go pw.Controller.Run(stopCh)

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ func build(`
`237`	`237`	`return fmt.Errorf("creating builder pod (%s)", err)`
`238`	`238`	`}`
`239`	`239`
`240`		`- pw := k8s.NewPodWatcher(kubeClient, "deis")`
	`240`	`+ pw := k8s.NewPodWatcher(kubeClient, conf.PodNamespace)`
`241`	`241`	`stopCh := make(chan struct{})`
`242`	`242`	`defer close(stopCh)`
`243`	`243`	`go pw.Controller.Run(stopCh)`