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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions cmd/controller/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ import (
"knative.dev/eventing/pkg/reconciler/apiserversource"
"knative.dev/eventing/pkg/reconciler/channel"
"knative.dev/eventing/pkg/reconciler/eventtype"
"knative.dev/eventing/pkg/reconciler/legacyapiserversource"
"knative.dev/eventing/pkg/reconciler/legacycontainersource"
"knative.dev/eventing/pkg/reconciler/legacycronjobsource"
"knative.dev/eventing/pkg/reconciler/parallel"
"knative.dev/eventing/pkg/reconciler/pingsource"
"knative.dev/eventing/pkg/reconciler/sequence"
Expand All @@ -53,11 +50,5 @@ func main() {
// Sources
apiserversource.NewController,
pingsource.NewController,

// Legacy Sources
// TODO(#2312): Remove this after v0.13.
legacyapiserversource.NewController,
legacycontainersource.NewController,
legacycronjobsource.NewController,
)
}
1 change: 0 additions & 1 deletion cmd/cronjob_receive_adapter/kodata/HEAD

This file was deleted.

1 change: 0 additions & 1 deletion cmd/cronjob_receive_adapter/kodata/LICENSE

This file was deleted.

1 change: 0 additions & 1 deletion cmd/cronjob_receive_adapter/kodata/VENDOR-LICENSE

This file was deleted.

1 change: 0 additions & 1 deletion cmd/cronjob_receive_adapter/kodata/refs

This file was deleted.

26 changes: 0 additions & 26 deletions cmd/cronjob_receive_adapter/main.go

This file was deleted.

34 changes: 0 additions & 34 deletions cmd/webhook/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"k8s.io/apimachinery/pkg/types"

"knative.dev/eventing/pkg/logconfig"
"knative.dev/eventing/pkg/reconciler/legacysinkbinding"
"knative.dev/pkg/configmap"
"knative.dev/pkg/controller"
"knative.dev/pkg/injection"
Expand All @@ -50,7 +49,6 @@ import (
"knative.dev/eventing/pkg/apis/flows"
flowsv1alpha1 "knative.dev/eventing/pkg/apis/flows/v1alpha1"
flowsv1beta1 "knative.dev/eventing/pkg/apis/flows/v1beta1"
legacysourcesv1alpha1 "knative.dev/eventing/pkg/apis/legacysources/v1alpha1"
"knative.dev/eventing/pkg/apis/messaging"
channeldefaultconfig "knative.dev/eventing/pkg/apis/messaging/config"
messagingv1alpha1 "knative.dev/eventing/pkg/apis/messaging/v1alpha1"
Expand Down Expand Up @@ -93,13 +91,6 @@ var ourTypes = map[schema.GroupVersionKind]resourcesemantics.GenericCRD{
sourcesv1alpha2.SchemeGroupVersion.WithKind("PingSource"): &sourcesv1alpha2.PingSource{},
sourcesv1alpha2.SchemeGroupVersion.WithKind("SinkBinding"): &sourcesv1alpha2.SinkBinding{},

// For group sources.eventing.knative.dev.
// TODO(#2312): Remove this after v0.13.
legacysourcesv1alpha1.SchemeGroupVersion.WithKind("ApiServerSource"): &legacysourcesv1alpha1.ApiServerSource{},
legacysourcesv1alpha1.SchemeGroupVersion.WithKind("ContainerSource"): &legacysourcesv1alpha1.ContainerSource{},
legacysourcesv1alpha1.SchemeGroupVersion.WithKind("SinkBinding"): &legacysourcesv1alpha1.SinkBinding{},
legacysourcesv1alpha1.SchemeGroupVersion.WithKind("CronJobSource"): &legacysourcesv1alpha1.CronJobSource{},

// For group flows.knative.dev
// v1alpha1
flowsv1alpha1.SchemeGroupVersion.WithKind("Parallel"): &flowsv1alpha1.Parallel{},
Expand Down Expand Up @@ -217,29 +208,6 @@ func NewSinkBindingWebhook(opts ...psbinding.ReconcilerOption) injection.Control
}
}

// TODO(#2312): Remove this after v0.13.
func NewLegacySinkBindingWebhook(opts ...psbinding.ReconcilerOption) injection.ControllerConstructor {
return func(ctx context.Context, cmw configmap.Watcher) *controller.Impl {
sbresolver := legacysinkbinding.WithContextFactory(ctx, func(types.NamespacedName) {})

return psbinding.NewAdmissionController(ctx,

// Name of the resource webhook.
"legacysinkbindings.webhook.sources.knative.dev",

// The path on which to serve the webhook.
"/legacysinkbindings",

// How to get all the Bindables for configuring the mutating webhook.
legacysinkbinding.ListAll,

// How to setup the context prior to invoking Do/Undo.
sbresolver,
opts...,
)
}
}

func NewConversionController(ctx context.Context, cmw configmap.Watcher) *controller.Impl {
// Decorate contexts with the current state of the config.
store := defaultconfig.NewStore(logging.FromContext(ctx).Named("config-store"))
Expand Down Expand Up @@ -383,7 +351,5 @@ func main() {

// For each binding we have a controller and a binding webhook.
sinkbinding.NewController, NewSinkBindingWebhook(sbSelector),
// TODO(#2312): Remove this after v0.13.
legacysinkbinding.NewController, NewLegacySinkBindingWebhook(sbSelector),
)
}
1 change: 0 additions & 1 deletion config/300-legacyapiserversource.yaml

This file was deleted.

1 change: 0 additions & 1 deletion config/300-legacycontainersource.yaml

This file was deleted.

1 change: 0 additions & 1 deletion config/300-legacycronjobsource.yaml

This file was deleted.

1 change: 0 additions & 1 deletion config/300-legacysinkbinding.yaml

This file was deleted.

1 change: 0 additions & 1 deletion config/500-webhook-legacysinkbindings.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions config/core/deployments/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ spec:
value: config-observability
- name: METRICS_DOMAIN
value: knative.dev/eventing
# Legacy CronJobSource
- name: CRONJOB_RA_IMAGE
value: knative.dev/eventing/cmd/cronjob_receive_adapter
# PingSource
- name: PING_IMAGE
value: knative.dev/eventing/cmd/ping
Expand Down
166 changes: 0 additions & 166 deletions config/core/resources/legacyapiserversource.yaml

This file was deleted.

Loading