Merge branch 'supportCustomRules' of github.com:loreleimccollum-work/argo-helm into supportCustomRules

Signed-off-by: Lorelei McCollum <lorelei.mccollum@endurance.com>

charts/argocd-notifications/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: 1.1.1
 description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
 name: argocd-notifications
 type: application
-version: 1.2.0
+version: 1.3.0
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:

charts/argocd-notifications/templates/configmap.yaml

@@ -8,6 +8,9 @@ metadata:
 data:
   context: |
     argocdUrl: {{ .Values.argocdUrl | quote }}
+  {{- with .Values.context }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   {{- with .Values.notifiers }}
     {{- toYaml . | nindent 2 }}
   {{- end }}
@@ -21,4 +24,4 @@ data:
   {{- with .Values.triggers }}
     {{- toYaml . | nindent 2 }}
   {{- end }}
-{{- end }}
+{{- end }}

charts/argocd-notifications/values.yaml

@@ -19,6 +19,11 @@ nodeSelector: {}
 updateStrategy:
   type: Recreate
 
+context:
+  # Add custom values into context
+  #  region: east
+  #  environmentName: staging
+
 secret:
   # Whether helm chart creates controller secret
   create: true