Modify API and Generate Addon API clientset/lister/informers

Dockerfile

@@ -12,7 +12,7 @@ ADD go.sum .
 RUN go mod download
 
 COPY pkg/ pkg/
-COPY api/ api/
+COPY apis/ apis/
 COPY cmd/ cmd/
 COPY controllers/ controllers/
 COPY main.go main.go

Makefile

@@ -26,8 +26,24 @@ GO111MODULE=on
 all: test manager addonctl
 
 # Run tests
-test: generate fmt vet manifests
-	go test ./api/... ./controllers/... ./pkg/... ./cmd/... -coverprofile cover.out
+.PHONY: test
+test: test.controllers test.e2e test.pkg test.cmd
+
+.PHONY: test.controllers
+test.controllers:
+	go test -v -race ./controllers/... -coverprofile cover.out
+
+.PHONY: test.e2e
+test.e2e:
+	go test -v -race ./e2e/... -coverprofile cover.out
+
+.PHONY: test.pkg
+test.pkg:
+	go test -v -race ./pkg/... -coverprofile cover.out
+
+.PHONY: test.cmd
+test.pkg:
+	go test -v -race ./cmd/... -coverprofile cover.out
 
 # Run E2E tests
 bdd: fmt vet deploy
@@ -96,7 +112,7 @@ vet:
 
 # Generate code
 generate: controller-gen
-	$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./api/...
+	$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./apis/addon/...
 
 # Build the docker image
 docker-build: manager
@@ -130,3 +146,10 @@ CONTROLLER_GEN=$(GOBIN)/controller-gen
 else
 CONTROLLER_GEN=$(shell which controller-gen)
 endif
+
+code-generator:
+  bash $(GOPATH)/src/k8s.io/[email protected]/generate-groups.sh \
+	"deepcopy,client,informer,lister" \
+	github.com/keikoproj/addon-manager/pkg/client github.com/keikoproj/addon-manager/apis\
+	addon:v1alpha1 \
+	--go-header-file ./hack/custom.go.txt

apis/addon/register.go

@@ -0,0 +1,19 @@
+package addon
+
+import "time"
+
+// Addon constants
+const (
+	Group          string = "addonmgr.keikoproj.io"
+	Version        string = "v1alpha1"
+	APIVersion     string = Group + "/" + Version
+	AddonKind      string = "Addon"
+	AddonSingular  string = "addon"
+	AddonPlural    string = "addons"
+	AddonShortName string = "addon"
+	AddonFullName  string = AddonPlural + "." + Group
+
+	ManagedNameSpace string = "addon-manager-system"
+
+	AddonResyncPeriod = 20 * time.Minute
+)

api/v1alpha1/addon_types.go → apis/addon/v1alpha1/addon_types.go

@@ -151,6 +151,8 @@ const (
 	Deleting ApplicationAssemblyPhase = "Deleting"
 	// DeleteFailed Used to indicate that delete failed.
 	DeleteFailed ApplicationAssemblyPhase = "Delete Failed"
+	// Error used to indicate system error
+	Error ApplicationAssemblyPhase = "error"
 )
 
 // DeploymentPhase represents the status of observed resources
@@ -281,8 +283,8 @@ type AddonStatus struct {
 	StartTime int64                `json:"starttime"`
 }
 
+// AddonList contains a list of Addon
 // +kubebuilder:object:root=true
-
 // Addon is the Schema for the addons API
 // +k8s:openapi-gen=true
 // +kubebuilder:subresource:status
@@ -292,6 +294,8 @@ type AddonStatus struct {
 // +kubebuilder:printcolumn:name="STATUS",type="string",JSONPath=".status.lifecycle.installed"
 // +kubebuilder:printcolumn:name="REASON",type="string",JSONPath=".status.reason"
 // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp"
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type Addon struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -301,18 +305,13 @@ type Addon struct {
 }
 
 // +kubebuilder:object:root=true
-
-// AddonList contains a list of Addon
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type AddonList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []Addon `json:"items"`
 }
 
-func init() {
-	SchemeBuilder.Register(&Addon{}, &AddonList{})
-}
-
 // GetPackageSpec returns the addon package details from addon spec
 func (a *Addon) GetPackageSpec() PackageSpec {
 	return PackageSpec{

apis/addon/v1alpha1/doc.go

@@ -0,0 +1,3 @@
+// +k8s:deepcopy-gen=package
+// +groupName=addonmgr.keikoproj.io
+package v1alpha1

apis/addon/v1alpha1/register.go

@@ -0,0 +1,42 @@
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// SchemeGroupVersion is group version used to register these objects
+var (
+	SchemeGroupVersion          = schema.GroupVersion{Group: "addonmgr.keikoproj.io", Version: "v1alpha1"}
+	AddonSchemaGroupVersionKind = schema.GroupVersionKind{Group: "addonmgr.keikoproj.io", Version: "v1alpha1", Kind: "Addon"}
+)
+
+// Kind takes an unqualified kind and returns back a Group qualified GroupKind
+func Kind(kind string) schema.GroupKind {
+	return SchemeGroupVersion.WithKind(kind).GroupKind()
+}
+
+// Resource takes an unqualified resource and returns a Group-qualified GroupResource.
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}
+
+var (
+
+	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+
+	// AddToScheme adds the types in this group-version to the given scheme.
+	AddToScheme = SchemeBuilder.AddToScheme
+)
+
+// addKnownTypes adds the set of types defined in this package to the supplied scheme.
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(SchemeGroupVersion,
+		&Addon{},
+		&AddonList{},
+	)
+	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
+	return nil
+}

controllers/addon_controller.go

@@ -46,7 +46,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/api/v1alpha1"
+	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/apis/addon/v1alpha1"
 	"github.com/keikoproj/addon-manager/pkg/addon"
 	"github.com/keikoproj/addon-manager/pkg/common"
 	"github.com/keikoproj/addon-manager/pkg/workflows"

controllers/addon_controller_test.go

@@ -16,7 +16,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/scheme"
 
-	"github.com/keikoproj/addon-manager/api/v1alpha1"
+	"github.com/keikoproj/addon-manager/apis/addon/v1alpha1"
 )
 
 var (

controllers/objects.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/api/v1alpha1"
+	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/apis/addon/v1alpha1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	appsv1 "k8s.io/api/apps/v1"

controllers/suite_test.go

@@ -33,7 +33,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/api/v1alpha1"
+	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/apis/addon/v1alpha1"
 	// +kubebuilder:scaffold:imports
 )