Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
130 changes: 121 additions & 9 deletions Gopkg.lock

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

13 changes: 13 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ required = [
"k8s.io/code-generator/cmd/client-gen",
"k8s.io/code-generator/cmd/lister-gen",
"k8s.io/code-generator/cmd/informer-gen"
# "golang.org/x/oauth2/google"
]

[[constraint]]
Expand All @@ -45,3 +46,15 @@ required = [
[[constraint]]
name = "k8s.io/client-go"
version = "kubernetes-1.10.0"

[[override]]
name = "github.com/golang/protobuf"
version = "v1.1.0"

[[override]]
name = "golang.org/x/oauth2"
revision = "cdc340f7c179dbbfa4afd43b7614e8fcadde4269"

[[override]]
name = "cloud.google.com/go"
revision = "90f2606161ee6a14efe2ca79fc05ac2b8efe250b"
9 changes: 6 additions & 3 deletions cmd/controller/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,16 @@ const (
)

var (
masterURL string
kubeconfig string
masterURL string
kubeconfig string
receiveAdapterImage = flag.String("receiveadapter", "", "receive adapter docker image <temporary hack>")
)

func main() {
flag.Parse()

glog.Infof("RECEIVE IMAGE: %q", *receiveAdapterImage)

// set up signals so we handle the first shutdown signal gracefully
stopCh := signals.SetupSignalHandler()

Expand Down Expand Up @@ -91,7 +94,7 @@ func main() {
controllers := make([]controller.Interface, 0, len(ctors))
for _, ctor := range ctors {
controllers = append(controllers,
ctor(kubeClient, client, kubeInformerFactory, informerFactory, elaInformerFactory))
ctor(kubeClient, client, kubeInformerFactory, informerFactory, elaInformerFactory, *receiveAdapterImage))
}

go kubeInformerFactory.Start(stopCh)
Expand Down
1 change: 1 addition & 0 deletions config/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ k8s_object(
name = "controller",
images = {
"github.com/elafros/eventing/cmd/controller": "//cmd/controller:image",
"github.com/elafros/eventing/sample/gcp_pubsub": "//sample/gcp_pubsub:image",
},
template = "controller.yaml",
)
Expand Down
1 change: 1 addition & 0 deletions config/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ spec:
args: [
"-logtostderr",
"-stderrthreshold", "INFO",
"-receiveadapter", "github.com/elafros/eventing/sample/gcp_pubsub",
]
7 changes: 7 additions & 0 deletions pkg/apis/bind/v1alpha1/bind_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,13 @@ type SecretKeyReference struct {
// BindStatus is the status for a Bind resource
type BindStatus struct {
Conditions []BindCondition `json:"conditions,omitempty"`

// BindContext is what the Bind operation returns and holds enough information
// for the event source to perform Unbind.
// This is specific to each Binding. Opaque to platform, only consumed
// by the actual trigger actuator.
// NOTE: experimental field.
BindContext *runtime.RawExtension `json:"bindContext,omitempty"`
}

type BindConditionType string
Expand Down
9 changes: 9 additions & 0 deletions pkg/apis/bind/v1alpha1/zz_generated.deepcopy.go

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

3 changes: 3 additions & 0 deletions pkg/controller/bind/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@ go_library(
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//vendor/k8s.io/client-go/informers:go_default_library",
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
Expand Down
Loading