Use kubernetes/code-generator

api/annotations.go → apis/voyager/annotations.go

@@ -1,4 +1,4 @@
-package api
+package voyager
 
 import (
 	"encoding/json"

api/annotations_test.go → apis/voyager/annotations_test.go

@@ -1,4 +1,4 @@
-package api
+package voyager
 
 import (
 	"testing"

api/certificate.go → apis/voyager/certificate.go

@@ -1,4 +1,4 @@
-package api
+package voyager
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -11,6 +11,9 @@ const (
 	ResourceTypeCertificate = "certificates"
 )
 
+// +genclient=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
 type Certificate struct {
 	metav1.TypeMeta   `json:",inline,omitempty"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -58,6 +61,8 @@ type ACMECertificateDetails struct {
 	AccountRef    string `json:"accountRef,omitempty"`
 }
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
 type CertificateList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`

apis/voyager/conversion_v1beta1.go

@@ -0,0 +1,41 @@
+package voyager
+
+import (
+	"encoding/json"
+
+	extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
+)
+
+func NewEngressFromIngress(ing interface{}) (*Ingress, error) {
+	data, err := json.Marshal(ing)
+	if err != nil {
+		return nil, err
+	}
+	r := &Ingress{}
+	err = json.Unmarshal(data, r)
+	if err != nil {
+		return nil, err
+	}
+	if r.Annotations == nil {
+		r.Annotations = make(map[string]string)
+	}
+	r.Annotations[APISchema] = APISchemaIngress
+	return r, nil
+}
+
+func NewIngressFromEngress(ing interface{}) (*extensions.Ingress, error) {
+	data, err := json.Marshal(ing)
+	if err != nil {
+		return nil, err
+	}
+	r := &extensions.Ingress{}
+	err = json.Unmarshal(data, r)
+	if err != nil {
+		return nil, err
+	}
+	if r.Annotations == nil {
+		r.Annotations = make(map[string]string)
+	}
+	r.Annotations[APISchema] = APISchemaEngress
+	return r, nil
+}

api/diff.go → apis/voyager/diff.go

@@ -1,4 +1,4 @@
-package api
+package voyager
 
 import (
 	"errors"

api/diff_test.go → apis/voyager/diff_test.go

@@ -1,4 +1,4 @@
-package api
+package voyager
 
 import (
 	"testing"

api/dns_resolver.go → apis/voyager/dns_resolver.go

@@ -1,4 +1,4 @@
-package api
+package voyager
 
 import (
 	"fmt"

apis/voyager/doc.go

@@ -0,0 +1,5 @@
+// Package voyager is the internal version of the API.
+
+// +k8s:deepcopy-gen=package,register
+// +groupName=voyager.appscode.com
+package voyager

api/ingress.go → apis/voyager/ingress.go

@@ -1,4 +1,4 @@
-package api
+package voyager
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -12,6 +12,9 @@ const (
 	ResourceTypeIngress = "ingresses"
 )
 
+// +genclient=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
 // Custom Ingress type for Voyager.
 type Ingress struct {
 	metav1.TypeMeta `json:",inline"`
@@ -28,6 +31,8 @@ type Ingress struct {
 	Status IngressStatus `json:"status,omitempty"`
 }
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
 // IngressList is a collection of Ingress.
 type IngressList struct {
 	metav1.TypeMeta `json:",inline"`

apis/voyager/install/install.go

@@ -0,0 +1,26 @@
+package install
+
+import (
+	sapi "github.com/appscode/voyager/apis/voyager"
+	"github.com/appscode/voyager/apis/voyager/v1beta1"
+	"k8s.io/apimachinery/pkg/apimachinery/announced"
+	"k8s.io/apimachinery/pkg/apimachinery/registered"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+// Install registers the API group and adds types to a scheme
+func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) {
+	if err := announced.NewGroupMetaFactory(
+		&announced.GroupMetaFactoryArgs{
+			GroupName:                  sapi.GroupName,
+			VersionPreferenceOrder:     []string{v1beta1.SchemeGroupVersion.Version},
+			ImportPrefix:               "github.com/appscode/voyager/apis/voyager",
+			AddInternalObjectsToScheme: sapi.AddToScheme,
+		},
+		announced.VersionToSchemeFunc{
+			v1beta1.SchemeGroupVersion.Version: v1beta1.AddToScheme,
+		},
+	).Announce(groupFactoryRegistry).RegisterAndEnable(registry, scheme); err != nil {
+		panic(err)
+	}
+}

api/monitor.go → apis/voyager/monitor.go

@@ -1,4 +1,4 @@
-package api
+package voyager
 
 import (
 	"fmt"

api/port.go → apis/voyager/port.go

@@ -1,4 +1,4 @@
-package api
+package voyager
 
 import (
 	"fmt"

api/register.go → apis/voyager/register.go

@@ -1,4 +1,4 @@
-package api
+package voyager
 
 import (
 	"k8s.io/apimachinery/pkg/runtime"
@@ -11,12 +11,12 @@ const GroupName = "voyager.appscode.com"
 // SchemeGroupVersion is group version used to register these objects
 var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal}
 
-// Kind takes an unqualified kind and returns back a Group qualified GroupKind
+// Kind takes an unqualified kind and returns a Group qualified GroupKind
 func Kind(kind string) schema.GroupKind {
 	return SchemeGroupVersion.WithKind(kind).GroupKind()
 }
 
-// Resource takes an unqualified resource and returns back a Group qualified GroupResource
+// Resource takes an unqualified resource and returns a Group qualified GroupResource
 func Resource(resource string) schema.GroupResource {
 	return SchemeGroupVersion.WithResource(resource).GroupResource()
 }
@@ -26,20 +26,14 @@ var (
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to apiv1.Scheme.
+// Adds the list of known types to api.Scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
-		&Ingress{},
-		&IngressList{},
-
 		&Certificate{},
 		&CertificateList{},
+
+		&Ingress{},
+		&IngressList{},
 	)
 	return nil
 }
-
-func (r *Ingress) GetObjectKind() schema.ObjectKind       { return &r.TypeMeta }
-func (obj *IngressList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
-
-func (obj *Certificate) GetObjectKind() schema.ObjectKind     { return &obj.TypeMeta }
-func (obj *CertificateList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }