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,25 @@ 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:
+	go test -v -race ./controllers/... ./apis/addon/... ./pkg/... ./cmd/... -coverprofile cover.out
+
+.PHONY: test.controllers
+test.controllers:
+	go test -v -race ./controllers/... -coverprofile cover.out
+
+.PHONY: test.api
+test.api:
+	go test -v -race ./apis/addon/... -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
@@ -95,8 +112,13 @@ vet:
 	go vet ./...
 
 # Generate code
-generate: controller-gen
-	$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./api/...
+generate: controller-gen code-generator
+	$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./apis/addon/...
+	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-boilerplate.go.txt
 
 # Build the docker image
 docker-build: manager
@@ -130,3 +152,15 @@ CONTROLLER_GEN=$(GOBIN)/controller-gen
 else
 CONTROLLER_GEN=$(shell which controller-gen)
 endif
+
+code-generator:
+ifeq (, $(shell which code-generator))
+	@{ \
+	set -e ;\
+	CODE_GENERATOR_DIR=$$(mkdir -p $(GOPATH)/src/k8s.io/) ;\
+	cd $$CODE_GENERATOR_DIR ;\
+	go get github.com/kubernetes/[email protected] ;\
+	}
+endif
+
+

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{

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

@@ -26,41 +26,41 @@ import (
 )
 
 var wfSpecTemplate = `
-apiVersion: argoproj.io/v1alpha1
-kind: Workflow
-metadata:
-  generateName: scripts-python-
-spec:
-  entrypoint: python-script-example
-  templates:
-    - name: python-script-example
-      steps:
-        - - name: generate
-            template: gen-random-int
-        - - name: print
-            template: print-message
-            arguments:
-              parameters:
-                - name: message
-                  value: "{{steps.generate.outputs.result}}"
-
-    - name: gen-random-int
-      script:
-        image: python:alpine3.6
-        command: [python]
-        source: |
-          import random
-          i = random.randint(1, 100)
-          print(i)
-    - name: print-message
-      inputs:
-        parameters:
-          - name: message
-      container:
-        image: alpine:latest
-        command: [sh, -c]
-        args: ["echo result was: {{inputs.parameters.message}}"]
-`
+ apiVersion: argoproj.io/v1alpha1
+ kind: Workflow
+ metadata:
+   generateName: scripts-python-
+ spec:
+   entrypoint: python-script-example
+   templates:
+	 - name: python-script-example
+	   steps:
+		 - - name: generate
+			 template: gen-random-int
+		 - - name: print
+			 template: print-message
+			 arguments:
+			   parameters:
+				 - name: message
+				   value: "{{steps.generate.outputs.result}}"
+ 
+	 - name: gen-random-int
+	   script:
+		 image: python:alpine3.6
+		 command: [python]
+		 source: |
+		   import random
+		   i = random.randint(1, 100)
+		   print(i)
+	 - name: print-message
+	   inputs:
+		 parameters:
+		   - name: message
+	   container:
+		 image: alpine:latest
+		 command: [sh, -c]
+		 args: ["echo result was: {{inputs.parameters.message}}"]
+ `
 
 // These tests are written in BDD-style using Ginkgo framework. Refer to
 // http://onsi.github.io/ginkgo to learn more.

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,23 @@
+package v1alpha1
+
+import (
+	"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()
+}
+
+// Compitability, temp revert

api/v1alpha1/suite_test.go → apis/addon/v1alpha1/suit_test.go

@@ -53,7 +53,7 @@ var _ = BeforeSuite(func(done Done) {
 		CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},
 	}
 
-	err := SchemeBuilder.AddToScheme(scheme.Scheme)
+	err := AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
 
 	cfg, err = testEnv.Start()

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
 )
 

main.go

@@ -24,7 +24,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
-	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/api/v1alpha1"
+	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/apis/addon/v1alpha1"
 	"github.com/keikoproj/addon-manager/controllers"
 	"github.com/keikoproj/addon-manager/pkg/common"
 	"github.com/keikoproj/addon-manager/pkg/version"

pkg/addon/addon_validator.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/dynamic"
 
-	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/api/v1alpha1"
+	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/apis/addon/v1alpha1"
 	"github.com/keikoproj/addon-manager/pkg/common"
 )
 

pkg/addon/addon_validator_test.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/dynamic/fake"
 
-	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/api/v1alpha1"
+	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/apis/addon/v1alpha1"
 )
 
 var dynClient = fake.NewSimpleDynamicClient(runtime.NewScheme())

pkg/addon/addon_version_cache.go

@@ -15,9 +15,10 @@
 package addon
 
 import (
-	"github.com/Masterminds/semver/v3"
-	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/api/v1alpha1"
 	"sync"
+
+	"github.com/Masterminds/semver/v3"
+	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/apis/addon/v1alpha1"
 )
 
 // VersionCacheClient interface clients must implement for addon version cache.

pkg/addon/addon_version_cache_test.go

@@ -18,7 +18,7 @@ import (
 	"reflect"
 	"testing"
 
-	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/api/v1alpha1"
+	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/apis/addon/v1alpha1"
 )
 
 func TestNewCachedClient(t *testing.T) {

pkg/addonctl/addonctl.go

@@ -35,7 +35,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
-	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/api/v1alpha1"
+	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/apis/addon/v1alpha1"
 	"github.com/keikoproj/addon-manager/pkg/common"
 	"github.com/keikoproj/addon-manager/pkg/version"
 	"github.com/keikoproj/addon-manager/pkg/workflows"