Skip to content

Commit

Permalink
Merge pull request #203 from rramkumar1/mci-dev
Browse files Browse the repository at this point in the history
Introduce MultiClusterContext as part of ControllerContext
  • Loading branch information
nicksardo authored Apr 12, 2018
2 parents 0d2640c + 3aa7ee3 commit 6c29608
Show file tree
Hide file tree
Showing 149 changed files with 28,511 additions and 3,007 deletions.
70 changes: 63 additions & 7 deletions Gopkg.lock

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

5 changes: 5 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ ignored = ["k8s.io/kubernetes/pkg/api"]
branch = "master"
name = "k8s.io/cluster-registry"

[[constraint]]
branch = "master"
name = "k8s.io/kube-openapi"

[prune]
go-tests = true
unused-packages = true


12 changes: 11 additions & 1 deletion pkg/context/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ import (
corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/record"
crclient "k8s.io/cluster-registry/pkg/client/clientset_generated/clientset"
)

// ControllerContext holds
// ControllerContext holds resources necessary for the general
// workflow of the controller.
type ControllerContext struct {
kubeClient kubernetes.Interface

Expand All @@ -43,6 +45,14 @@ type ControllerContext struct {

// Map of namespace => record.EventRecorder.
recorders map[string]record.EventRecorder

MCContext MultiClusterContext
}

// MultiClusterContext holds resource necessary for MCI mode.
type MultiClusterContext struct {
crClient crclient.Interface
ClusterInformer cache.SharedIndexInformer
}

// NewControllerContext returns a new shared set of informers.
Expand Down
5 changes: 5 additions & 0 deletions vendor/github.com/PuerkitoBio/purell/.gitignore

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

7 changes: 7 additions & 0 deletions vendor/github.com/PuerkitoBio/purell/.travis.yml

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

12 changes: 12 additions & 0 deletions vendor/github.com/PuerkitoBio/purell/LICENSE

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

187 changes: 187 additions & 0 deletions vendor/github.com/PuerkitoBio/purell/README.md

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

Loading

0 comments on commit 6c29608

Please sign in to comment.