Changes: align with pr #116

Signed-off-by: jhu02 <[email protected]>
keikoproj · Feb 27, 2022 · 3e2f1cf · 3e2f1cf
1 parent dbc6104
commit 3e2f1cf
Show file tree

Hide file tree

Showing 31 changed files with 63 additions and 327 deletions.
diff --git a/pkg/apis/addon/register.go → api/addon/register.go b/pkg/apis/addon/register.go → api/addon/register.go
diff --git a/pkg/apis/addon/v1alpha1/addon_types.go → api/addon/v1alpha1/addon_types.go b/pkg/apis/addon/v1alpha1/addon_types.go → api/addon/v1alpha1/addon_types.go
@@ -123,6 +123,8 @@ const (
 	CnabPkg PackageType = "cnab"
 	// CompositePkg is a package type representing a composite package structure, just yamls
 	CompositePkg PackageType = "composite"
+	// Error used to indicate system error
+	Error ApplicationAssemblyPhase = "error"
 )
 
 // CmdType represents a function that can be performed with arguments
@@ -151,8 +153,6 @@ 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
@@ -283,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
@@ -306,6 +306,7 @@ 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"`
@@ -383,22 +384,6 @@ func (a *Addon) GetInstallStatus() ApplicationAssemblyPhase {
 	return a.Status.Lifecycle.Installed
 }
 
