Follow kubernetes APIs directory structure (#1497)

pkg/crd/client.go

@@ -28,13 +28,12 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
-	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"
+	genClientset "github.com/fission/fission/pkg/apis/genclient/clientset/versioned"
 )
 
 type (
 	FissionClient struct {
-		crdClient clientset.Interface
+		genClientset.Interface
 	}
 )
 
@@ -81,28 +80,21 @@ func MakeFissionClient() (*FissionClient, *kubernetes.Clientset, *apiextensionsc
 	}
 
 	// make a CRD REST client with the config
-	crdClient, err := clientset.NewForConfig(config)
+	crdClient, err := genClientset.NewForConfig(config)
 	if err != nil {
 		return nil, nil, nil, err
 	}
 
 	fc := &FissionClient{
-		crdClient: crdClient,
+		Interface: crdClient,
 	}
 	return fc, kubeClient, apiExtClient, nil
 }
 
-// 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 := fc.crdClient.V1V1().Functions(metav1.NamespaceDefault)
+		fi := fc.CoreV1().Functions(metav1.NamespaceDefault)
 		_, err := fi.List(metav1.ListOptions{})
 		if err != nil {
 			time.Sleep(100 * time.Millisecond)

pkg/crd/crd_test.go

@@ -25,8 +25,8 @@ import (
 	"go.uber.org/zap"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	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"
+	fv1 "github.com/fission/fission/pkg/apis/core/v1"
+	genInformerCoreV1 "github.com/fission/fission/pkg/apis/genclient/clientset/versioned/typed/core/v1"
 )
 
 func panicIf(err error) {
@@ -35,7 +35,7 @@ func panicIf(err error) {
 	}
 }
 
-func functionTests(crdClient genv1.V1V1Interface) {
+func functionTests(crdClient genInformerCoreV1.CoreV1Interface) {
 	// sample function object
 	function := &fv1.Function{
 		TypeMeta: metav1.TypeMeta{
@@ -135,7 +135,7 @@ func functionTests(crdClient genv1.V1V1Interface) {
 
 }
 
-func environmentTests(crdClient genv1.V1V1Interface) {
+func environmentTests(crdClient genInformerCoreV1.CoreV1Interface) {
 	// sample environment object
 	environment := &fv1.Environment{
 		TypeMeta: metav1.TypeMeta{
@@ -229,7 +229,7 @@ func environmentTests(crdClient genv1.V1V1Interface) {
 
 }
 
-func httpTriggerTests(crdClient genv1.V1V1Interface) {
+func httpTriggerTests(crdClient genInformerCoreV1.CoreV1Interface) {
 	// sample httpTrigger object
 	httpTrigger := &fv1.HTTPTrigger{
 		TypeMeta: metav1.TypeMeta{
@@ -321,7 +321,7 @@ func httpTriggerTests(crdClient genv1.V1V1Interface) {
 
 }
 
-func kubernetesWatchTriggerTests(crdClient genv1.V1V1Interface) {
+func kubernetesWatchTriggerTests(crdClient genInformerCoreV1.CoreV1Interface) {
 	// sample kubernetesWatchTrigger object
 	kubernetesWatchTrigger := &fv1.KubernetesWatchTrigger{
 		TypeMeta: metav1.TypeMeta{
@@ -440,8 +440,8 @@ func TestCrd(t *testing.T) {
 	panicIf(err)
 
 	// rest client with knowledge about our crd types
-	functionTests(fc.crdClient.V1V1())
-	environmentTests(fc.crdClient.V1V1())
-	httpTriggerTests(fc.crdClient.V1V1())
-	kubernetesWatchTriggerTests(fc.crdClient.V1V1())
+	functionTests(fc.CoreV1())
+	environmentTests(fc.CoreV1())
+	httpTriggerTests(fc.CoreV1())
+	kubernetesWatchTriggerTests(fc.CoreV1())
 }