test/test-framework: fix framework tests

Author: AlexNPavel

test/test-framework/memcached_test.go

@@ -16,10 +16,11 @@ package e2e
 
 import (
 	goctx "context"
+	"fmt"
 	"testing"
 	"time"
 
-	operator "github.com/example-inc-2/memcached-operator/pkg/apis/cache/v1alpha1"
+	operator "github.com/operator-framework/operator-sdk/test/test-framework/pkg/apis/cache/v1alpha1"
 
 	framework "github.com/operator-framework/operator-sdk/pkg/test"
 	"github.com/operator-framework/operator-sdk/pkg/util/e2eutil"
@@ -53,7 +54,7 @@ func TestMemcached(t *testing.T) {
 func memcachedScaleTest(t *testing.T, f *framework.Framework, ctx framework.TestCtx) error {
 	namespace, err := ctx.GetNamespace()
 	if err != nil {
-		return t.Errorf("could not get namespace: %v", err)
+		return fmt.Errorf("could not get namespace: %v", err)
 	}
 	// create memcached custom resource
 	exampleMemcached := &operator.Memcached{

test/test-framework/pkg/apis/cache/v1alpha1/register.go

@@ -0,0 +1,35 @@
+package v1alpha1
+
+import (
+	sdkK8sutil "github.com/operator-framework/operator-sdk/pkg/util/k8sutil"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+const (
+	version   = "v1alpha1"
+	groupName = "cache.example.com"
+)
+
+var (
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	AddToScheme   = SchemeBuilder.AddToScheme
+	// SchemeGroupVersion is the group version used to register these objects.
+	SchemeGroupVersion = schema.GroupVersion{Group: groupName, Version: version}
+)
+
+func init() {
+	sdkK8sutil.AddToSDKScheme(AddToScheme)
+}
+
+// addKnownTypes adds the set of types defined in this package to the supplied scheme.
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(SchemeGroupVersion,
+		&Memcached{},
+		&MemcachedList{},
+	)
+	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
+	return nil
+}

test/test-framework/pkg/apis/cache/v1alpha1/types.go

@@ -0,0 +1,25 @@
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+type MemcachedList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata"`
+	Items           []Memcached `json:"items"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+type Memcached struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata"`
+	Spec              MemcachedSpec   `json:"spec"`
+	Status            MemcachedStatus `json:"status,omitempty"`
+}
+
+type MemcachedSpec struct {	Size int32 `json:"size"`}
+type MemcachedStatus struct {Nodes []string `json:"nodes"`}