Added reconcilation logic if spec.ApplicationSet is removed

.github/workflows/test.yaml

@@ -0,0 +1,12 @@
+name: CI
+on:
+  pull_request:
+    types: [ labeled ]
+jobs:
+  build:
+    if: ${{ github.event.label.name == 'propogate' }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run a one-line script
+      run: echo Hello, world!

api/v1alpha1/argocd_types.go

@@ -733,6 +733,15 @@ type ArgoCDStatus struct {
 	//+operator-sdk:csv:customresourcedefinitions:type=status,displayName="ApplicationController",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:text"}
 	ApplicationController string `json:"applicationController,omitempty"`
 
+	// ApplicationController is a simple, high-level summary of where the Argo CD application controller component is in its lifecycle.
+	// There are five possible ApplicationController values:
+	// Pending: The Argo CD application controller component has been accepted by the Kubernetes system, but one or more of the required resources have not been created.
+	// Running: All of the required Pods for the Argo CD application controller component are in a Ready state.
+	// Failed: At least one of the  Argo CD application controller component Pods had a failure.
+	// Unknown: For some reason the state of the Argo CD application controller component could not be obtained.
+	//+operator-sdk:csv:customresourcedefinitions:type=status,displayName="ApplicationController",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:text"}
+	ApplicationSetController string `json:"applicationSetController,omitempty"`
+
 	// Dex is a simple, high-level summary of where the Argo CD Dex component is in its lifecycle.
 	// There are five possible dex values:
 	// Pending: The Argo CD Dex component has been accepted by the Kubernetes system, but one or more of the required resources have not been created.

bundle/manifests/argocd-operator.clusterserviceversion.yaml

@@ -747,6 +747,19 @@ spec:
         path: applicationController
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:text
+      - description: 'ApplicationController is a simple, high-level summary of where
+          the Argo CD application controller component is in its lifecycle. There
+          are five possible ApplicationController values: Pending: The Argo CD application
+          controller component has been accepted by the Kubernetes system, but one
+          or more of the required resources have not been created. Running: All of
+          the required Pods for the Argo CD application controller component are in
+          a Ready state. Failed: At least one of the  Argo CD application controller
+          component Pods had a failure. Unknown: For some reason the state of the
+          Argo CD application controller component could not be obtained.'
+        displayName: ApplicationController
+        path: applicationSetController
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:text
       - description: 'Dex is a simple, high-level summary of where the Argo CD Dex
           component is in its lifecycle. There are five possible dex values: Pending:
           The Argo CD Dex component has been accepted by the Kubernetes system, but

bundle/manifests/argoproj.io_argocds.yaml

@@ -5998,6 +5998,18 @@ spec:
                   had a failure. Unknown: For some reason the state of the Argo CD
                   application controller component could not be obtained.'
                 type: string
+              applicationSetController:
+                description: 'ApplicationController is a simple, high-level summary
+                  of where the Argo CD application controller component is in its
+                  lifecycle. There are five possible ApplicationController values:
+                  Pending: The Argo CD application controller component has been accepted
+                  by the Kubernetes system, but one or more of the required resources
+                  have not been created. Running: All of the required Pods for the
+                  Argo CD application controller component are in a Ready state. Failed:
+                  At least one of the  Argo CD application controller component Pods
+                  had a failure. Unknown: For some reason the state of the Argo CD
+                  application controller component could not be obtained.'
+                type: string
               dex:
                 description: 'Dex is a simple, high-level summary of where the Argo
                   CD Dex component is in its lifecycle. There are five possible dex

common/defaults.go

@@ -42,6 +42,8 @@ const (
 	// ArgoCDNotificationsControllerComponent is the name of the Notifications controller control plane component
 	ArgoCDNotificationsControllerComponent = "argocd-notifications-controller"
 
+	// ArgoCDApplicationSetControllerComponent is the name of the AppplicationSet controller control plane component
+	ArgoCDApplicationSetControllerComponent = "argocd-applicationset-controller"
 	// ArgoCDOperatorGrafanaComponent is the name of the Grafana control plane component
 	ArgoCDOperatorGrafanaComponent = "argocd-grafana"
 

config/crd/bases/argoproj.io_argocds.yaml

@@ -6000,6 +6000,18 @@ spec:
                   had a failure. Unknown: For some reason the state of the Argo CD
                   application controller component could not be obtained.'
                 type: string
+              applicationSetController:
+                description: 'ApplicationController is a simple, high-level summary
+                  of where the Argo CD application controller component is in its
+                  lifecycle. There are five possible ApplicationController values:
+                  Pending: The Argo CD application controller component has been accepted
+                  by the Kubernetes system, but one or more of the required resources
+                  have not been created. Running: All of the required Pods for the
+                  Argo CD application controller component are in a Ready state. Failed:
+                  At least one of the  Argo CD application controller component Pods
+                  had a failure. Unknown: For some reason the state of the Argo CD
+                  application controller component could not be obtained.'
+                type: string
               dex:
                 description: 'Dex is a simple, high-level summary of where the Argo
                   CD Dex component is in its lifecycle. There are five possible dex

config/manifests/bases/argocd-operator.clusterserviceversion.yaml

@@ -621,6 +621,19 @@ spec:
         path: applicationController
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:text
+      - description: 'ApplicationController is a simple, high-level summary of where
+          the Argo CD application controller component is in its lifecycle. There
+          are five possible ApplicationController values: Pending: The Argo CD application
+          controller component has been accepted by the Kubernetes system, but one
+          or more of the required resources have not been created. Running: All of
+          the required Pods for the Argo CD application controller component are in
+          a Ready state. Failed: At least one of the  Argo CD application controller
+          component Pods had a failure. Unknown: For some reason the state of the
+          Argo CD application controller component could not be obtained.'
+        displayName: ApplicationController
+        path: applicationSetController
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:text
       - description: 'Dex is a simple, high-level summary of where the Argo CD Dex
           component is in its lifecycle. There are five possible dex values: Pending:
           The Argo CD Dex component has been accepted by the Kubernetes system, but

controllers/argocd/applicationset.go

@@ -21,6 +21,7 @@ import (
 	"reflect"
 
 	corev1 "k8s.io/api/core/v1"
+	rbacv1 "k8s.io/api/rbac/v1"
 	v1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -73,6 +74,19 @@ func (r *ReconcileArgoCD) reconcileApplicationSetController(cr *argoprojv1a1.Arg
 		return err
 	}
 
+<<<<<<< HEAD
+	log.Info("reconciling applicationset ingress")
+	if err := r.reconcileApplicationSetControllerIngress(cr); err != nil {
+		return err
+	}
+
+	log.Info("reconciling applicationset routes")
+	if err := r.reconcileApplicationSetControllerWebhookRoute(cr); err != nil {
+		return err
+	}
+
+=======
+>>>>>>> master
 	log.Info("reconciling applicationset service")
 	if err := r.reconcileApplicationSetService(cr); err != nil {
 		return err
@@ -136,12 +150,17 @@ func (r *ReconcileArgoCD) reconcileApplicationSetDeployment(cr *argoprojv1a1.Arg
 		},
 	}
 
-	podSpec.Containers = []corev1.Container{
-		applicationSetContainer(cr),
-	}
 	AddSeccompProfileForOpenShift(r.Client, podSpec)
-
+	if cr.Spec.ApplicationSet != nil {
+		podSpec.Containers = []corev1.Container{
+			applicationSetContainer(cr),
+		}
+	}
 	if existing := newDeploymentWithSuffix("applicationset-controller", "controller", cr); argoutil.IsObjectFound(r.Client, cr.Namespace, existing.Name, existing) {
+		if cr.Spec.ApplicationSet == nil {
+			log.Info(fmt.Sprintf("Deleting Deployment %s as applicationset is disabled", existing.Name))
+			return r.Client.Delete(context.TODO(), existing)
+		}
 
 		existingSpec := existing.Spec.Template.Spec
 
@@ -255,6 +274,10 @@ func (r *ReconcileArgoCD) reconcileApplicationSetServiceAccount(cr *argoprojv1a1
 	}
 
 	if exists {
+		if cr.Spec.ApplicationSet == nil {
+			log.Info(fmt.Sprintf("Deleting service account %s as applicationset is disabled", sa.Name))
+			return nil, r.Client.Delete(context.TODO(), sa)
+		}
 		return sa, nil
 	}
 
@@ -359,6 +382,10 @@ func (r *ReconcileArgoCD) reconcileApplicationSetRole(cr *argoprojv1a1.ArgoCD) (
 		if !errors.IsNotFound(err) {
 			return nil, fmt.Errorf("failed to reconcile the role for the service account associated with %s : %s", role.Name, err)
 		}
+		if cr.Spec.ApplicationSet == nil {
+			log.Info(fmt.Sprintf("Deleting role %s as applicationset is disabled", role.Name))
+			return nil, r.Client.Delete(context.TODO(), role)
+		}
 		if err = controllerutil.SetControllerReference(cr, role, r.Scheme); err != nil {
 			return nil, err
 		}
@@ -409,6 +436,10 @@ func (r *ReconcileArgoCD) reconcileApplicationSetRoleBinding(cr *argoprojv1a1.Ar
 	}
 
 	if roleBindingExists {
+		if cr.Spec.ApplicationSet == nil {
+			log.Info(fmt.Sprintf("Deleting rolebinding %s as applicationset is disabled", roleBinding.Name))
+			return r.Client.Delete(context.TODO(), roleBinding)
+		}
 		return r.Client.Update(context.TODO(), roleBinding)
 	}
 
@@ -462,13 +493,54 @@ func setAppSetLabels(obj *metav1.ObjectMeta) {
 	obj.Labels["app.kubernetes.io/component"] = "controller"
 }
 
+//deleteApplicationSetResources Triggers reconciliation of application set resources,logic for deletion of applicationset is in reconcile methods this method triggers the cleanup of resources using the reconcilation logic as CR changes
+func (r *ReconcileArgoCD) deleteApplicationSetResources(cr *argoprojv1a1.ArgoCD) error {
+
+	sa := &corev1.ServiceAccount{}
+	role := &rbacv1.Role{}
+
+	if err := argoutil.FetchObject(r.Client, cr.Namespace, fmt.Sprintf("%s-%s", cr.Name, common.ArgoCDApplicationSetControllerComponent), sa); err != nil {
+		if !errors.IsNotFound(err) {
+			return err
+		}
+	}
+	if err := argoutil.FetchObject(r.Client, cr.Namespace, fmt.Sprintf("%s-%s", cr.Name, common.ArgoCDApplicationSetControllerComponent), role); err != nil {
+		if !errors.IsNotFound(err) {
+			return err
+		}
+	}
+
+	log.Info("reconciling ApplicationSet deployment")
+	if err := r.reconcileApplicationSetDeployment(cr, sa); err != nil {
+		return err
+	}
+
+	log.Info("reconciling ApplicationSet role binding")
+	if err := r.reconcileApplicationSetRoleBinding(cr, role, sa); err != nil {
+		return err
+	}
+
+	log.Info("reconciling ApplicationSet role")
+	_, err := r.reconcileApplicationSetRole(cr)
+	if err != nil {
+		return err
+	}
+
+	log.Info("reconciling ApplicationSet serviceaccount")
+	_, err = r.reconcileApplicationSetServiceAccount(cr)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // reconcileApplicationSetService will ensure that the Service is present for the ApplicationSet webhook and metrics component.
 func (r *ReconcileArgoCD) reconcileApplicationSetService(cr *argoprojv1a1.ArgoCD) error {
 	log.Info("reconciling applicationset service")
 
 	svc := newServiceWithSuffix(common.ApplicationSetServiceNameSuffix, common.ApplicationSetServiceNameSuffix, cr)
 	if cr.Spec.ApplicationSet == nil {
-
 		if argoutil.IsObjectFound(r.Client, cr.Namespace, svc.Name, svc) {
 			err := argoutil.FetchObject(r.Client, cr.Namespace, svc.Name, svc)
 			if err != nil {

controllers/argocd/applicationset_test.go

@@ -24,6 +24,7 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
+	v1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -262,7 +263,6 @@ func TestReconcileApplicationSet_UpdateExistingDeployments(t *testing.T) {
 
 	// Ensure the updated Deployment has the expected properties
 	checkExpectedDeploymentValues(t, deployment, &sa, a)
-
 }
 
 func TestReconcileApplicationSet_Deployments_resourceRequirements(t *testing.T) {
@@ -405,8 +405,8 @@ func TestReconcileApplicationSet_ServiceAccount(t *testing.T) {
 func TestReconcileApplicationSet_Role(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 	a := makeTestArgoCD()
+	a.Spec.ApplicationSet = &v1alpha1.ArgoCDApplicationSet{}
 	r := makeTestReconciler(t, a)
-
 	roleRet, err := r.reconcileApplicationSetRole(a)
 	assert.NoError(t, err)
 
@@ -451,6 +451,7 @@ func TestReconcileApplicationSet_Role(t *testing.T) {
 func TestReconcileApplicationSet_RoleBinding(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 	a := makeTestArgoCD()
+	a.Spec.ApplicationSet = &v1alpha1.ArgoCDApplicationSet{}
 	r := makeTestReconciler(t, a)
 
 	role := &rbacv1.Role{ObjectMeta: metav1.ObjectMeta{Name: "role-name"}}
@@ -472,7 +473,6 @@ func TestReconcileApplicationSet_RoleBinding(t *testing.T) {
 
 	assert.Equal(t, roleBinding.RoleRef.Name, role.Name)
 	assert.Equal(t, roleBinding.Subjects[0].Name, sa.Name)
-
 }
 
 func appsetAssertExpectedLabels(t *testing.T, meta *metav1.ObjectMeta) {
@@ -497,3 +497,72 @@ func TestReconcileApplicationSet_Service(t *testing.T) {
 	assert.NoError(t, r.reconcileApplicationSetService(a))
 	assert.NoError(t, r.Client.Get(context.TODO(), types.NamespacedName{Namespace: s.Namespace, Name: s.Name}, s))
 }
+func TestReconcileApplicationSet_DeleteDeployment(t *testing.T) {
+	logf.SetLogger(ZapLogger(true))
+	a := makeTestArgoCD()
+	a.Spec.ApplicationSet = &v1alpha1.ArgoCDApplicationSet{}
+	r := makeTestReconciler(t, a)
+	sa := corev1.ServiceAccount{}
+
+	assert.NoError(t, r.reconcileApplicationSetDeployment(a, &sa))
+
+	deployment := &appsv1.Deployment{}
+	assert.NoError(t, r.Client.Get(
+		context.TODO(),
+		types.NamespacedName{
+			Name:      "argocd-applicationset-controller",
+			Namespace: a.Namespace,
+		},
+		deployment))
+
+	a.Spec.ApplicationSet = nil
+	r = makeTestReconciler(t, a)
+	checkdeployment := &appsv1.Deployment{}
+	assert.Error(t, r.Client.Get(
+		context.TODO(),
+		types.NamespacedName{
+			Name:      "argocd-applicationset-controller",
+			Namespace: a.Namespace,
+		},
+		checkdeployment))
+	assert.Equal(t, checkdeployment.Name, "")
+	checkrole := &v1.Role{}
+	assert.Error(t, r.Client.Get(
+		context.TODO(),
+		types.NamespacedName{
+			Name:      "argocd-applicationset-controller",
+			Namespace: a.Namespace,
+		},
+		checkrole))
+	assert.Equal(t, checkrole.Name, "")
+
+	checksa := &corev1.ServiceAccount{}
+	assert.Error(t, r.Client.Get(
+		context.TODO(),
+		types.NamespacedName{
+			Name:      "argocd-applicationset-controller",
+			Namespace: a.Namespace,
+		},
+		checksa))
+	assert.Equal(t, checksa.Name, "")
+	checkroleBinding := &v1.RoleBinding{}
+	assert.Error(t, r.Client.Get(
+		context.TODO(),
+		types.NamespacedName{
+			Name:      "argocd-applicationset-controller",
+			Namespace: a.Namespace,
+		},
+		checkroleBinding))
+	assert.Equal(t, checkroleBinding.Name, "")
+}
+
+func TestReconcileApplicationSet_Service(t *testing.T) {
+	logf.SetLogger(ZapLogger(true))
+	a := makeTestArgoCD()
+	r := makeTestReconciler(t, a)
+
+	s := newServiceWithSuffix(common.ApplicationSetServiceNameSuffix, common.ApplicationSetServiceNameSuffix, a)
+
+	assert.NoError(t, r.reconcileApplicationSetService(a))
+	assert.NoError(t, r.Client.Get(context.TODO(), types.NamespacedName{Namespace: s.Namespace, Name: s.Name}, s))
+}