Skip to content
This repository was archived by the owner on Sep 5, 2019. It is now read-only.

Remove builder interface, linearize pod creation and watching #464

Merged
knative-prow-robot merged 14 commits into from
Nov 26, 2018
Merged

Remove builder interface, linearize pod creation and watching #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3d3d177
Remove builder interface, linearize pod creation and watching
imjasonh Nov 9, 2018
f223a1c
Remove pkg/buildtest/wait.go
imjasonh Nov 10, 2018
07e746c
Create pods like <build-name>-pod
imjasonh Nov 10, 2018
9cd5948
Remove pkg/controller
imjasonh Nov 10, 2018
4b7ed5f
Improve TestLowTimeout, still needs work
imjasonh Nov 10, 2018
e57ea66
Move BuildStatusFromPod to resources pkg
imjasonh Nov 10, 2018
eb02e12
Skip statuses for multiple sources; add tests for BuildStatusFromPod
imjasonh Nov 10, 2018
afd2d71
Lower timeout, log more
imjasonh Nov 12, 2018
d70091c
pass build to isTimeout
imjasonh Nov 12, 2018
3ef7778
Generate unique names for each pod, otherwise conflict; move tests to…
imjasonh Nov 13, 2018
cd5d4db
Sync pod lister before starting controller
imjasonh Nov 13, 2018
0170839
update deps
imjasonh Nov 13, 2018
9061535
Reconcile in response to pod events
imjasonh Nov 20, 2018
1093277
Remove commented import
imjasonh Nov 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,7 @@

# JetBrains IDE config
.idea

# e2e test cruft
kubernetes.tar.gz
kubernetes/
2 changes: 2 additions & 0 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 10 additions & 15 deletions cmd/controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,15 @@ import (
"log"
"time"

buildclientset "github.com/knative/build/pkg/client/clientset/versioned"
informers "github.com/knative/build/pkg/client/informers/externalversions"
"github.com/knative/build/pkg/reconciler/build"
"github.com/knative/build/pkg/reconciler/buildtemplate"
"github.com/knative/build/pkg/reconciler/clusterbuildtemplate"
cachingclientset "github.com/knative/caching/pkg/client/clientset/versioned"
cachinginformers "github.com/knative/caching/pkg/client/informers/externalversions"
"github.com/knative/pkg/configmap"
"github.com/knative/pkg/controller"
"github.com/knative/pkg/logging"
"github.com/knative/pkg/logging/logkey"
"github.com/knative/pkg/signals"
Expand All @@ -33,17 +39,6 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/clientcmd"

// Uncomment the following line to load the gcp plugin (only required to authenticate against GKE clusters).
// _ "k8s.io/client-go/plugin/pkg/client/auth/gcp"

onclusterbuilder "github.com/knative/build/pkg/builder/cluster"
buildclientset "github.com/knative/build/pkg/client/clientset/versioned"
informers "github.com/knative/build/pkg/client/informers/externalversions"
"github.com/knative/build/pkg/controller"
"github.com/knative/build/pkg/reconciler/build"
"github.com/knative/build/pkg/reconciler/buildtemplate"
"github.com/knative/build/pkg/reconciler/clusterbuildtemplate"
)

const (
Expand Down Expand Up @@ -103,12 +98,11 @@ func main() {
buildTemplateInformer := buildInformerFactory.Build().V1alpha1().BuildTemplates()
clusterBuildTemplateInformer := buildInformerFactory.Build().V1alpha1().ClusterBuildTemplates()
imageInformer := cachingInformerFactory.Caching().V1alpha1().Images()

bldr := onclusterbuilder.NewBuilder(kubeClient, kubeInformerFactory, logger)
podInformer := kubeInformerFactory.Core().V1().Pods()

// Build all of our controllers, with the clients constructed above.
controllers := []controller.Interface{
build.NewController(logger, kubeClient, buildClient, buildInformer, buildTemplateInformer, clusterBuildTemplateInformer, bldr),
controllers := []*controller.Impl{
build.NewController(logger, kubeClient, podInformer, buildClient, buildInformer, buildTemplateInformer, clusterBuildTemplateInformer),
clusterbuildtemplate.NewController(logger, kubeClient, buildClient,
cachingClient, clusterBuildTemplateInformer, imageInformer),
buildtemplate.NewController(logger, kubeClient, buildClient,
Expand All @@ -124,6 +118,7 @@ func main() {
buildTemplateInformer.Informer().HasSynced,
clusterBuildTemplateInformer.Informer().HasSynced,
imageInformer.Informer().HasSynced,
podInformer.Informer().HasSynced,
} {
if ok := cache.WaitForCacheSync(stopCh, synced); !ok {
logger.Fatalf("failed to wait for cache at index %v to sync", i)
Expand Down
Loading