add comment marker into api; generate addon clientset/lister/informers

Makefile

@@ -27,7 +27,20 @@ all: test manager addonctl
 
 # Run tests
 test: generate fmt vet manifests
-	go test ./api/... ./controllers/... ./pkg/... ./cmd/... -coverprofile cover.out
+	go test ./api/... ./controllers/... ./pkg/... ./cmd/... -v -coverprofile cover.out
+
+# tests both controllers and api
+.PHONY: test.controllers
+test.controllers:
+	go test -v -race ./controllers/... -coverprofile cover.out
+
+.PHONY: test.pkg
+test.pkg:
+	go test -v -race ./pkg/... -coverprofile cover.out
+
+.PHONY: test.cmd
+test.cmd:
+	go test -v -race ./cmd/... -coverprofile cover.out
 
 # Run E2E tests
 bdd: fmt vet deploy
@@ -95,9 +108,22 @@ vet:
 	go vet ./...
 
 # Generate code
-generate: controller-gen
+generate: controller-gen types
 	$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./api/...
 
+# generates many other files (listers, informers, client etc).
+api/addon/v1alpha1/zz_generated.deepcopy.go: $(TYPES)
+	ln -s v1
+	$(CODE_GENERATOR_GEN)/generate-groups.sh \
+			"deepcopy,client,informer,lister" \
+			github.com/keikoproj/addon-manager/pkg/client github.com/keikoproj/addon-manager/api\
+            addon:v1alpha1 \
+            --go-header-file ./hack/custom-boilerplate.go.txt
+	rm -rf v1
+
+.PHONY: types
+types: api/addon/v1alpha1/zz_generated.deepcopy.go
+
 # Build the docker image
 docker-build: manager
 	docker build --build-arg COMMIT=${GIT_COMMIT} --build-arg DATE=${BUILD_DATE} -t ${IMG} .
@@ -130,3 +156,16 @@ CONTROLLER_GEN=$(GOBIN)/controller-gen
 else
 CONTROLLER_GEN=$(shell which controller-gen)
 endif
+
+code-generator:
+ifeq (, $(shell which code-generator))
+	@{ \
+	cd $(GOBIN) ;\
+	curl -L -o code-generator.zip https://github.com/kubernetes/code-generator/archive/refs/tags/v0.21.5.zip ;\
+	unzip code-generator.zip ;\
+	rm -rf code-generator.zip ;\
+	}
+CODE_GENERATOR_GEN=$(GOBIN)/code-generator-0.21.5
+else
+CODE_GENERATOR_GEN=$(shell which code-generator)
+endif

api/addon/register.go

@@ -0,0 +1 @@
+package addon

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

@@ -292,6 +292,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 +303,14 @@ type Addon struct {
 }
 
 // +kubebuilder:object:root=true
-
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // AddonList contains a list of Addon
 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{

api/addon/v1alpha1/doc.go

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

api/addon/v1alpha1/register.go

@@ -0,0 +1,56 @@
+/*
+ * 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 v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "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/api/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/api/addon/v1alpha1"
 )
 
 var (