Bring back application-manager addon and remove argocd-addon by reverting main branch commit 3d8291d (#490)

Signed-off-by: Mike Ng <[email protected]>

Author: mikeshng

README.md

@@ -127,22 +127,22 @@ Clean up the multicluster hub control plane and other initialized resources on t
 
 Install specific built-in add-on(s) to the hub cluster.
 
-`clusteradm install hub-addon --names argocd`
+`clusteradm install hub-addon --names application-manager`
 
 `clusteradm install hub-addon --names governance-policy-framework`
 
 ### enable addons
 
 Enable specific add-on(s) agent deployment to the given managed clusters of the specified namespace
 
-`clusteradm addon enable --names argocd --namespace <namespace> --clusters <cluster1>,<cluster2>,....`
+`clusteradm addon enable --names application-manager --namespace <namespace> --clusters <cluster1>,<cluster2>,....`
 
 `clusteradm addon enable --names governance-policy-framework --namespace <namespace> --clusters <cluster1>,<cluster2>,....`
 
 `clusteradm addon enable --names config-policy-controller --namespace <namespace> --clusters <cluster1>,<cluster2>,....`
 
 ### create sample application
 
-Create and deploy a sample Argo CD ApplicationSet
+Create and Deploy a Sample Subscription Application
 
-`clusteradm create sampleapp sample-appset`
+`clusteradm create sampleapp sampleapp1`

pkg/cmd/addon/disable/cmd.go

@@ -12,12 +12,12 @@ import (
 )
 
 var example = `
-# Disable argocd addon on specified clusters
-%[1]s addon disable --names argocd --clusters cluster1,cluster2
-# Disable argocd addon on all clusters
-%[1]s addon disable --names argocd --all-clusters
-# Disable argocd addon to the given managed clusters in the specified namespace
-%[1]s addon disable --names argocd --namespace <namespace> --clusters <cluster1>
+# Disable application-manager addon on specified clusters
+%[1]s addon disable --names application-manager --clusters cluster1,cluster2
+# Disable application-manager addon on all clusters
+%[1]s addon disable --names application-manager --all-clusters
+# Disable application-manager addon to the given managed clusters in the specified namespace
+%[1]s addon disable --names application-manager --namespace <namespace> --clusters <cluster1>
 
 ## Policy Framework
 

pkg/cmd/addon/disable/exec_test.go

@@ -23,7 +23,7 @@ var _ = ginkgo.Describe("addon disable", func() {
 	var cluster2Name string
 	var err error
 
-	appMgrAddonName := "argocd"
+	appMgrAddonName := "application-manager"
 
 	ginkgo.BeforeEach(func() {
 		cluster1Name = fmt.Sprintf("cluster-%s", rand.String(5))
@@ -71,7 +71,7 @@ var _ = ginkgo.Describe("addon disable", func() {
 
 	ginkgo.Context("runWithClient", func() {
 
-		ginkgo.It("Should disable argocd ManagedClusterAddOn in ManagedCluster namespace successfully", func() {
+		ginkgo.It("Should disable application-manager ManagedClusterAddOn in ManagedCluster namespace successfully", func() {
 			assertCreatingClusters(cluster1Name)
 
 			addons := []string{appMgrAddonName}
@@ -86,7 +86,7 @@ var _ = ginkgo.Describe("addon disable", func() {
 			gomega.Expect(err).ToNot(gomega.HaveOccurred())
 		})
 
-		ginkgo.It("Should disable argocd ManagedClusterAddOns in each ManagedCluster namespace successfully", func() {
+		ginkgo.It("Should disable application-manager ManagedClusterAddOns in each ManagedCluster namespace successfully", func() {
 			assertCreatingClusters(cluster1Name)
 			assertCreatingClusters(cluster2Name)
 

pkg/cmd/addon/enable/cmd.go

@@ -14,10 +14,10 @@ import (
 var example = `
 ## Application Manager
 
-# Enable argocd addon on the given managed clusters in the specified namespace
-%[1]s addon enable --names argocd --namespace namespace --clusters cluster1,cluster2
-# Enable argocd addon for specified clusters
-%[1]s addon enable --names argocd --clusters cluster1,cluster2
+# Enable application-manager addon on the given managed clusters in the specified namespace
+%[1]s addon enable --names application-manager --namespace namespace --clusters cluster1,cluster2
+# Enable application-manager addon for specified clusters
+%[1]s addon enable --names application-manager --clusters cluster1,cluster2
 
 ## Policy Framework
 

pkg/cmd/addon/enable/exec_test.go

@@ -22,7 +22,7 @@ var _ = ginkgo.Describe("addon enable", func() {
 
 	// Array of addons to check
 	var addons = []string{
-		"argocd",
+		"application-manager",
 		"governance-policy-framework",
 		"config-policy-controller",
 	}

pkg/cmd/create/sampleapp/cmd.go

@@ -15,6 +15,8 @@ import (
 var example = `
 # Create a sample app
 %[1]s create sampleapp sampleapp1
+# Create a sample app on specified namespace
+%[1]s create sampleapp sampleapp1 --namespace namespace1
 `
 
 // NewCmd...
@@ -23,8 +25,8 @@ func NewCmd(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, stream
 
 	cmd := &cobra.Command{
 		Use:          "sampleapp",
-		Short:        "Create a sample Argo CD ApplicationSet",
-		Long:         "Create a sample Argo CD ApplicationSet",
+		Short:        "Create a sample app",
+		Long:         "Create a sample app, by generating Helm ngix deployment yamls",
 		Example:      fmt.Sprintf(example, clusteradmhelpers.GetExampleHeader()),
 		SilenceUsage: true,
 		PreRunE: func(c *cobra.Command, args []string) error {
@@ -48,6 +50,7 @@ func NewCmd(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, stream
 	}
 
 	cmd.Flags().StringVar(&o.OutputFile, "output-file", "", "The generated resources will be copied in the specified file")
+	cmd.Flags().StringVarP(&o.Namespace, "namespace", "n", "default", "Specified namespace to deploy sample app")
 
 	return cmd
 }

pkg/cmd/create/sampleapp/exec.go

@@ -3,6 +3,7 @@
 package sampleapp
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -12,13 +13,17 @@ import (
 	"open-cluster-management.io/clusteradm/pkg/helpers/reader"
 
 	"github.com/spf13/cobra"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterclientset "open-cluster-management.io/api/client/cluster/clientset/versioned"
 	"open-cluster-management.io/clusteradm/pkg/cmd/create/sampleapp/scenario"
 )
 
 const (
 	defaultSampleAppName = "sampleapp"
 	pathToAppManifests   = "scenario/sampleapp"
+	clusterSetLabel      = "cluster.open-cluster-management.io/clusterset"
+	placementLabel       = "placement"
+	placementLabelValue  = "sampleapp"
 )
 
 func (o *Options) complete(cmd *cobra.Command, args []string) (err error) {
@@ -62,12 +67,48 @@ func (o *Options) Run() (err error) {
 
 func (o *Options) runWithClient(clusterClient clusterclientset.Interface, dryRun bool) error {
 
+	// Label all managed clusters with clusterset and placement labels
+	err := o.checkManagedClusterBinding(clusterClient, dryRun)
+	if err != nil {
+		return err
+	}
+
 	// Apply sample application manifest to hub cluster
-	err := o.deployApp()
+	err = o.deployApp()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (o *Options) checkManagedClusterBinding(clusterClient clusterclientset.Interface, dryRun bool) error {
+
+	// Skip if dryRun
+	if dryRun {
+		return nil
+	}
+
+	// Get managed clusters
+	clusters, err := clusterClient.ClusterV1().ManagedClusters().List(context.TODO(), metav1.ListOptions{})
 	if err != nil {
 		return err
 	}
 
+	// Check for binding labels in managed clusters
+	for _, cluster := range clusters.Items {
+		managedCluster, err := clusterClient.ClusterV1().ManagedClusters().Get(context.TODO(), cluster.Name, metav1.GetOptions{})
+		if err != nil {
+			return err
+		}
+		if cs, ok := managedCluster.Labels[clusterSetLabel]; !ok || (cs != fmt.Sprintf("app-%s", o.SampleAppName)) {
+			fmt.Fprintf(o.Streams.Out, "[WARNING] Label \"%s=%s\" has not been found in ManagedCluster %s, could not establish binding.\n", clusterSetLabel, fmt.Sprintf("app-%s", o.SampleAppName), cluster.Name)
+		}
+		if p, ok := managedCluster.Labels[placementLabel]; !ok || (p != placementLabelValue) {
+			fmt.Fprintf(o.Streams.Out, "[WARNING] Label \"%s=%s\" has not been found in ManagedCluster %s, could not establish binding.\n", placementLabel, placementLabelValue, cluster.Name)
+		}
+	}
+
 	return nil
 }