Fixed kuttl test 022

Signed-off-by: Yi Cai <[email protected]>

controllers/argocd/notifications.go

@@ -411,24 +411,12 @@ func (r *ReconcileArgoCD) reconcileNotificationsConfigMap(cr *argoprojv1a1.ArgoC
 		}
 
 		log.Info(fmt.Sprintf("Creating configmap %s", desiredConfigMap.Name))
-		err := r.Client.Create(context.TODO(), desiredConfigMap)
-		if err != nil {
-			return err
-		}
-
-		return nil
-	}
-
-	// ConfigMap exists, reconcile if changed
-	if !reflect.DeepEqual(existingConfigMap.Data, desiredConfigMap.Data) {
-		existingConfigMap.Data = desiredConfigMap.Data
-		if err := controllerutil.SetControllerReference(cr, existingConfigMap, r.Scheme); err != nil {
+		if err := r.Client.Create(context.TODO(), desiredConfigMap); err != nil {
 			return err
 		}
-
-		return r.Client.Update(context.TODO(), existingConfigMap)
 	}
 
+	// If the ConfigMap already exists, do nothing.
 	return nil
 }
 

tests/k8s/1-022_validate_notifications/01-assert.yaml

@@ -0,0 +1,43 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ArgoCD
+metadata:
+  name: argocd
+status:
+  phase: Available
+  notificationsController: Running
+---
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: argocd-notifications-controller
+status:
+  conditions:
+    - type: Available
+      status: 'True'
+    - type: Progressing
+      status: 'True'
+---
+kind: Secret
+apiVersion: v1
+metadata:
+  name: argocd-notifications-secret
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: argocd-notifications-cm
+---
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: argocd-argocd-notifications-controller
+---
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: argocd-argocd-notifications-controller
+---
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: argocd-argocd-notifications-controller

tests/k8s/1-022_validate_notifications/02-assert.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: argocd-notifications-cm
+data:
+  service.email.gmail: "{host: smtp4dev, port: 2525, from: [email protected]}"

tests/k8s/1-022_validate_notifications/02-update-notifications-cm.yaml

@@ -1,10 +1,7 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-- script: sleep 15
 - script: |
     set -e 
 
-    kubectl patch cm argocd-notifications-cm -n $NAMESPACE --type merge -p '{"data": {"service.email.gmail": "{host: smtp4dev, port: 2525, from: [email protected] }" }}'
-- script: sleep 5
-
+    kubectl patch cm argocd-notifications-cm -n $NAMESPACE --type merge -p '{"data": {"service.email.gmail": "{host: smtp4dev, port: 2525, from: [email protected]}" }}'

tests/k8s/1-022_validate_notifications/03-assert.yaml

@@ -0,0 +1,14 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: my-app-3
+  annotations:
+    "notifications.argoproj.io/subscribe.on-created.gmail": "[email protected]"
+spec:
+  destination:
+    server: https://kubernetes.default.svc
+  project: default
+  source:
+    repoURL: https://github.com/redhat-developer/gitops-operator
+    path: test/examples/nginx
+    targetRevision: HEAD

tests/k8s/1-022_validate_notifications/03-create-app.yaml

@@ -21,5 +21,4 @@ commands:
         repoURL: https://github.com/redhat-developer/gitops-operator
         path: test/examples/nginx
         targetRevision: HEAD
-    EOF
-- script: sleep 5
+    EOF

tests/k8s/1-022_validate_notifications/04-delete-app.yaml

@@ -5,4 +5,6 @@ commands:
     set -e 
   
     kubectl delete -n $NAMESPACE application.argoproj.io my-app-3
-- script: sleep 5
+- script: sleep 5
+- script: |
+    ! kubectl get -n $NAMESPACE application.argoproj.io my-app-3