Skip to content

enable source crd test #4154

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.

Sign up for GitHub

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

Merged
knative-prow-robot merged 5 commits into from
Oct 2, 2020
+197 −46
Merged

enable source crd test #4154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d7a6e6
enable source crd test
runzexia Sep 28, 2020
46cd3cc
goimports fmt
runzexia Sep 28, 2020
83fe6fa
add test cases
runzexia Sep 29, 2020
060a424
refmt
runzexia Sep 29, 2020
6544f37
test running controller
runzexia Sep 29, 2020
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
228 changes: 184 additions & 44 deletions pkg/reconciler/source/crd/crd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ import (
"context"
"testing"

"knative.dev/eventing/pkg/reconciler/source/duck"

apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/client-go/rest"
"knative.dev/pkg/injection"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand All @@ -43,55 +49,115 @@ import (
const (
crdName = "test-crd"

// TODO: See comment below
// crdGroup = "testing.sources.knative.dev"
// crdKind = "TestSource"
// crdPlural = "testsources"
// crdVersionServed = "v1alpha1"
crdGroup = "testing.sources.knative.dev"
crdKind = "TestSource"
crdPlural = "testsources"
crdVersionServed = "v1alpha1"
)

var crdGVR = schema.GroupVersionResource{
Group: crdGroup,
Version: crdVersionServed,
Resource: crdPlural,
}

var crdGVK = schema.GroupVersionKind{
Group: crdGroup,
Version: crdVersionServed,
Kind: crdKind,
}

func TestAllCases(t *testing.T) {
table := TableTest{{
Name: "bad workqueue key",
// Make sure Reconcile handles bad keys.
Key: "too/many/parts",
}, {
Name: "key not found",
// Make sure Reconcile handles good keys that don't exist.
Key: "not-found",
}, {
Name: "reconcile failed, cannot find GVR or GVK",
Objects: []runtime.Object{
NewCustomResourceDefinition(crdName,
WithCustomResourceDefinitionLabels(map[string]string{
sources.SourceDuckLabelKey: sources.SourceDuckLabelValue,
})),
ctx := context.Background()
ctx, _ = injection.Fake.SetupInformers(ctx, &rest.Config{})
table := TableTest{
{
Name: "bad workqueue key",
// Make sure Reconcile handles bad keys.
Key: "too/many/parts",
}, {
Name: "key not found",
// Make sure Reconcile handles good keys that don't exist.
Key: "not-found",
}, {
Name: "reconcile failed, cannot find GVR or GVK",
Objects: []runtime.Object{
NewCustomResourceDefinition(crdName,
WithCustomResourceDefinitionLabels(map[string]string{
sources.SourceDuckLabelKey: sources.SourceDuckLabelValue,
})),
},
Key: crdName,
WantErr: true,
WantEvents: []string{
Eventf(corev1.EventTypeWarning, "InternalError", "unable to find GVR or GVK for %s", crdName),
},
},
{

Name: "reconcile succeeded",
Objects: []runtime.Object{
NewCustomResourceDefinition(crdName,
WithCustomResourceDefinitionLabels(map[string]string{
sources.SourceDuckLabelKey: sources.SourceDuckLabelValue,
}),
WithCustomResourceDefinitionGroup(crdGroup),
WithCustomResourceDefinitionNames(apiextensionsv1.CustomResourceDefinitionNames{
Kind: crdKind,
Plural: crdPlural,
}),
WithCustomResourceDefinitionVersions([]apiextensionsv1.CustomResourceDefinitionVersion{{
Name: crdVersionServed,
Served: true,
}})),
},
Key: crdName,
Ctx: ctx,
},
Key: crdName,
WantErr: true,
WantEvents: []string{
Eventf(corev1.EventTypeWarning, "InternalError", "unable to find GVR or GVK for %s", crdName),
{
Name: "reconcile deleted",
Objects: []runtime.Object{
NewCustomResourceDefinition(crdName,
WithCustomResourceDefinitionLabels(map[string]string{
sources.SourceDuckLabelKey: sources.SourceDuckLabelValue,
}),

WithCustomResourceDefinitionGroup(crdGroup),
WithCustomResourceDefinitionDeletionTimestamp(),
WithCustomResourceDefinitionNames(apiextensionsv1.CustomResourceDefinitionNames{
Kind: crdKind,
Plural: crdPlural,
}),
WithCustomResourceDefinitionVersions([]apiextensionsv1.CustomResourceDefinitionVersion{{
Name: crdVersionServed,
Served: true,
}})),
},
Key: crdName,
Ctx: ctx,
},
{
Name: "reconcile not Served",
Objects: []runtime.Object{
NewCustomResourceDefinition(crdName,
WithCustomResourceDefinitionLabels(map[string]string{
sources.SourceDuckLabelKey: sources.SourceDuckLabelValue,
}),

WithCustomResourceDefinitionGroup(crdGroup),
WithCustomResourceDefinitionDeletionTimestamp(),
WithCustomResourceDefinitionNames(apiextensionsv1.CustomResourceDefinitionNames{
Kind: crdKind,
Plural: crdPlural,
}),
WithCustomResourceDefinitionVersions([]apiextensionsv1.CustomResourceDefinitionVersion{{
Name: crdVersionServed,
Served: false,
}})),
},
Key: crdName,
Ctx: ctx,
},
},
//}, {
// TODO uncomment the following once we figure out why the eventtype informer is missing from the duck.controller.
//Name: "reconcile succeeded",
//Objects: []runtime.Object{
// NewCustomResourceDefinition(crdName,
// WithCustomResourceDefinitionLabels(map[string]string{
// sources.SourceDuckLabelKey: sources.SourceDuckLabelValue,
// }),
// WithCustomResourceDefinitionGroup(crdGroup),
// WithCustomResourceDefinitionNames(apiextensionsv1beta1.CustomResourceDefinitionNames{
// Kind: crdKind,
// Plural: crdPlural,
// }),
// WithCustomResourceDefinitionVersions([]apiextensionsv1beta1.CustomResourceDefinitionVersion{{
// Name: crdVersionServed,
// Served: true,
// }})),
//},
//Key: crdName,
}

logger := logtesting.TestLogger(t)
Expand All @@ -108,3 +174,77 @@ func TestAllCases(t *testing.T) {
controller.GetEventRecorder(ctx), r)
}, false, logger))
}

func TestControllerRunning(t *testing.T) {
ctx := context.Background()
ctx, _ = injection.Fake.SetupInformers(ctx, &rest.Config{})
table := TableTest{
{

Name: "reconcile succeeded",
Objects: []runtime.Object{
NewCustomResourceDefinition(crdName,
WithCustomResourceDefinitionLabels(map[string]string{
sources.SourceDuckLabelKey: sources.SourceDuckLabelValue,
}),
WithCustomResourceDefinitionGroup(crdGroup),
WithCustomResourceDefinitionNames(apiextensionsv1.CustomResourceDefinitionNames{
Kind: crdKind,
Plural: crdPlural,
}),
WithCustomResourceDefinitionVersions([]apiextensionsv1.CustomResourceDefinitionVersion{{
Name: crdVersionServed,
Served: true,
}})),
},
Key: crdName,
Ctx: ctx,
},
{
Name: "reconcile deleted",
Objects: []runtime.Object{
NewCustomResourceDefinition(crdName,
WithCustomResourceDefinitionLabels(map[string]string{
sources.SourceDuckLabelKey: sources.SourceDuckLabelValue,
}),

WithCustomResourceDefinitionGroup(crdGroup),
WithCustomResourceDefinitionDeletionTimestamp(),
WithCustomResourceDefinitionNames(apiextensionsv1.CustomResourceDefinitionNames{
Kind: crdKind,
Plural: crdPlural,
}),
WithCustomResourceDefinitionVersions([]apiextensionsv1.CustomResourceDefinitionVersion{{
Name: crdVersionServed,
Served: true,
}})),
},
Key: crdName,
Ctx: ctx,
},
}

logger := logtesting.TestLogger(t)
table.Test(t, MakeFactory(func(ctx context.Context, listers *Listers, cmw configmap.Watcher) controller.Reconciler {
ctx = source.WithDuck(ctx)
r := &Reconciler{
ogctx: ctx,
ogcmw: cmw,
controllers: make(map[schema.GroupVersionResource]runningController),
}
sdc := duck.NewController(crdName, crdGVR, crdGVK)
// Source Duck controller context
sdctx, cancel := context.WithCancel(r.ogctx)
// Source Duck controller instantiation
sd := sdc(sdctx, r.ogcmw)
rc := runningController{
controller: sd,
cancel: cancel,
}
r.controllers[crdGVR] = rc

return crdreconciler.NewReconciler(ctx, logger,
fakeclient.Get(ctx), listers.GetCustomResourceDefinitionLister(),
controller.GetEventRecorder(ctx), r)
}, false, logger))
}
9 changes: 9 additions & 0 deletions pkg/reconciler/testing/customresourcedefinition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ limitations under the License.
package testing

import (
"time"

apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down Expand Up @@ -61,3 +63,10 @@ func WithCustomResourceDefinitionNames(names apiextensionsv1.CustomResourceDefin
crd.Spec.Names = names
}
}

func WithCustomResourceDefinitionDeletionTimestamp() CustomResourceDefinitionOption {
return func(crd *apiextensionsv1.CustomResourceDefinition) {
t := metav1.NewTime(time.Unix(1e9, 0))
crd.ObjectMeta.SetDeletionTimestamp(&t)
}
}
6 changes: 4 additions & 2 deletions pkg/reconciler/testing/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,10 @@ type Ctor func(context.Context, *Listers, configmap.Watcher) controller.Reconcil
func MakeFactory(ctor Ctor, unstructured bool, logger *zap.SugaredLogger) Factory {
return func(t *testing.T, r *TableRow) (controller.Reconciler, ActionRecorderList, EventList) {
ls := NewListers(r.Objects)

ctx := context.Background()
ctx := r.Ctx
if ctx == nil {
ctx = context.Background()
}
ctx = logging.WithLogger(ctx, logger)

ctx, kubeClient := fakekubeclient.With(ctx, ls.GetKubeObjects()...)
Expand Down