chore: Reused argo define api Kind and Group (argoproj#11844)

Signed-off-by: yanggang <[email protected]> Signed-off-by: Michael Crenshaw <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]>
tkasuz · Mar 24, 2023 · 707cab1 · 707cab1
1 parent cc0072c
commit 707cab1
Show file tree

Hide file tree

Showing 20 changed files with 120 additions and 86 deletions.
diff --git a/applicationset/controllers/applicationset_controller.go b/applicationset/controllers/applicationset_controller.go
@@ -42,6 +42,8 @@ import (
 	argov1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
 	argoutil "github.com/argoproj/argo-cd/v2/util/argo"
+
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application"
 )
 
 const (
@@ -563,7 +565,7 @@ func (r *ApplicationSetReconciler) createOrUpdateInCluster(ctx context.Context,
 				Namespace: generatedApp.Namespace,
 			},
 			TypeMeta: metav1.TypeMeta{
-				Kind:       "Application",
+				Kind:       application.ApplicationKind,
 				APIVersion: "argoproj.io/v1alpha1",
 			},
 		}

diff --git a/applicationset/controllers/applicationset_controller_test.go b/applicationset/controllers/applicationset_controller_test.go
@@ -34,6 +34,8 @@ import (
 	appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake"
 	"github.com/argoproj/argo-cd/v2/util/collections"
 	dbmocks "github.com/argoproj/argo-cd/v2/util/db/mocks"
+
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application"
 )
 
 type generatorMock struct {
@@ -354,7 +356,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			expected: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -383,7 +385,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			existingApps: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -409,7 +411,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			expected: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -441,7 +443,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			existingApps: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -467,7 +469,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			expected: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -499,7 +501,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			existingApps: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -527,7 +529,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			expected: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -561,7 +563,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			existingApps: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -589,7 +591,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			expected: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -621,7 +623,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			existingApps: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -655,7 +657,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			expected: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -695,7 +697,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			existingApps: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -731,7 +733,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			expected: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -773,7 +775,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			existingApps: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -805,7 +807,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			expected: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -1244,7 +1246,7 @@ func TestCreateApplications(t *testing.T) {
 			expected: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -1272,7 +1274,7 @@ func TestCreateApplications(t *testing.T) {
 			existsApps: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -1298,7 +1300,7 @@ func TestCreateApplications(t *testing.T) {
 			expected: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -1329,7 +1331,7 @@ func TestCreateApplications(t *testing.T) {
 			existsApps: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -1355,7 +1357,7 @@ func TestCreateApplications(t *testing.T) {
 			expected: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -1441,7 +1443,7 @@ func TestDeleteInCluster(t *testing.T) {
 			existingApps: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -1455,7 +1457,7 @@ func TestDeleteInCluster(t *testing.T) {
 				},
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -1481,7 +1483,7 @@ func TestDeleteInCluster(t *testing.T) {
 			expected: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{
@@ -1497,7 +1499,7 @@ func TestDeleteInCluster(t *testing.T) {
 			notExpected: []v1alpha1.Application{
 				{
 					TypeMeta: metav1.TypeMeta{
-						Kind:       "Application",
+						Kind:       application.ApplicationKind,
 						APIVersion: "argoproj.io/v1alpha1",
 					},
 					ObjectMeta: metav1.ObjectMeta{

diff --git a/cmd/argocd/commands/admin/admin.go b/cmd/argocd/commands/admin/admin.go
@@ -17,6 +17,8 @@ import (
 	"github.com/argoproj/argo-cd/v2/common"
 	"github.com/argoproj/argo-cd/v2/util/errors"
 	"github.com/argoproj/argo-cd/v2/util/settings"
+
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application"
 )
 
 const (
@@ -27,9 +29,9 @@ const (
 var (
 	configMapResource       = schema.GroupVersionResource{Group: "", Version: "v1", Resource: "configmaps"}
 	secretResource          = schema.GroupVersionResource{Group: "", Version: "v1", Resource: "secrets"}
-	applicationsResource    = schema.GroupVersionResource{Group: "argoproj.io", Version: "v1alpha1", Resource: "applications"}
-	appprojectsResource     = schema.GroupVersionResource{Group: "argoproj.io", Version: "v1alpha1", Resource: "appprojects"}
-	appplicationSetResource = schema.GroupVersionResource{Group: "argoproj.io", Version: "v1alpha1", Resource: "applicationsets"}
+	applicationsResource    = schema.GroupVersionResource{Group: application.Group, Version: "v1alpha1", Resource: application.ApplicationPlural}
+	appprojectsResource     = schema.GroupVersionResource{Group: application.Group, Version: "v1alpha1", Resource: application.AppProjectPlural}
+	appplicationSetResource = schema.GroupVersionResource{Group: application.Group, Version: "v1alpha1", Resource: application.ApplicationSetPlural}
 )
 
 // NewAdminCommand returns a new instance of an argocd command
@@ -193,11 +195,11 @@ func specsEqual(left, right unstructured.Unstructured) bool {
 		leftData, _, _ := unstructured.NestedMap(left.Object, "data")
 		rightData, _, _ := unstructured.NestedMap(right.Object, "data")
 		return reflect.DeepEqual(leftData, rightData)
-	case "AppProject":
+	case application.AppProjectKind:
 		leftSpec, _, _ := unstructured.NestedMap(left.Object, "spec")
 		rightSpec, _, _ := unstructured.NestedMap(right.Object, "spec")
 		return reflect.DeepEqual(leftSpec, rightSpec)
-	case "Application":
+	case application.ApplicationKind:
 		leftSpec, _, _ := unstructured.NestedMap(left.Object, "spec")
 		rightSpec, _, _ := unstructured.NestedMap(right.Object, "spec")
 		leftStatus, _, _ := unstructured.NestedMap(left.Object, "status")

diff --git a/cmd/argocd/commands/admin/backup.go b/cmd/argocd/commands/admin/backup.go
@@ -17,6 +17,7 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 
 	"github.com/argoproj/argo-cd/v2/common"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application"
 	"github.com/argoproj/argo-cd/v2/util/cli"
 	"github.com/argoproj/argo-cd/v2/util/errors"
 )
@@ -176,12 +177,12 @@ func NewImportCommand() *cobra.Command {
 			applications, err := acdClients.applications.List(ctx, v1.ListOptions{})
 			errors.CheckError(err)
 			for _, app := range applications.Items {
-				pruneObjects[kube.ResourceKey{Group: "argoproj.io", Kind: "Application", Name: app.GetName()}] = app
+				pruneObjects[kube.ResourceKey{Group: application.Group, Kind: application.ApplicationKind, Name: app.GetName()}] = app
 			}
 			projects, err := acdClients.projects.List(ctx, v1.ListOptions{})
 			errors.CheckError(err)
 			for _, proj := range projects.Items {
-				pruneObjects[kube.ResourceKey{Group: "argoproj.io", Kind: "AppProject", Name: proj.GetName()}] = proj
+				pruneObjects[kube.ResourceKey{Group: application.Group, Kind: application.AppProjectKind, Name: proj.GetName()}] = proj
 			}
 			applicationSets, err := acdClients.applicationSets.List(ctx, v1.ListOptions{})
 			if apierr.IsForbidden(err) || apierr.IsNotFound(err) {
@@ -191,7 +192,7 @@ func NewImportCommand() *cobra.Command {
 			}
 			if applicationSets != nil {
 				for _, appSet := range applicationSets.Items {
-					pruneObjects[kube.ResourceKey{Group: "argoproj.io", Kind: "ApplicationSet", Name: appSet.GetName()}] = appSet
+					pruneObjects[kube.ResourceKey{Group: application.Group, Kind: application.ApplicationSetKind, Name: appSet.GetName()}] = appSet
 				}
 			}
 
@@ -209,11 +210,11 @@ func NewImportCommand() *cobra.Command {
 					dynClient = acdClients.secrets
 				case "ConfigMap":
 					dynClient = acdClients.configMaps
-				case "AppProject":
+				case application.AppProjectKind:
 					dynClient = acdClients.projects
-				case "Application":
+				case application.ApplicationKind:
 					dynClient = acdClients.applications
-				case "ApplicationSet":
+				case application.ApplicationSetKind:
 					dynClient = acdClients.applicationSets
 				}
 				if !exists {
@@ -260,9 +261,9 @@ func NewImportCommand() *cobra.Command {
 					switch key.Kind {
 					case "Secret":
 						dynClient = acdClients.secrets
-					case "AppProject":
+					case application.AppProjectKind:
 						dynClient = acdClients.projects
-					case "Application":
+					case application.ApplicationKind:
 						dynClient = acdClients.applications
 						if !dryRun {
 							if finalizers := liveObj.GetFinalizers(); len(finalizers) > 0 {
@@ -274,7 +275,7 @@ func NewImportCommand() *cobra.Command {
 								}
 							}
 						}
-					case "ApplicationSet":
+					case application.ApplicationSetKind:
 						dynClient = acdClients.applicationSets
 					default:
 						log.Fatalf("Unexpected kind '%s' in prune list", key.Kind)
@@ -314,7 +315,7 @@ func checkAppHasNoNeedToStopOperation(liveObj unstructured.Unstructured, stopOpe
 		return true
 	}
 	switch liveObj.GetKind() {
-	case "Application":
+	case application.ApplicationKind:
 		return liveObj.Object["operation"] == nil
 	}
 	return true
@@ -353,9 +354,9 @@ func updateLive(bak, live *unstructured.Unstructured, stopOperation bool) *unstr
 	switch live.GetKind() {
 	case "Secret", "ConfigMap":
 		newLive.Object["data"] = bak.Object["data"]
-	case "AppProject":
+	case application.AppProjectKind:
 		newLive.Object["spec"] = bak.Object["spec"]
-	case "Application":
+	case application.ApplicationKind:
 		newLive.Object["spec"] = bak.Object["spec"]
 		if _, ok := bak.Object["status"]; ok {
 			newLive.Object["status"] = bak.Object["status"]

diff --git a/cmd/argocd/commands/admin/notifications.go b/cmd/argocd/commands/admin/notifications.go
@@ -15,12 +15,13 @@ import (
 	settings "github.com/argoproj/argo-cd/v2/util/notification/settings"
 	"github.com/argoproj/argo-cd/v2/util/tls"
 
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application"
 	"github.com/argoproj/notifications-engine/pkg/cmd"
 	"github.com/spf13/cobra"
 )
 
 var (
-	applications = schema.GroupVersionResource{Group: "argoproj.io", Version: "v1alpha1", Resource: "applications"}
+	applications = schema.GroupVersionResource{Group: application.Group, Version: "v1alpha1", Resource: application.ApplicationPlural}
 )
 
 func NewNotificationsCommand() *cobra.Command {