fix: add condtext to notification

Signed-off-by: Saumeya Katyal <skatyal@skatyal-thinkpadt14sgen1.bengluru.csb> changes Signed-off-by: Saumeya Katyal <skatyal@skatyal-thinkpadt14sgen1.bengluru.csb> ci failures Signed-off-by: Saumeya Katyal <skatyal@skatyal-thinkpadt14sgen1.bengluru.csb> review comments Signed-off-by: Saumeya Katyal <skatyal@skatyal-thinkpadt14sgen1.bengluru.csb>
argoproj-labs · Apr 18, 2024 · 7206579 · 7206579
1 parent c7c457d
commit 7206579
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 0 deletions.
diff --git a/api/v1alpha1/notificationsconfiguration_types.go b/api/v1alpha1/notificationsconfiguration_types.go
@@ -57,4 +57,6 @@ type NotificationsConfigurationSpec struct {
 	Services map[string]string `json:"services,omitempty"`
 	// Subscriptions contain centrally managed global application subscriptions
 	Subscriptions map[string]string `json:"subscriptions,omitempty"`
+	// Context is used to define some shared context between all notification templates
+	Context map[string]string `json:"context,omitempty"`
 }
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/argoproj.io_notificationsconfigurations.yaml b/bundle/manifests/argoproj.io_notificationsconfigurations.yaml
@@ -36,6 +36,12 @@ spec:
             description: NotificationsConfigurationSpec allows users to define the
               triggers, templates, services, context and subscriptions for the notifications
             properties:
+              context:
+                additionalProperties:
+                  type: string
+                description: Context is used to define some shared context between
+                  all notification templates
+                type: object
               services:
                 additionalProperties:
                   type: string

diff --git a/config/crd/bases/argoproj.io_notificationsconfigurations.yaml b/config/crd/bases/argoproj.io_notificationsconfigurations.yaml
@@ -38,6 +38,12 @@ spec:
             description: NotificationsConfigurationSpec allows users to define the
               triggers, templates, services, context and subscriptions for the notifications
             properties:
+              context:
+                additionalProperties:
+                  type: string
+                description: Context is used to define some shared context between
+                  all notification templates
+                type: object
               services:
                 additionalProperties:
                   type: string

diff --git a/controllers/argocd/notifications.go b/controllers/argocd/notifications.go
@@ -84,6 +84,7 @@ func (r *ReconcileArgoCD) reconcileNotificationsConfigurationCR(cr *argoproj.Arg
 			Namespace: cr.Namespace,
 		},
 		Spec: v1alpha1.NotificationsConfigurationSpec{
+			Context:   getDefaultNotificationsContext(),
 			Triggers:  getDefaultNotificationsTriggers(),
 			Templates: getDefaultNotificationsTemplates(),
 		},

diff --git a/controllers/argocd/notifications_util.go b/controllers/argocd/notifications_util.go
@@ -2,6 +2,12 @@ package argocd
 
 import argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 
+// getDefaultNotificationsContext returns an empty map for context
+func getDefaultNotificationsContext() map[string]string {
+	notificationContext := make(map[string]string)
+	return notificationContext
+}
+
 // getDefaultNotificationsTemplates returns a map that contains default template configurations
 func getDefaultNotificationsTemplates() map[string]string {
 

diff --git a/controllers/notificationsconfiguration/configmap.go b/controllers/notificationsconfiguration/configmap.go
@@ -60,6 +60,10 @@ func (r *NotificationsConfigurationReconciler) reconcileNotificationsConfigmap(c
 		expectedConfiguration[k] = v
 	}
 
+	if cr.Spec.Context != nil {
+		expectedConfiguration["context"] = mapToString(cr.Spec.Context)
+	}
+
 	if !reflect.DeepEqual(expectedConfiguration, NotificationsConfigMap.Data) {
 		NotificationsConfigMap.Data = expectedConfiguration
 		err := r.Client.Update(context.TODO(), NotificationsConfigMap)
@@ -71,3 +75,10 @@ func (r *NotificationsConfigurationReconciler) reconcileNotificationsConfigmap(c
 	// Do nothing
 	return nil
 }
+func mapToString(m map[string]string) string {
+	result := ""
+	for key, value := range m {
+		result += fmt.Sprintf("%s: %s\n", key, value)
+	}
+	return result
+}
diff --git a/deploy/olm-catalog/argocd-operator/0.9.0/argoproj.io_notificationsconfigurations.yaml b/deploy/olm-catalog/argocd-operator/0.9.0/argoproj.io_notificationsconfigurations.yaml
@@ -36,6 +36,12 @@ spec:
             description: NotificationsConfigurationSpec allows users to define the
               triggers, templates, services, context and subscriptions for the notifications
             properties:
+              context:
+                additionalProperties:
+                  type: string
+                description: Context is used to define some shared context between
+                  all notification templates
+                type: object
               services:
                 additionalProperties:
                   type: string

diff --git a/docs/reference/notificationsconfiguration.md b/docs/reference/notificationsconfiguration.md
@@ -16,6 +16,7 @@ Name | Default | Description
 **Triggers** | [Empty] | Templates are used to generate the notification template message.
 **Services** | [Empty] | Services are used to deliver message.
 **Subscriptions** | [Empty] | Subscriptions contain centrally managed global application subscriptions.
+**Context** | [Empty] | Context is used to define some shared context between all notification templates.
 
 ## Templates Example
 
@@ -92,3 +93,18 @@ spec:
       triggers:
       - on-sync-status-unknown
 ```
+
+## Context Example
+
+The following example shows how to add Context to the `argocd-notification-cm` using the `default-notifications-configuration` custom resource.
+
+``` yaml
+apiVersion: argoproj.io/v1alpha1
+kind: NotificationsConfiguration
+metadata:
+ name: default-notifications-configuration
+spec:
+ Context:
+  region: east
+  environmentName: staging    
+```