-// GetInstallStatus returns the install phase for addon
-func (a *Addon) GetPrereqStatus() ApplicationAssemblyPhase {
-	return a.Status.Lifecycle.Prereqs
-}
-
-// NotTriggered indicate the workflow not triggered
-// Pending,Running are triggered
-func (p ApplicationAssemblyPhase) NotTriggered() bool {
-	switch p {
-	case Succeeded, Failed, Error, "":
-		return true
-	default:
-		return false
-	}
-}
-
 func (p ApplicationAssemblyPhase) Succeeded() bool {
 	switch p {
 	case Succeeded:

diff --git a/pkg/apis/addon/v1alpha1/doc.go → api/addon/v1alpha1/doc.go b/pkg/apis/addon/v1alpha1/doc.go → api/addon/v1alpha1/doc.go
diff --git a/pkg/apis/addon/v1alpha1/register.go → api/addon/v1alpha1/register.go b/pkg/apis/addon/v1alpha1/register.go → api/addon/v1alpha1/register.go
@@ -1,8 +1,22 @@
+/*
+ * 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"
-	"k8s.io/apimachinery/pkg/runtime"
+	runtime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 

diff --git a/...s/addon/v1alpha1/zz_generated.deepcopy.go → api/addon/v1alpha1/zz_generated.deepcopy.go b/...s/addon/v1alpha1/zz_generated.deepcopy.go → api/addon/v1alpha1/zz_generated.deepcopy.go
diff --git a/controllers/addonController.go b/controllers/addonController.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	addonapiv1 "github.com/keikoproj/addon-manager/pkg/apis/addon"
+	addonapiv1 "github.com/keikoproj/addon-manager/api/addon"
 	addonv1versioned "github.com/keikoproj/addon-manager/pkg/client/clientset/versioned"
 	"github.com/keikoproj/addon-manager/pkg/utils"
 
@@ -96,6 +96,7 @@ func Start(namespace string) {
 	} else {
 		kubeClient = utils.GetClient()
 	}
+
 	dynCli, err := dynamic.NewForConfig(cfg)
 	if err != nil {
 		panic(err)

diff --git a/controllers/addonHandlers.go b/controllers/addonHandlers.go
@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"strings"
 
-	addonv1 "github.com/keikoproj/addon-manager/pkg/apis/addon/v1alpha1"
+	addonv1 "github.com/keikoproj/addon-manager/api/addon/v1alpha1"
 	"github.com/keikoproj/addon-manager/pkg/common"
 	"github.com/keikoproj/addon-manager/pkg/workflows"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	addonapiv1 "github.com/keikoproj/addon-manager/api/addon"
 	addoninternal "github.com/keikoproj/addon-manager/pkg/addon"
-	addonapiv1 "github.com/keikoproj/addon-manager/pkg/apis/addon"
 )
 
 func (c *Controller) handleAddonCreation(ctx context.Context, addon *addonv1.Addon) error {

diff --git a/controllers/addonUpdate.go b/controllers/addonUpdate.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
-	addonv1 "github.com/keikoproj/addon-manager/pkg/apis/addon/v1alpha1"
+	addonv1 "github.com/keikoproj/addon-manager/api/addon/v1alpha1"
 	"github.com/keikoproj/addon-manager/pkg/common"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/controllers/addon_types_test.go b/controllers/addon_types_test.go
@@ -20,7 +20,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/pkg/apis/addon/v1alpha1"
+	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/api/addon/v1alpha1"
 	fakeAddonCli "github.com/keikoproj/addon-manager/pkg/client/clientset/versioned/fake"
 	"golang.org/x/net/context"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/controllers/controller.go b/controllers/controller.go
@@ -14,8 +14,8 @@ import (
 	informers "github.com/argoproj/argo-workflows/v3/pkg/client/informers/externalversions"
 	v1alpha1 "github.com/argoproj/argo-workflows/v3/pkg/client/informers/externalversions/workflow/v1alpha1"
 
-	"github.com/keikoproj/addon-manager/pkg/apis/addon"
-	addonv1 "github.com/keikoproj/addon-manager/pkg/apis/addon/v1alpha1"
+	"github.com/keikoproj/addon-manager/api/addon"
+	addonv1 "github.com/keikoproj/addon-manager/api/addon/v1alpha1"
 	addonv1versioned "github.com/keikoproj/addon-manager/pkg/client/clientset/versioned"
 	"github.com/keikoproj/addon-manager/pkg/client/clientset/versioned/scheme"
 	addonv1informers "github.com/keikoproj/addon-manager/pkg/client/informers/externalversions"

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

diff --git a/controllers/resourceHandlers.go b/controllers/resourceHandlers.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	addonapiv1 "github.com/keikoproj/addon-manager/pkg/apis/addon"
-	addonv1 "github.com/keikoproj/addon-manager/pkg/apis/addon/v1alpha1"
+	addonapiv1 "github.com/keikoproj/addon-manager/api/addon"
+	addonv1 "github.com/keikoproj/addon-manager/api/addon/v1alpha1"
 	appsv1 "k8s.io/api/apps/v1"
 	batch_v1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"

diff --git a/pkg/addon/addon_validator.go b/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/pkg/apis/addon/v1alpha1"
+	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/api/addon/v1alpha1"
 	"github.com/keikoproj/addon-manager/pkg/common"
 )
 

diff --git a/pkg/addon/addon_validator_test.go b/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/pkg/apis/addon/v1alpha1"
+	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/api/addon/v1alpha1"
 )
 
 var dynClient = fake.NewSimpleDynamicClient(runtime.NewScheme())

diff --git a/pkg/addon/addon_version_cache.go b/pkg/addon/addon_version_cache.go
@@ -18,7 +18,7 @@ import (
 	"sync"
 
 	"github.com/Masterminds/semver/v3"
-	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/pkg/apis/addon/v1alpha1"
+	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/api/addon/v1alpha1"
 )
 
 // VersionCacheClient interface clients must implement for addon version cache.

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

diff --git a/pkg/addonctl/addonctl.go b/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/pkg/apis/addon/v1alpha1"
+	addonmgrv1alpha1 "github.com/keikoproj/addon-manager/api/addon/v1alpha1"
 	"github.com/keikoproj/addon-manager/pkg/common"
 	"github.com/keikoproj/addon-manager/pkg/version"
 	"github.com/keikoproj/addon-manager/pkg/workflows"