Migrate current sources to legacy (#2336)

cmd/sources_controller/main.go

@@ -20,16 +20,16 @@ import (
 	// Uncomment the following line to load the gcp plugin (only required to authenticate against GKE clusters).
 	// _ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 
-	"knative.dev/eventing/pkg/reconciler/apiserversource"
-	"knative.dev/eventing/pkg/reconciler/containersource"
-	"knative.dev/eventing/pkg/reconciler/cronjobsource"
+	"knative.dev/eventing/pkg/reconciler/legacyapiserversource"
+	"knative.dev/eventing/pkg/reconciler/legacycontainersource"
+	"knative.dev/eventing/pkg/reconciler/legacycronjobsource"
 	"knative.dev/pkg/injection/sharedmain"
 )
 
 func main() {
 	sharedmain.Main("source_controller",
-		apiserversource.NewController,
-		containersource.NewController,
-		cronjobsource.NewController,
+		legacyapiserversource.NewController,
+		legacycontainersource.NewController,
+		legacycronjobsource.NewController,
 	)
 }

cmd/webhook/main.go

@@ -24,11 +24,11 @@ import (
 	eventingduckv1alpha1 "knative.dev/eventing/pkg/apis/duck/v1alpha1"
 	eventingv1alpha1 "knative.dev/eventing/pkg/apis/eventing/v1alpha1"
 	flowsv1alpha1 "knative.dev/eventing/pkg/apis/flows/v1alpha1"
+	sourcesv1alpha1 "knative.dev/eventing/pkg/apis/legacysources/v1alpha1"
 	messagingv1alpha1 "knative.dev/eventing/pkg/apis/messaging/v1alpha1"
-	sourcesv1alpha1 "knative.dev/eventing/pkg/apis/sources/v1alpha1"
 	"knative.dev/eventing/pkg/defaultchannel"
 	"knative.dev/eventing/pkg/logconfig"
-	"knative.dev/eventing/pkg/reconciler/sinkbinding"
+	"knative.dev/eventing/pkg/reconciler/legacysinkbinding"
 	"knative.dev/pkg/configmap"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/injection/sharedmain"
@@ -146,7 +146,7 @@ func NewConfigValidationController(ctx context.Context, cmw configmap.Watcher) *
 }
 
 func NewSinkBindingWebhook(ctx context.Context, cmw configmap.Watcher) *controller.Impl {
-	sbresolver := sinkbinding.WithContextFactory(ctx, func(types.NamespacedName) {})
+	sbresolver := legacysinkbinding.WithContextFactory(ctx, func(types.NamespacedName) {})
 
 	return psbinding.NewAdmissionController(ctx,
 
@@ -157,7 +157,7 @@ func NewSinkBindingWebhook(ctx context.Context, cmw configmap.Watcher) *controll
 		"/sinkbindings",
 
 		// How to get all the Bindables for configuring the mutating webhook.
-		sinkbinding.ListAll,
+		legacysinkbinding.ListAll,
 
 		// How to setup the context prior to invoking Do/Undo.
 		sbresolver,
@@ -180,6 +180,6 @@ func main() {
 		NewDefaultingAdmissionController,
 
 		// For each binding we have a controller and a binding webhook.
-		sinkbinding.NewController, NewSinkBindingWebhook,
+		legacysinkbinding.NewController, NewSinkBindingWebhook,
 	)
 }

hack/update-codegen.sh

@@ -30,7 +30,13 @@ KNATIVE_CODEGEN_PKG=${KNATIVE_CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 $(dir
 #                  instead of the $GOPATH directly. For normal projects this can be dropped.
 ${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
   knative.dev/eventing/pkg/client knative.dev/eventing/pkg/apis \
-  "eventing:v1alpha1 sources:v1alpha1 messaging:v1alpha1 flows:v1alpha1" \
+  "eventing:v1alpha1 messaging:v1alpha1 flows:v1alpha1" \
+  --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
+
+# TODO(#2312): Remove this after v0.13.
+${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
+  knative.dev/eventing/pkg/legacyclient knative.dev/eventing/pkg/apis \
+  "legacysources:v1alpha1" \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
 
 # Only deepcopy the Duck types, as they are not real resources.
@@ -42,7 +48,13 @@ ${CODEGEN_PKG}/generate-groups.sh "deepcopy" \
 # Knative Injection
 ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \
   knative.dev/eventing/pkg/client knative.dev/eventing/pkg/apis \
-  "eventing:v1alpha1 sources:v1alpha1 messaging:v1alpha1 flows:v1alpha1 duck:v1alpha1" \
+  "eventing:v1alpha1 messaging:v1alpha1 flows:v1alpha1 duck:v1alpha1" \
+  --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
+
+# TODO(#2312): Remove this after v0.13.
+${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \
+  knative.dev/eventing/pkg/legacyclient knative.dev/eventing/pkg/apis \
+  "legacysources:v1alpha1" \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
 
 # Make sure our dependencies are up-to-date

pkg/adapter/apiserver/controller_test.go

@@ -19,7 +19,7 @@ package apiserver
 import (
 	"testing"
 
-	sourcesv1alpha1 "knative.dev/eventing/pkg/apis/sources/v1alpha1"
+	sourcesv1alpha1 "knative.dev/eventing/pkg/apis/legacysources/v1alpha1"
 	kncetesting "knative.dev/eventing/pkg/kncloudevents/testing"
 )
 

pkg/adapter/apiserver/events/events.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
 	cloudevents "github.com/cloudevents/sdk-go"
-	sourcesv1alpha1 "knative.dev/eventing/pkg/apis/sources/v1alpha1"
+	sourcesv1alpha1 "knative.dev/eventing/pkg/apis/legacysources/v1alpha1"
 )
 
 func MakeAddEvent(source string, obj interface{}) (*cloudevents.Event, error) {

pkg/adapter/apiserver/ref_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	sourcesv1alpha1 "knative.dev/eventing/pkg/apis/sources/v1alpha1"
+	sourcesv1alpha1 "knative.dev/eventing/pkg/apis/legacysources/v1alpha1"
 )
 
 func TestRefAddEvent(t *testing.T) {

pkg/adapter/apiserver/resource_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	sourcesv1alpha1 "knative.dev/eventing/pkg/apis/sources/v1alpha1"
+	sourcesv1alpha1 "knative.dev/eventing/pkg/apis/legacysources/v1alpha1"
 )
 
 func TestResourceAddEvent(t *testing.T) {

pkg/adapter/cronjobevents/adapter.go

@@ -25,7 +25,7 @@ import (
 	"github.com/robfig/cron"
 	"go.uber.org/zap"
 	"knative.dev/eventing/pkg/adapter"
-	sourcesv1alpha1 "knative.dev/eventing/pkg/apis/sources/v1alpha1"
+	sourcesv1alpha1 "knative.dev/eventing/pkg/apis/legacysources/v1alpha1"
 	"knative.dev/pkg/logging"
 	"knative.dev/pkg/source"
 )

pkg/apis/sources/register.go → pkg/apis/legacysources/register.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package sources
+package legacysources
 
 const (
 	GroupName = "sources.eventing.knative.dev"

pkg/apis/sources/v1alpha1/cron_job_lifecycle_test.go → pkg/apis/legacysources/v1alpha1/cron_job_lifecycle_test.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"knative.dev/eventing/pkg/apis/sources/v1alpha1"
+	"knative.dev/eventing/pkg/apis/legacysources/v1alpha1"
 	"knative.dev/pkg/apis"
 )
 

pkg/apis/sources/v1alpha1/register.go → pkg/apis/legacysources/v1alpha1/register.go

@@ -17,15 +17,15 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"knative.dev/eventing/pkg/apis/sources"
+	"knative.dev/eventing/pkg/apis/legacysources"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // SchemeGroupVersion is group version used to register these objects
-var SchemeGroupVersion = schema.GroupVersion{Group: sources.GroupName, Version: "v1alpha1"}
+var SchemeGroupVersion = schema.GroupVersion{Group: legacysources.GroupName, Version: "v1alpha1"}
 
 // Kind takes an unqualified kind and returns back a Group qualified GroupKind
 func Kind(kind string) schema.GroupKind {