Use code-generator to generate clientset/informer/lister (#1492)

To reduce maintenance effort and avoid writing duplicate informer code,
use code-generator to generate clientset/informer/lister code.

pkg/crd/canaryConfig.go

@@ -1,122 +0,0 @@
-/*
-Copyright 2016 The Fission 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 crd
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/rest"
-
-	fv1 "github.com/fission/fission/pkg/apis/fission.io/v1"
-)
-
-type (
-	CanaryConfigInterface interface {
-		Create(*fv1.CanaryConfig) (*fv1.CanaryConfig, error)
-		Get(name string) (*fv1.CanaryConfig, error)
-		Update(*fv1.CanaryConfig) (*fv1.CanaryConfig, error)
-		Delete(name string, options *metav1.DeleteOptions) error
-		List(opts metav1.ListOptions) (*fv1.CanaryConfigList, error)
-		Watch(opts metav1.ListOptions) (watch.Interface, error)
-	}
-
-	canaryConfigClient struct {
-		client    *rest.RESTClient
-		namespace string
-	}
-)
-
-func MakeCanaryConfigInterface(crdClient *rest.RESTClient, namespace string) CanaryConfigInterface {
-	return &canaryConfigClient{
-		client:    crdClient,
-		namespace: namespace,
-	}
-}
-
-func (c *canaryConfigClient) Create(f *fv1.CanaryConfig) (*fv1.CanaryConfig, error) {
-	var result fv1.CanaryConfig
-	err := c.client.Post().
-		Resource("canaryconfigs").
-		Namespace(c.namespace).
-		Body(f).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (c *canaryConfigClient) Get(name string) (*fv1.CanaryConfig, error) {
-	var result fv1.CanaryConfig
-	err := c.client.Get().
-		Resource("canaryconfigs").
-		Namespace(c.namespace).
-		Name(name).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (c *canaryConfigClient) Update(f *fv1.CanaryConfig) (*fv1.CanaryConfig, error) {
-	var result fv1.CanaryConfig
-	err := c.client.Put().
-		Resource("canaryconfigs").
-		Namespace(c.namespace).
-		Name(f.Metadata.Name).
-		Body(f).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (c *canaryConfigClient) Delete(name string, opts *metav1.DeleteOptions) error {
-	return c.client.Delete().
-		Namespace(c.namespace).
-		Resource("canaryconfigs").
-		Name(name).
-		Body(opts).
-		Do().
-		Error()
-}
-
-func (c *canaryConfigClient) List(opts metav1.ListOptions) (*fv1.CanaryConfigList, error) {
-	var result fv1.CanaryConfigList
-	err := c.client.Get().
-		Namespace(c.namespace).
-		Resource("canaryconfigs").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Do().
-		Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (c *canaryConfigClient) Watch(opts metav1.ListOptions) (watch.Interface, error) {
-	return c.client.Get().
-		Prefix("watch").
-		Namespace(c.namespace).
-		Resource("canaryconfigs").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Watch()
-}

pkg/crd/client.go

@@ -23,21 +23,18 @@ import (
 
 	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/kubernetes/scheme"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
-	fv1 "github.com/fission/fission/pkg/apis/fission.io/v1"
+	clientset "github.com/fission/fission/pkg/apis/genclient/v1/clientset/versioned"
+	genv1 "github.com/fission/fission/pkg/apis/genclient/v1/clientset/versioned/typed/fission.io/v1"
 )
 
 type (
 	FissionClient struct {
-		crdClient *rest.RESTClient
+		crdClient clientset.Interface
 	}
 )
 
@@ -77,100 +74,35 @@ func GetKubernetesClient() (*rest.Config, *kubernetes.Clientset, *apiextensionsc
 	return config, clientset, apiExtClientset, nil
 }
 
-// GetCrdClient gets a CRD client config
-func GetCrdClient(config *rest.Config) (*rest.RESTClient, error) {
-	// mutate config to add our types
-	configureClient(config)
-
-	// make a REST client with that config
-	return rest.RESTClientFor(config)
-}
-
-// configureClient sets up a REST client for Fission CRD types.
-//
-// This is copied from the client-go CRD example.  (I don't understand
-// all of it completely.)  It registers our types with the global API
-// "scheme" (api.Scheme), which keeps a directory of types [I guess so
-// it can use the string in the Kind field to make a Go object?].  It
-// also puts the fission CRD types under a "group version" which we
-// create for our CRDs types.
-func configureClient(config *rest.Config) {
-	groupversion := schema.GroupVersion{
-		Group:   "fission.io",
-		Version: "v1",
+func MakeFissionClient() (*FissionClient, *kubernetes.Clientset, *apiextensionsclient.Clientset, error) {
+	config, kubeClient, apiExtClient, err := GetKubernetesClient()
+	if err != nil {
+		return nil, nil, nil, err
 	}
-	config.GroupVersion = &groupversion
-	config.APIPath = "/apis"
-	config.ContentType = runtime.ContentTypeJSON
-	config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
 
-	schemeBuilder := runtime.NewSchemeBuilder(
-		func(scheme *runtime.Scheme) error {
-			scheme.AddKnownTypes(
-				groupversion,
-				&fv1.Function{},
-				&fv1.FunctionList{},
-				&metav1.ListOptions{},
-				&metav1.DeleteOptions{},
-			)
-			scheme.AddKnownTypes(
-				groupversion,
-				&fv1.Environment{},
-				&fv1.EnvironmentList{},
-				&metav1.ListOptions{},
-				&metav1.DeleteOptions{},
-			)
-			scheme.AddKnownTypes(
-				groupversion,
-				&fv1.HTTPTrigger{},
-				&fv1.HTTPTriggerList{},
-				&metav1.ListOptions{},
-				&metav1.DeleteOptions{},
-			)
-			scheme.AddKnownTypes(
-				groupversion,
-				&fv1.KubernetesWatchTrigger{},
-				&fv1.KubernetesWatchTriggerList{},
-				&metav1.ListOptions{},
-				&metav1.DeleteOptions{},
-			)
-			scheme.AddKnownTypes(
-				groupversion,
-				&fv1.TimeTrigger{},
-				&fv1.TimeTriggerList{},
-				&metav1.ListOptions{},
-				&metav1.DeleteOptions{},
-			)
-			scheme.AddKnownTypes(
-				groupversion,
-				&fv1.MessageQueueTrigger{},
-				&fv1.MessageQueueTriggerList{},
-				&metav1.ListOptions{},
-				&metav1.DeleteOptions{},
-			)
-			scheme.AddKnownTypes(
-				groupversion,
-				&fv1.Package{},
-				&fv1.PackageList{},
-				&metav1.ListOptions{},
-				&metav1.DeleteOptions{},
-			)
-			scheme.AddKnownTypes(
-				groupversion,
-				&fv1.CanaryConfig{},
-				&fv1.CanaryConfigList{},
-				&metav1.ListOptions{},
-				&metav1.DeleteOptions{},
-			)
-			return nil
-		})
-	schemeBuilder.AddToScheme(scheme.Scheme)
+	// make a CRD REST client with the config
+	crdClient, err := clientset.NewForConfig(config)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+
+	fc := &FissionClient{
+		crdClient: crdClient,
+	}
+	return fc, kubeClient, apiExtClient, nil
 }
 
-func waitForCRDs(crdClient *rest.RESTClient) error {
+// V1 returns the instance of v1 rest client.
+// The only reason to have this function is to avoid
+// using V1V1() in codebase.
+func (fc *FissionClient) V1() genv1.V1V1Interface {
+	return fc.crdClient.V1V1()
+}
+
+func (fc *FissionClient) WaitForCRDs() error {
 	start := time.Now()
 	for {
-		fi := MakeFunctionInterface(crdClient, metav1.NamespaceDefault)
+		fi := fc.crdClient.V1V1().Functions(metav1.NamespaceDefault)
 		_, err := fi.List(metav1.ListOptions{})
 		if err != nil {
 			time.Sleep(100 * time.Millisecond)
@@ -183,49 +115,3 @@ func waitForCRDs(crdClient *rest.RESTClient) error {
 		}
 	}
 }
-
-func MakeFissionClient() (*FissionClient, *kubernetes.Clientset, *apiextensionsclient.Clientset, error) {
-	config, kubeClient, apiExtClient, err := GetKubernetesClient()
-	if err != nil {
-		return nil, nil, nil, err
-	}
-	crdClient, err := GetCrdClient(config)
-	if err != nil {
-		return nil, nil, nil, err
-	}
-	fc := &FissionClient{
-		crdClient: crdClient,
-	}
-	return fc, kubeClient, apiExtClient, nil
-}
-
-func (fc *FissionClient) Functions(ns string) FunctionInterface {
-	return MakeFunctionInterface(fc.crdClient, ns)
-}
-func (fc *FissionClient) Environments(ns string) EnvironmentInterface {
-	return MakeEnvironmentInterface(fc.crdClient, ns)
-}
-func (fc *FissionClient) HTTPTriggers(ns string) HTTPTriggerInterface {
-	return MakeHTTPTriggerInterface(fc.crdClient, ns)
-}
-func (fc *FissionClient) KubernetesWatchTriggers(ns string) KubernetesWatchTriggerInterface {
-	return MakeKubernetesWatchTriggerInterface(fc.crdClient, ns)
-}
-func (fc *FissionClient) TimeTriggers(ns string) TimeTriggerInterface {
-	return MakeTimeTriggerInterface(fc.crdClient, ns)
-}
-func (fc *FissionClient) MessageQueueTriggers(ns string) MessageQueueTriggerInterface {
-	return MakeMessageQueueTriggerInterface(fc.crdClient, ns)
-}
-func (fc *FissionClient) Packages(ns string) PackageInterface {
-	return MakePackageInterface(fc.crdClient, ns)
-}
-func (fc *FissionClient) CanaryConfigs(ns string) CanaryConfigInterface {
-	return MakeCanaryConfigInterface(fc.crdClient, ns)
-}
-func (fc *FissionClient) WaitForCRDs() error {
-	return waitForCRDs(fc.crdClient)
-}
-func (fc *FissionClient) GetCrdClient() *rest.RESTClient {
-	return fc.crdClient
-}

pkg/crd/crd_test.go

@@ -24,9 +24,9 @@ import (
 
 	"go.uber.org/zap"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/rest"
 
 	fv1 "github.com/fission/fission/pkg/apis/fission.io/v1"
+	genv1 "github.com/fission/fission/pkg/apis/genclient/v1/clientset/versioned/typed/fission.io/v1"
 )
 
 func panicIf(err error) {
@@ -35,14 +35,14 @@ func panicIf(err error) {
 	}
 }
 
-func functionTests(crdClient *rest.RESTClient) {
+func functionTests(crdClient genv1.V1V1Interface) {
 	// sample function object
 	function := &fv1.Function{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "Function",
 			APIVersion: "fission.io/v1",
 		},
-		Metadata: metav1.ObjectMeta{
+		ObjectMeta: metav1.ObjectMeta{
 			Name:      "hello",
 			Namespace: metav1.NamespaceDefault,
 		},
@@ -61,34 +61,34 @@ func functionTests(crdClient *rest.RESTClient) {
 	}
 
 	// Test function CRUD
-	fi := MakeFunctionInterface(crdClient, metav1.NamespaceDefault)
+	fi := crdClient.Functions(metav1.NamespaceDefault)
 
 	// cleanup from old crashed tests, ignore errors
-	fi.Delete(function.Metadata.Name, nil)
+	fi.Delete(function.ObjectMeta.Name, nil)
 
 	// create
 	f, err := fi.Create(function)
 	panicIf(err)
-	if f.Metadata.Name != function.Metadata.Name {
+	if f.ObjectMeta.Name != function.ObjectMeta.Name {
 		log.Panicf("Bad result from create: %v", f)
 	}
 
 	// read
-	f, err = fi.Get(function.Metadata.Name)
+	f, err = fi.Get(function.ObjectMeta.Name, metav1.GetOptions{})
 	panicIf(err)
 	if f.Spec.Environment.Name != function.Spec.Environment.Name {
 		log.Panicf("Bad result from Get: %v", f)
 	}
 
-	log.Printf("f.Metadata = %#v", f.Metadata)
+	log.Printf("f.ObjectMeta = %#v", f.ObjectMeta)
 
 	// update
-	function.Metadata.ResourceVersion = f.Metadata.ResourceVersion
+	function.ObjectMeta.ResourceVersion = f.ObjectMeta.ResourceVersion
 	function.Spec.Environment.Name = "yyy"
 	f, err = fi.Update(function)
 	panicIf(err)
 
-	log.Printf("f.Metadata = %#v", f.Metadata)
+	log.Printf("f.ObjectMeta = %#v", f.ObjectMeta)
 
 	// list
 	fl, err := fi.List(metav1.ListOptions{})
@@ -101,7 +101,7 @@ func functionTests(crdClient *rest.RESTClient) {
 	}
 
 	// delete
-	err = fi.Delete(f.Metadata.Name, nil)
+	err = fi.Delete(f.ObjectMeta.Name, nil)
 	panicIf(err)
 
 	// start a watch
@@ -109,10 +109,10 @@ func functionTests(crdClient *rest.RESTClient) {
 	panicIf(err)
 
 	start := time.Now()
-	function.Metadata.ResourceVersion = ""
+	function.ObjectMeta.ResourceVersion = ""
 	f, err = fi.Create(function)
 	panicIf(err)
-	defer fi.Delete(f.Metadata.Name, nil)
+	defer fi.Delete(f.ObjectMeta.Name, nil)
 
 	// assert that we get a watch event for the new function
 	recvd := false
@@ -135,14 +135,14 @@ func functionTests(crdClient *rest.RESTClient) {
 
 }
 
-func environmentTests(crdClient *rest.RESTClient) {
+func environmentTests(crdClient genv1.V1V1Interface) {
 	// sample environment object
 	environment := &fv1.Environment{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "Environment",
 			APIVersion: "fission.io/v1",
 		},
-		Metadata: metav1.ObjectMeta{
+		ObjectMeta: metav1.ObjectMeta{
 			Name:      "hello",
 			Namespace: metav1.NamespaceDefault,
 		},
@@ -159,27 +159,27 @@ func environmentTests(crdClient *rest.RESTClient) {
 	}
 
 	// Test environment CRUD
-	ei := MakeEnvironmentInterface(crdClient, metav1.NamespaceDefault)
+	ei := crdClient.Environments(metav1.NamespaceDefault)
 
 	// cleanup from old crashed tests, ignore errors
-	ei.Delete(environment.Metadata.Name, nil)
+	ei.Delete(environment.ObjectMeta.Name, nil)
 
 	// create
 	e, err := ei.Create(environment)
 	panicIf(err)
-	if e.Metadata.Name != environment.Metadata.Name {
+	if e.ObjectMeta.Name != environment.ObjectMeta.Name {
 		log.Panicf("Bad result from create: %v", e)
 	}
 
 	// read
-	e, err = ei.Get(environment.Metadata.Name)
+	e, err = ei.Get(environment.ObjectMeta.Name, metav1.GetOptions{})
 	panicIf(err)
 	if len(e.Spec.Runtime.Image) != len(environment.Spec.Runtime.Image) {
 		log.Panicf("Bad result from Get: %#v", e)
 	}
 
 	// update
-	environment.Metadata.ResourceVersion = e.Metadata.ResourceVersion
+	environment.ObjectMeta.ResourceVersion = e.ObjectMeta.ResourceVersion
 	environment.Spec.Runtime.Image = "www"
 	e, err = ei.Update(environment)
 	panicIf(err)
@@ -195,7 +195,7 @@ func environmentTests(crdClient *rest.RESTClient) {
 	}
 
 	// delete
-	err = ei.Delete(e.Metadata.Name, nil)
+	err = ei.Delete(e.ObjectMeta.Name, nil)
 	panicIf(err)
 
 	// start a watch
@@ -203,10 +203,10 @@ func environmentTests(crdClient *rest.RESTClient) {
 	panicIf(err)
 
 	start := time.Now()
-	environment.Metadata.ResourceVersion = ""
+	environment.ObjectMeta.ResourceVersion = ""
 	e, err = ei.Create(environment)
 	panicIf(err)
-	defer ei.Delete(e.Metadata.Name, nil)
+	defer ei.Delete(e.ObjectMeta.Name, nil)
 
 	// assert that we get a watch event for the new environment
 	recvd := false
@@ -229,14 +229,14 @@ func environmentTests(crdClient *rest.RESTClient) {
 
 }
 
-func httpTriggerTests(crdClient *rest.RESTClient) {
+func httpTriggerTests(crdClient genv1.V1V1Interface) {
 	// sample httpTrigger object
 	httpTrigger := &fv1.HTTPTrigger{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "HTTPTrigger",
 			APIVersion: "fission.io/v1",
 		},
-		Metadata: metav1.ObjectMeta{
+		ObjectMeta: metav1.ObjectMeta{
 			Name:      "hello",
 			Namespace: metav1.NamespaceDefault,
 		},
@@ -251,27 +251,27 @@ func httpTriggerTests(crdClient *rest.RESTClient) {
 	}
 
 	// Test httpTrigger CRUD
-	ei := MakeHTTPTriggerInterface(crdClient, metav1.NamespaceDefault)
+	ei := crdClient.HTTPTriggers(metav1.NamespaceDefault)
 
 	// cleanup from old crashed tests, ignore errors
-	ei.Delete(httpTrigger.Metadata.Name, nil)
+	ei.Delete(httpTrigger.ObjectMeta.Name, nil)
 
 	// create
 	e, err := ei.Create(httpTrigger)
 	panicIf(err)
-	if e.Metadata.Name != httpTrigger.Metadata.Name {
+	if e.ObjectMeta.Name != httpTrigger.ObjectMeta.Name {
 		log.Panicf("Bad result from create: %v", e)
 	}
 
 	// read
-	e, err = ei.Get(httpTrigger.Metadata.Name)
+	e, err = ei.Get(httpTrigger.ObjectMeta.Name, metav1.GetOptions{})
 	panicIf(err)
 	if len(e.Spec.Method) != len(httpTrigger.Spec.Method) {
 		log.Panicf("Bad result from Get: %#v", e)
 	}
 
 	// update
-	httpTrigger.Metadata.ResourceVersion = e.Metadata.ResourceVersion
+	httpTrigger.ObjectMeta.ResourceVersion = e.ObjectMeta.ResourceVersion
 	httpTrigger.Spec.Method = "POST"
 	e, err = ei.Update(httpTrigger)
 	panicIf(err)
@@ -287,7 +287,7 @@ func httpTriggerTests(crdClient *rest.RESTClient) {
 	}
 
 	// delete
-	err = ei.Delete(e.Metadata.Name, nil)
+	err = ei.Delete(e.ObjectMeta.Name, nil)
 	panicIf(err)
 
 	// start a watch
@@ -295,10 +295,10 @@ func httpTriggerTests(crdClient *rest.RESTClient) {
 	panicIf(err)
 
 	start := time.Now()
-	httpTrigger.Metadata.ResourceVersion = ""
+	httpTrigger.ObjectMeta.ResourceVersion = ""
 	e, err = ei.Create(httpTrigger)
 	panicIf(err)
-	defer ei.Delete(e.Metadata.Name, nil)
+	defer ei.Delete(e.ObjectMeta.Name, nil)
 
 	// assert that we get a watch event for the new httpTrigger
 	recvd := false
@@ -321,14 +321,14 @@ func httpTriggerTests(crdClient *rest.RESTClient) {
 
 }
 
-func kubernetesWatchTriggerTests(crdClient *rest.RESTClient) {
+func kubernetesWatchTriggerTests(crdClient genv1.V1V1Interface) {
 	// sample kubernetesWatchTrigger object
 	kubernetesWatchTrigger := &fv1.KubernetesWatchTrigger{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "KubernetesWatchTrigger",
 			APIVersion: "fission.io/v1",
 		},
-		Metadata: metav1.ObjectMeta{
+		ObjectMeta: metav1.ObjectMeta{
 			Name:      "hello",
 			Namespace: metav1.NamespaceDefault,
 		},
@@ -346,27 +346,27 @@ func kubernetesWatchTriggerTests(crdClient *rest.RESTClient) {
 	}
 
 	// Test kubernetesWatchTrigger CRUD
-	ei := MakeKubernetesWatchTriggerInterface(crdClient, metav1.NamespaceDefault)
+	ei := crdClient.KubernetesWatchTriggers(metav1.NamespaceDefault)
 
 	// cleanup from old crashed tests, ignore errors
-	ei.Delete(kubernetesWatchTrigger.Metadata.Name, nil)
+	ei.Delete(kubernetesWatchTrigger.ObjectMeta.Name, nil)
 
 	// create
 	e, err := ei.Create(kubernetesWatchTrigger)
 	panicIf(err)
-	if e.Metadata.Name != kubernetesWatchTrigger.Metadata.Name {
+	if e.ObjectMeta.Name != kubernetesWatchTrigger.ObjectMeta.Name {
 		log.Panicf("Bad result from create: %v", e)
 	}
 
 	// read
-	e, err = ei.Get(kubernetesWatchTrigger.Metadata.Name)
+	e, err = ei.Get(kubernetesWatchTrigger.ObjectMeta.Name, metav1.GetOptions{})
 	panicIf(err)
 	if e.Spec.Type != kubernetesWatchTrigger.Spec.Type {
 		log.Panicf("Bad result from Get: %#v", e)
 	}
 
 	// update
-	kubernetesWatchTrigger.Metadata.ResourceVersion = e.Metadata.ResourceVersion
+	kubernetesWatchTrigger.ObjectMeta.ResourceVersion = e.ObjectMeta.ResourceVersion
 	kubernetesWatchTrigger.Spec.Type = "service"
 	e, err = ei.Update(kubernetesWatchTrigger)
 	panicIf(err)
@@ -382,7 +382,7 @@ func kubernetesWatchTriggerTests(crdClient *rest.RESTClient) {
 	}
 
 	// delete
-	err = ei.Delete(e.Metadata.Name, nil)
+	err = ei.Delete(e.ObjectMeta.Name, nil)
 	panicIf(err)
 
 	// start a watch
@@ -390,10 +390,10 @@ func kubernetesWatchTriggerTests(crdClient *rest.RESTClient) {
 	panicIf(err)
 
 	start := time.Now()
-	kubernetesWatchTrigger.Metadata.ResourceVersion = ""
+	kubernetesWatchTrigger.ObjectMeta.ResourceVersion = ""
 	e, err = ei.Create(kubernetesWatchTrigger)
 	panicIf(err)
-	defer ei.Delete(e.Metadata.Name, nil)
+	defer ei.Delete(e.ObjectMeta.Name, nil)
 
 	// assert that we get a watch event for the new kubernetesWatchTrigger
 	recvd := false
@@ -424,27 +424,24 @@ func TestCrd(t *testing.T) {
 		return
 	}
 
-	// Create the client config. Needs the KUBECONFIG env var to
-	// point at a valid kubeconfig.
-	config, _, apiExtClient, err := GetKubernetesClient()
-	panicIf(err)
-
 	logger, err := zap.NewDevelopment()
 	panicIf(err)
 
+	fc, _, apiExtClient, err := MakeFissionClient()
+	if err != nil {
+		panicIf(err)
+	}
+
 	// init our types
 	err = EnsureFissionCRDs(logger, apiExtClient)
 	panicIf(err)
 
+	err = fc.WaitForCRDs()
+	panicIf(err)
+
 	// rest client with knowledge about our crd types
-	crdClient, err := GetCrdClient(config)
-	panicIf(err)
-
-	err = waitForCRDs(crdClient)
-	panicIf(err)
-
-	functionTests(crdClient)
-	environmentTests(crdClient)
-	httpTriggerTests(crdClient)
-	kubernetesWatchTriggerTests(crdClient)
+	functionTests(fc.crdClient.V1V1())
+	environmentTests(fc.crdClient.V1V1())
+	httpTriggerTests(fc.crdClient.V1V1())
+	kubernetesWatchTriggerTests(fc.crdClient.V1V1())
 }

pkg/crd/environment.go

@@ -1,122 +0,0 @@
-/*
-Copyright 2016 The Fission 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 crd
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/rest"
-
-	fv1 "github.com/fission/fission/pkg/apis/fission.io/v1"
-)
-
-type (
-	EnvironmentInterface interface {
-		Create(*fv1.Environment) (*fv1.Environment, error)
-		Get(name string) (*fv1.Environment, error)
-		Update(*fv1.Environment) (*fv1.Environment, error)
-		Delete(name string, options *metav1.DeleteOptions) error
-		List(opts metav1.ListOptions) (*fv1.EnvironmentList, error)
-		Watch(opts metav1.ListOptions) (watch.Interface, error)
-	}
-
-	environmentClient struct {
-		client    *rest.RESTClient
-		namespace string
-	}
-)
-
-func MakeEnvironmentInterface(crdClient *rest.RESTClient, namespace string) EnvironmentInterface {
-	return &environmentClient{
-		client:    crdClient,
-		namespace: namespace,
-	}
-}
-
-func (ec *environmentClient) Create(e *fv1.Environment) (*fv1.Environment, error) {
-	var result fv1.Environment
-	err := ec.client.Post().
-		Resource("environments").
-		Namespace(ec.namespace).
-		Body(e).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (ec *environmentClient) Get(name string) (*fv1.Environment, error) {
-	var result fv1.Environment
-	err := ec.client.Get().
-		Resource("environments").
-		Namespace(ec.namespace).
-		Name(name).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (ec *environmentClient) Update(e *fv1.Environment) (*fv1.Environment, error) {
-	var result fv1.Environment
-	err := ec.client.Put().
-		Resource("environments").
-		Namespace(ec.namespace).
-		Name(e.Metadata.Name).
-		Body(e).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (ec *environmentClient) Delete(name string, opts *metav1.DeleteOptions) error {
-	return ec.client.Delete().
-		Namespace(ec.namespace).
-		Resource("environments").
-		Name(name).
-		Body(opts).
-		Do().
-		Error()
-}
-
-func (ec *environmentClient) List(opts metav1.ListOptions) (*fv1.EnvironmentList, error) {
-	var result fv1.EnvironmentList
-	err := ec.client.Get().
-		Namespace(ec.namespace).
-		Resource("environments").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Do().
-		Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (ec *environmentClient) Watch(opts metav1.ListOptions) (watch.Interface, error) {
-	return ec.client.Get().
-		Prefix("watch").
-		Namespace(ec.namespace).
-		Resource("environments").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Watch()
-}

pkg/crd/function.go

@@ -1,122 +0,0 @@
-/*
-Copyright 2016 The Fission 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 crd
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/rest"
-
-	fv1 "github.com/fission/fission/pkg/apis/fission.io/v1"
-)
-
-type (
-	FunctionInterface interface {
-		Create(*fv1.Function) (*fv1.Function, error)
-		Get(name string) (*fv1.Function, error)
-		Update(*fv1.Function) (*fv1.Function, error)
-		Delete(name string, options *metav1.DeleteOptions) error
-		List(opts metav1.ListOptions) (*fv1.FunctionList, error)
-		Watch(opts metav1.ListOptions) (watch.Interface, error)
-	}
-
-	functionClient struct {
-		client    *rest.RESTClient
-		namespace string
-	}
-)
-
-func MakeFunctionInterface(crdClient *rest.RESTClient, namespace string) FunctionInterface {
-	return &functionClient{
-		client:    crdClient,
-		namespace: namespace,
-	}
-}
-
-func (fc *functionClient) Create(f *fv1.Function) (*fv1.Function, error) {
-	var result fv1.Function
-	err := fc.client.Post().
-		Resource("functions").
-		Namespace(fc.namespace).
-		Body(f).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (fc *functionClient) Get(name string) (*fv1.Function, error) {
-	var result fv1.Function
-	err := fc.client.Get().
-		Resource("functions").
-		Namespace(fc.namespace).
-		Name(name).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (fc *functionClient) Update(f *fv1.Function) (*fv1.Function, error) {
-	var result fv1.Function
-	err := fc.client.Put().
-		Resource("functions").
-		Namespace(fc.namespace).
-		Name(f.Metadata.Name).
-		Body(f).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (fc *functionClient) Delete(name string, opts *metav1.DeleteOptions) error {
-	return fc.client.Delete().
-		Namespace(fc.namespace).
-		Resource("functions").
-		Name(name).
-		Body(opts).
-		Do().
-		Error()
-}
-
-func (fc *functionClient) List(opts metav1.ListOptions) (*fv1.FunctionList, error) {
-	var result fv1.FunctionList
-	err := fc.client.Get().
-		Namespace(fc.namespace).
-		Resource("functions").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Do().
-		Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (fc *functionClient) Watch(opts metav1.ListOptions) (watch.Interface, error) {
-	return fc.client.Get().
-		Prefix("watch").
-		Namespace(fc.namespace).
-		Resource("functions").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Watch()
-}

pkg/crd/httptrigger.go

@@ -1,122 +0,0 @@
-/*
-Copyright 2016 The Fission 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 crd
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/rest"
-
-	fv1 "github.com/fission/fission/pkg/apis/fission.io/v1"
-)
-
-type (
-	HTTPTriggerInterface interface {
-		Create(*fv1.HTTPTrigger) (*fv1.HTTPTrigger, error)
-		Get(name string) (*fv1.HTTPTrigger, error)
-		Update(*fv1.HTTPTrigger) (*fv1.HTTPTrigger, error)
-		Delete(name string, options *metav1.DeleteOptions) error
-		List(opts metav1.ListOptions) (*fv1.HTTPTriggerList, error)
-		Watch(opts metav1.ListOptions) (watch.Interface, error)
-	}
-
-	httpTriggerClient struct {
-		client    *rest.RESTClient
-		namespace string
-	}
-)
-
-func MakeHTTPTriggerInterface(crdClient *rest.RESTClient, namespace string) HTTPTriggerInterface {
-	return &httpTriggerClient{
-		client:    crdClient,
-		namespace: namespace,
-	}
-}
-
-func (c *httpTriggerClient) Create(obj *fv1.HTTPTrigger) (*fv1.HTTPTrigger, error) {
-	var result fv1.HTTPTrigger
-	err := c.client.Post().
-		Resource("httptriggers").
-		Namespace(c.namespace).
-		Body(obj).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (c *httpTriggerClient) Get(name string) (*fv1.HTTPTrigger, error) {
-	var result fv1.HTTPTrigger
-	err := c.client.Get().
-		Resource("httptriggers").
-		Namespace(c.namespace).
-		Name(name).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (c *httpTriggerClient) Update(obj *fv1.HTTPTrigger) (*fv1.HTTPTrigger, error) {
-	var result fv1.HTTPTrigger
-	err := c.client.Put().
-		Resource("httptriggers").
-		Namespace(c.namespace).
-		Name(obj.Metadata.Name).
-		Body(obj).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (c *httpTriggerClient) Delete(name string, opts *metav1.DeleteOptions) error {
-	return c.client.Delete().
-		Namespace(c.namespace).
-		Resource("httptriggers").
-		Name(name).
-		Body(opts).
-		Do().
-		Error()
-}
-
-func (c *httpTriggerClient) List(opts metav1.ListOptions) (*fv1.HTTPTriggerList, error) {
-	var result fv1.HTTPTriggerList
-	err := c.client.Get().
-		Namespace(c.namespace).
-		Resource("httptriggers").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Do().
-		Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (c *httpTriggerClient) Watch(opts metav1.ListOptions) (watch.Interface, error) {
-	return c.client.Get().
-		Prefix("watch").
-		Namespace(c.namespace).
-		Resource("httptriggers").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Watch()
-}

pkg/crd/kubernetesWatchTrigger.go

@@ -1,122 +0,0 @@
-/*
-Copyright 2016 The Fission 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 crd
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/rest"
-
-	fv1 "github.com/fission/fission/pkg/apis/fission.io/v1"
-)
-
-type (
-	KubernetesWatchTriggerInterface interface {
-		Create(*fv1.KubernetesWatchTrigger) (*fv1.KubernetesWatchTrigger, error)
-		Get(name string) (*fv1.KubernetesWatchTrigger, error)
-		Update(*fv1.KubernetesWatchTrigger) (*fv1.KubernetesWatchTrigger, error)
-		Delete(name string, options *metav1.DeleteOptions) error
-		List(opts metav1.ListOptions) (*fv1.KubernetesWatchTriggerList, error)
-		Watch(opts metav1.ListOptions) (watch.Interface, error)
-	}
-
-	kubernetesWatchTriggerClient struct {
-		client    *rest.RESTClient
-		namespace string
-	}
-)
-
-func MakeKubernetesWatchTriggerInterface(crdClient *rest.RESTClient, namespace string) KubernetesWatchTriggerInterface {
-	return &kubernetesWatchTriggerClient{
-		client:    crdClient,
-		namespace: namespace,
-	}
-}
-
-func (c *kubernetesWatchTriggerClient) Create(obj *fv1.KubernetesWatchTrigger) (*fv1.KubernetesWatchTrigger, error) {
-	var result fv1.KubernetesWatchTrigger
-	err := c.client.Post().
-		Resource("kuberneteswatchtriggers").
-		Namespace(c.namespace).
-		Body(obj).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (c *kubernetesWatchTriggerClient) Get(name string) (*fv1.KubernetesWatchTrigger, error) {
-	var result fv1.KubernetesWatchTrigger
-	err := c.client.Get().
-		Resource("kuberneteswatchtriggers").
-		Namespace(c.namespace).
-		Name(name).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (c *kubernetesWatchTriggerClient) Update(obj *fv1.KubernetesWatchTrigger) (*fv1.KubernetesWatchTrigger, error) {
-	var result fv1.KubernetesWatchTrigger
-	err := c.client.Put().
-		Resource("kuberneteswatchtriggers").
-		Namespace(c.namespace).
-		Name(obj.Metadata.Name).
-		Body(obj).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (c *kubernetesWatchTriggerClient) Delete(name string, opts *metav1.DeleteOptions) error {
-	return c.client.Delete().
-		Namespace(c.namespace).
-		Resource("kuberneteswatchtriggers").
-		Name(name).
-		Body(opts).
-		Do().
-		Error()
-}
-
-func (c *kubernetesWatchTriggerClient) List(opts metav1.ListOptions) (*fv1.KubernetesWatchTriggerList, error) {
-	var result fv1.KubernetesWatchTriggerList
-	err := c.client.Get().
-		Namespace(c.namespace).
-		Resource("kuberneteswatchtriggers").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Do().
-		Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (c *kubernetesWatchTriggerClient) Watch(opts metav1.ListOptions) (watch.Interface, error) {
-	return c.client.Get().
-		Prefix("watch").
-		Namespace(c.namespace).
-		Resource("kuberneteswatchtriggers").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Watch()
-}

pkg/crd/messagequeuetrigger.go

@@ -1,122 +0,0 @@
-/*
-Copyright 2016 The Fission 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 crd
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/rest"
-
-	fv1 "github.com/fission/fission/pkg/apis/fission.io/v1"
-)
-
-type (
-	MessageQueueTriggerInterface interface {
-		Create(*fv1.MessageQueueTrigger) (*fv1.MessageQueueTrigger, error)
-		Get(name string) (*fv1.MessageQueueTrigger, error)
-		Update(*fv1.MessageQueueTrigger) (*fv1.MessageQueueTrigger, error)
-		Delete(name string, options *metav1.DeleteOptions) error
-		List(opts metav1.ListOptions) (*fv1.MessageQueueTriggerList, error)
-		Watch(opts metav1.ListOptions) (watch.Interface, error)
-	}
-
-	messageQueueTriggerClient struct {
-		client    *rest.RESTClient
-		namespace string
-	}
-)
-
-func MakeMessageQueueTriggerInterface(crdClient *rest.RESTClient, namespace string) MessageQueueTriggerInterface {
-	return &messageQueueTriggerClient{
-		client:    crdClient,
-		namespace: namespace,
-	}
-}
-
-func (fc *messageQueueTriggerClient) Create(f *fv1.MessageQueueTrigger) (*fv1.MessageQueueTrigger, error) {
-	var result fv1.MessageQueueTrigger
-	err := fc.client.Post().
-		Resource("messagequeuetriggers").
-		Namespace(fc.namespace).
-		Body(f).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (fc *messageQueueTriggerClient) Get(name string) (*fv1.MessageQueueTrigger, error) {
-	var result fv1.MessageQueueTrigger
-	err := fc.client.Get().
-		Resource("messagequeuetriggers").
-		Namespace(fc.namespace).
-		Name(name).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (fc *messageQueueTriggerClient) Update(f *fv1.MessageQueueTrigger) (*fv1.MessageQueueTrigger, error) {
-	var result fv1.MessageQueueTrigger
-	err := fc.client.Put().
-		Resource("messagequeuetriggers").
-		Namespace(fc.namespace).
-		Name(f.Metadata.Name).
-		Body(f).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (fc *messageQueueTriggerClient) Delete(name string, opts *metav1.DeleteOptions) error {
-	return fc.client.Delete().
-		Namespace(fc.namespace).
-		Resource("messagequeuetriggers").
-		Name(name).
-		Body(opts).
-		Do().
-		Error()
-}
-
-func (fc *messageQueueTriggerClient) List(opts metav1.ListOptions) (*fv1.MessageQueueTriggerList, error) {
-	var result fv1.MessageQueueTriggerList
-	err := fc.client.Get().
-		Namespace(fc.namespace).
-		Resource("messagequeuetriggers").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Do().
-		Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (fc *messageQueueTriggerClient) Watch(opts metav1.ListOptions) (watch.Interface, error) {
-	return fc.client.Get().
-		Prefix("watch").
-		Namespace(fc.namespace).
-		Resource("messagequeuetriggers").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Watch()
-}

pkg/crd/package.go

@@ -1,122 +0,0 @@
-/*
-Copyright 2016 The Fission 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 crd
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/rest"
-
-	fv1 "github.com/fission/fission/pkg/apis/fission.io/v1"
-)
-
-type (
-	PackageInterface interface {
-		Create(*fv1.Package) (*fv1.Package, error)
-		Get(name string) (*fv1.Package, error)
-		Update(*fv1.Package) (*fv1.Package, error)
-		Delete(name string, options *metav1.DeleteOptions) error
-		List(opts metav1.ListOptions) (*fv1.PackageList, error)
-		Watch(opts metav1.ListOptions) (watch.Interface, error)
-	}
-
-	packageClient struct {
-		client    *rest.RESTClient
-		namespace string
-	}
-)
-
-func MakePackageInterface(crdClient *rest.RESTClient, namespace string) PackageInterface {
-	return &packageClient{
-		client:    crdClient,
-		namespace: namespace,
-	}
-}
-
-func (c *packageClient) Create(f *fv1.Package) (*fv1.Package, error) {
-	var result fv1.Package
-	err := c.client.Post().
-		Resource("packages").
-		Namespace(c.namespace).
-		Body(f).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (c *packageClient) Get(name string) (*fv1.Package, error) {
-	var result fv1.Package
-	err := c.client.Get().
-		Resource("packages").
-		Namespace(c.namespace).
-		Name(name).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (c *packageClient) Update(f *fv1.Package) (*fv1.Package, error) {
-	var result fv1.Package
-	err := c.client.Put().
-		Resource("packages").
-		Namespace(c.namespace).
-		Name(f.Metadata.Name).
-		Body(f).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (c *packageClient) Delete(name string, opts *metav1.DeleteOptions) error {
-	return c.client.Delete().
-		Namespace(c.namespace).
-		Resource("packages").
-		Name(name).
-		Body(opts).
-		Do().
-		Error()
-}
-
-func (c *packageClient) List(opts metav1.ListOptions) (*fv1.PackageList, error) {
-	var result fv1.PackageList
-	err := c.client.Get().
-		Namespace(c.namespace).
-		Resource("packages").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Do().
-		Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (c *packageClient) Watch(opts metav1.ListOptions) (watch.Interface, error) {
-	return c.client.Get().
-		Prefix("watch").
-		Namespace(c.namespace).
-		Resource("packages").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Watch()
-}

pkg/crd/timetrigger.go

@@ -1,122 +0,0 @@
-/*
-Copyright 2016 The Fission 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 crd
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/rest"
-
-	fv1 "github.com/fission/fission/pkg/apis/fission.io/v1"
-)
-
-type (
-	TimeTriggerInterface interface {
-		Create(*fv1.TimeTrigger) (*fv1.TimeTrigger, error)
-		Get(name string) (*fv1.TimeTrigger, error)
-		Update(*fv1.TimeTrigger) (*fv1.TimeTrigger, error)
-		Delete(name string, options *metav1.DeleteOptions) error
-		List(opts metav1.ListOptions) (*fv1.TimeTriggerList, error)
-		Watch(opts metav1.ListOptions) (watch.Interface, error)
-	}
-
-	timeTriggerClient struct {
-		client    *rest.RESTClient
-		namespace string
-	}
-)
-
-func MakeTimeTriggerInterface(crdClient *rest.RESTClient, namespace string) TimeTriggerInterface {
-	return &timeTriggerClient{
-		client:    crdClient,
-		namespace: namespace,
-	}
-}
-
-func (fc *timeTriggerClient) Create(f *fv1.TimeTrigger) (*fv1.TimeTrigger, error) {
-	var result fv1.TimeTrigger
-	err := fc.client.Post().
-		Resource("timetriggers").
-		Namespace(fc.namespace).
-		Body(f).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (fc *timeTriggerClient) Get(name string) (*fv1.TimeTrigger, error) {
-	var result fv1.TimeTrigger
-	err := fc.client.Get().
-		Resource("timetriggers").
-		Namespace(fc.namespace).
-		Name(name).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (fc *timeTriggerClient) Update(f *fv1.TimeTrigger) (*fv1.TimeTrigger, error) {
-	var result fv1.TimeTrigger
-	err := fc.client.Put().
-		Resource("timetriggers").
-		Namespace(fc.namespace).
-		Name(f.Metadata.Name).
-		Body(f).
-		Do().Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (fc *timeTriggerClient) Delete(name string, opts *metav1.DeleteOptions) error {
-	return fc.client.Delete().
-		Namespace(fc.namespace).
-		Resource("timetriggers").
-		Name(name).
-		Body(opts).
-		Do().
-		Error()
-}
-
-func (fc *timeTriggerClient) List(opts metav1.ListOptions) (*fv1.TimeTriggerList, error) {
-	var result fv1.TimeTriggerList
-	err := fc.client.Get().
-		Namespace(fc.namespace).
-		Resource("timetriggers").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Do().
-		Into(&result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func (fc *timeTriggerClient) Watch(opts metav1.ListOptions) (watch.Interface, error) {
-	return fc.client.Get().
-		Prefix("watch").
-		Namespace(fc.namespace).
-		Resource("timetriggers").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Watch()
-}