Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Integration sink and source: all together #8254

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cmd/controller/main.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*

Check failure on line 1 in cmd/controller/main.go

View workflow job for this annotation

GitHub Actions / style / Golang / Auto-format and Check

Please run goimports. diff --git a/cmd/controller/main.go b/cmd/controller/main.go index bfca7ca..03dd21d 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -21,13 +21,14 @@ import ( // _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" "errors" - integrationSink "knative.dev/eventing/pkg/reconciler/integration/sink" - integrationSource "knative.dev/eventing/pkg/reconciler/integration/source" "log" "net/http" "os" "time" + integrationSink "knative.dev/eventing/pkg/reconciler/integration/sink" + integrationSource "knative.dev/eventing/pkg/reconciler/integration/source" + "knative.dev/pkg/injection/sharedmain" filteredFactory "knative.dev/pkg/client/injection/kube/informers/factory/filtered"
Copyright 2019 The Knative Authors

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -21,6 +21,8 @@
// _ "k8s.io/client-go/plugin/pkg/client/auth/gcp"

"errors"
integrationSink "knative.dev/eventing/pkg/reconciler/integration/sink"
integrationSource "knative.dev/eventing/pkg/reconciler/integration/source"
"log"
"net/http"
"os"
Expand Down Expand Up @@ -104,11 +106,14 @@
apiserversource.NewController,
pingsource.NewController,
containersource.NewController,
integrationSource.NewController,

// Sources CRD
sourcecrd.NewController,

// Sinks
jobsink.NewController,
integrationSink.NewController,

// Sugar
sugarnamespace.NewController,
Expand Down
6 changes: 5 additions & 1 deletion cmd/webhook/main.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*

Check failure on line 1 in cmd/webhook/main.go

View workflow job for this annotation

GitHub Actions / style / Golang / Auto-format and Check

Please run goimports. diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go index fddd03f..76dc703 100644 --- a/cmd/webhook/main.go +++ b/cmd/webhook/main.go @@ -18,9 +18,10 @@ package main import ( "context" - sourcesv1alpha1 "knative.dev/eventing/pkg/apis/sources/v1alpha1" "os" + sourcesv1alpha1 "knative.dev/eventing/pkg/apis/sources/v1alpha1" + "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/scheme"
Copyright 2018 The Knative Authors

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -18,6 +18,7 @@

import (
"context"
sourcesv1alpha1 "knative.dev/eventing/pkg/apis/sources/v1alpha1"
"os"

"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down Expand Up @@ -92,6 +93,8 @@
messagingv1.SchemeGroupVersion.WithKind("Subscription"): &messagingv1.Subscription{},

// For group sources.knative.dev.
// v1alpha1
sourcesv1alpha1.SchemeGroupVersion.WithKind("IntegrationSource"): &sourcesv1alpha1.IntegrationSource{},
// v1beta2
sourcesv1beta2.SchemeGroupVersion.WithKind("PingSource"): &sourcesv1beta2.PingSource{},
// v1
Expand All @@ -102,7 +105,8 @@

// For group sinks.knative.dev.
// v1alpha1
sinksv1alpha1.SchemeGroupVersion.WithKind("JobSink"): &sinksv1alpha1.JobSink{},
sinksv1alpha1.SchemeGroupVersion.WithKind("JobSink"): &sinksv1alpha1.JobSink{},
sinksv1alpha1.SchemeGroupVersion.WithKind("IntegrationSink"): &sinksv1alpha1.IntegrationSink{},

// For group flows.knative.dev
// v1
Expand Down
1 change: 1 addition & 0 deletions config/300-integrationsink.yaml
1 change: 1 addition & 0 deletions config/300-integrationsource.yaml
423 changes: 423 additions & 0 deletions config/core/resources/integrationsink.yaml

Large diffs are not rendered by default.

447 changes: 447 additions & 0 deletions config/core/resources/integrationsource.yaml

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions config/core/roles/controller-clusterroles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ rules:
resources:
- "jobsinks"
- "jobsinks/status"
- "integrationsinks"
- "integrationsinks/status"
verbs:
- "get"
- "list"
Expand All @@ -135,6 +137,7 @@ rules:
- "sinks.knative.dev"
resources:
- "jobsinks/finalizers"
- "integrationsinks/finalizers"
verbs:
- "update"

Expand Down
1 change: 1 addition & 0 deletions config/core/roles/source-observer-clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ rules:
- pingsources
- sinkbindings
- containersources
- integrationsources
verbs:
- get
- list
Expand Down
3 changes: 3 additions & 0 deletions config/core/roles/sources-controller-clusterroles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ rules:
- "containersources"
- "containersources/status"
- "containersources/finalizers"
- "integrationsources"
- "integrationsources/status"
- "integrationsources/finalizers"
verbs:
- "get"
- "list"
Expand Down
Loading
Loading