Move Container source to Eventing, migrate to pkg/controller

cmd/sources-controller/main.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"flag"
+	"github.com/knative/eventing/pkg/reconciler/containersource"
 	"k8s.io/client-go/tools/clientcmd"
 	"log"
 
@@ -63,7 +64,7 @@ func main() {
 	logger = logger.With(zap.String("controller/impl", "pkg"))
 	logger.Info("Starting the controller")
 
-	const numControllers = 1
+	const numControllers = 2
 	cfg.QPS = numControllers * rest.DefaultQPS
 	cfg.Burst = numControllers * rest.DefaultBurst
 	opt := reconciler.NewOptionsOrDie(cfg, logger, stopCh)
@@ -72,7 +73,8 @@ func main() {
 	eventingInformerFactory := informers.NewSharedInformerFactory(opt.EventingClientSet, opt.ResyncPeriod)
 
 	// Eventing
-	cronjobsourceInformer := eventingInformerFactory.Sources().V1alpha1().CronJobSources()
+	cronJobSourceInformer := eventingInformerFactory.Sources().V1alpha1().CronJobSources()
+	containerSourceInformer := eventingInformerFactory.Sources().V1alpha1().ContainerSources()
 
 	// Kube
 	deploymentInformer := kubeInformerFactory.Apps().V1().Deployments()
@@ -83,7 +85,12 @@ func main() {
 	controllers := []*kncontroller.Impl{
 		cronjobsource.NewController(
 			opt,
-			cronjobsourceInformer,
+			cronJobSourceInformer,
+			deploymentInformer,
+		),
+		containersource.NewController(
+			opt,
+			containerSourceInformer,
 			deploymentInformer,
 		),
 	}
@@ -104,7 +111,8 @@ func main() {
 	if err := kncontroller.StartInformers(
 		stopCh,
 		// Eventing
-		cronjobsourceInformer.Informer(),
+		cronJobSourceInformer.Informer(),
+		containerSourceInformer.Informer(),
 		// Kube
 		deploymentInformer.Informer(),
 	); err != nil {

config/200-controller-clusterrole.yaml

@@ -79,4 +79,7 @@ rules:
       - "cronjobsources"
       - "cronjobsources/status"
       - "cronjobsources/finalizers"
+      - "containersources"
+      - "containersources/status"
+      - "containersources/finalizers"
     verbs: *everything

config/300-containersource.yaml

@@ -0,0 +1,89 @@
+# Copyright 2019 The Knative Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  labels:
+    eventing.knative.dev/source: "true"
+    knative.dev/crd-install: "true"
+  name: containersources.sources.eventing.knative.dev
+spec:
+  group: sources.eventing.knative.dev
+  names:
+    categories:
+    - all
+    - knative
+    - eventing
+    - sources
+    kind: ContainerSource
+    plural: containersources
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      properties:
+        apiVersion:
+          type: string
+        kind:
+          type: string
+        metadata:
+          type: object
+        spec:
+          properties:
+            args:
+              items:
+                type: string
+              type: array
+            env:
+              items:
+                type: object
+              type: array
+            image:
+              minLength: 1
+              type: string
+            serviceAccountName:
+              type: string
+            sink:
+              type: object
+          type: object
+        status:
+          properties:
+            conditions:
+              items:
+                properties:
+                  lastTransitionTime:
+                    # we use a string in the stored object but a wrapper object
+                    # at runtime.
+                    type: string
+                  message:
+                    type: string
+                  reason:
+                    type: string
+                  severity:
+                    type: string
+                  status:
+                    type: string
+                  type:
+                    type: string
+                required:
+                - type
+                - status
+                type: object
+              type: array
+            sinkUri:
+              type: string
+          type: object
+  version: v1alpha1

pkg/apis/sources/v1alpha1/containersource_lifecycle.go

@@ -0,0 +1,92 @@
+/*
+Copyright 2019 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
+)
+
+const (
+	// ContainerSourceConditionReady has status True when the ContainerSource is ready to send events.
+	ContainerConditionReady = duckv1alpha1.ConditionReady
+
+	// ContainerConditionSinkProvided has status True when the ContainerSource has been configured with a sink target.
+	ContainerConditionSinkProvided duckv1alpha1.ConditionType = "SinkProvided"
+
+	// ContainerConditionDeployed has status True when the ContainerSource has had it's deployment created.
+	ContainerConditionDeployed duckv1alpha1.ConditionType = "Deployed"
+)
+
+var containerCondSet = duckv1alpha1.NewLivingConditionSet(
+	ContainerConditionSinkProvided,
+	ContainerConditionDeployed,
+)
+
+// GetCondition returns the condition currently associated with the given type, or nil.
+func (s *ContainerSourceStatus) GetCondition(t duckv1alpha1.ConditionType) *duckv1alpha1.Condition {
+	return containerCondSet.Manage(s).GetCondition(t)
+}
+
+// IsReady returns true if the resource is ready overall.
+func (s *ContainerSourceStatus) IsReady() bool {
+	return containerCondSet.Manage(s).IsHappy()
+}
+
+// InitializeConditions sets relevant unset conditions to Unknown state.
+func (s *ContainerSourceStatus) InitializeConditions() {
+	containerCondSet.Manage(s).InitializeConditions()
+}
+
+// MarkSink sets the condition that the source has a sink configured.
+func (s *ContainerSourceStatus) MarkSink(uri string) {
+	s.SinkURI = uri
+	if len(uri) > 0 {
+		containerCondSet.Manage(s).MarkTrue(ContainerConditionSinkProvided)
+	} else {
+		containerCondSet.Manage(s).MarkUnknown(ContainerConditionSinkProvided, "SinkEmpty", "Sink has resolved to empty.%s", "")
+	}
+}
+
+// MarkNoSink sets the condition that the source does not have a sink configured.
+func (s *ContainerSourceStatus) MarkNoSink(reason, messageFormat string, messageA ...interface{}) {
+	containerCondSet.Manage(s).MarkFalse(ContainerConditionSinkProvided, reason, messageFormat, messageA...)
+}
+
+// IsDeployed returns true if the Deployed condition has status true, otherwise
+// false.
+func (s *ContainerSourceStatus) IsDeployed() bool {
+	c := containerCondSet.Manage(s).GetCondition(ContainerConditionDeployed)
+	if c != nil {
+		return c.IsTrue()
+	}
+	return false
+}
+
+// MarkDeployed sets the condition that the source has been deployed.
+func (s *ContainerSourceStatus) MarkDeployed() {
+	containerCondSet.Manage(s).MarkTrue(ContainerConditionDeployed)
+}
+
+// MarkDeploying sets the condition that the source is deploying.
+func (s *ContainerSourceStatus) MarkDeploying(reason, messageFormat string, messageA ...interface{}) {
+	containerCondSet.Manage(s).MarkUnknown(ContainerConditionDeployed, reason, messageFormat, messageA...)
+}
+
+// MarkNotDeployed sets the condition that the source has not been deployed.
+func (s *ContainerSourceStatus) MarkNotDeployed(reason, messageFormat string, messageA ...interface{}) {
+	containerCondSet.Manage(s).MarkFalse(ContainerConditionDeployed, reason, messageFormat, messageA...)
+}