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

Migrate to reconciler pattern for Build #446

Merged
merged 8 commits into from
Oct 27, 2018
Merged

Migrate to reconciler pattern for Build #446

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f3e2670
Move controller -> reconciler
imjasonh Oct 20, 2018
7fec5dc
Merge branch 'reconciler' of github.com:ImJasonH/build
imjasonh Oct 26, 2018
0fec331
Merge branch 'master' of github.com:elafros/build
imjasonh Oct 26, 2018
d1525d7
Fix tests
imjasonh Oct 26, 2018
dbfe77a
update-codegen
imjasonh Oct 26, 2018
16550c4
now with updated dep-collector
imjasonh Oct 26, 2018
5ace1de
Reverse IsDone condition
imjasonh Oct 27, 2018
20a76ff
Remove another indentation
imjasonh Oct 27, 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
24 changes: 9 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,6 +21,12 @@ import (
"log"
"time"

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/logging"
"github.com/knative/pkg/logging/logkey"
"github.com/knative/pkg/signals"
"go.uber.org/zap"
"golang.org/x/sync/errgroup"
kubeinformers "k8s.io/client-go/informers"
Expand All @@ -32,20 +38,12 @@ import (
// _ "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"
buildctrl "github.com/knative/build/pkg/controller/build"
"github.com/knative/build/pkg/reconciler/build"
"github.com/knative/build/pkg/reconciler/buildtemplate"
"github.com/knative/build/pkg/reconciler/clusterbuildtemplate"

buildclientset "github.com/knative/build/pkg/client/clientset/versioned"
informers "github.com/knative/build/pkg/client/informers/externalversions"
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/logging"
"github.com/knative/pkg/logging/logkey"
"github.com/knative/pkg/signals"
)

const (
Expand Down Expand Up @@ -110,11 +108,7 @@ func main() {

// Build all of our controllers, with the clients constructed above.
controllers := []controller.Interface{
// TODO(mattmoor): Move the Build controller logic into pkg/reconciler/build
buildctrl.NewController(bldr, kubeClient, buildClient,
kubeInformerFactory, buildInformerFactory, logger),

build.NewController(logger, kubeClient, buildClient, buildInformer),
build.NewController(logger, kubeClient, buildClient, buildInformer, buildTemplateInformer, clusterBuildTemplateInformer, bldr),
clusterbuildtemplate.NewController(logger, kubeClient, buildClient,
cachingClient, clusterBuildTemplateInformer, imageInformer),
buildtemplate.NewController(logger, kubeClient, buildClient,
Expand Down
Loading