Skip to content

Commit 7134cd2

Browse files
ATGardnerATGardner
committed
fixed notifiers and subscriptions
added default values to everything
1 parent 219c170 commit 7134cd2

File tree

3 files changed

+86
-77
lines changed

3 files changed

+86
-77
lines changed

‎charts/argo-cd/README.md‎

Lines changed: 78 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -611,86 +611,90 @@ NAME: my-release
611611
| apiVersionOverrides | object | `{}` | |
612612
| applicationVersioning.enabled | bool | `true` | enables the Codefresh application versioning feature |
613613
| applicationVersioning.useApplicationConfiguration | bool | `true` | use ApplicationConfiguration CRD to manage application versioning |
614-
| codefresh.eventReporter.affinity | object | `{}` (defaults to global.affinity preset) | Assign custom [affinity] rules to the deployment |
615-
| codefresh.eventReporter.clusterRoleRules.enabled | bool | `false` | Enable custom rules for the event reporter's ClusterRole resource |
616-
| codefresh.eventReporter.clusterRoleRules.rules | list | `[]` | List of custom rules for the event reporter's ClusterRole resource |
617-
| codefresh.eventReporter.containerPorts.health | int | `8088` | |
618-
| codefresh.eventReporter.containerPorts.metrics | int | `8087` | Metrics container port |
619-
| codefresh.eventReporter.containerSecurityContext | object | See [values.yaml] | Event reporter container-level security context |
620-
| codefresh.eventReporter.dnsConfig | object | `{}` | [DNS configuration] |
621-
| codefresh.eventReporter.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for event reporter pods |
622-
| codefresh.eventReporter.enabled | bool | `true` | |
623-
| codefresh.eventReporter.env | list | `[]` | Environment variables to pass to event reporter |
624-
| codefresh.eventReporter.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to event reporter |
625-
| codefresh.eventReporter.extraArgs | list | `[]` | Additional command line arguments to pass to event reporter |
626-
| codefresh.eventReporter.extraContainers | list | `[]` | Additional containers to be added to the event reporter pod |
627-
| codefresh.eventReporter.hostNetwork | bool | `false` | Host Network for event reporter pods |
628-
| codefresh.eventReporter.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the event reporter |
629-
| codefresh.eventReporter.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the event reporter |
630-
| codefresh.eventReporter.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the event reporter |
631-
| codefresh.eventReporter.imagePullSecrets | list | `[]` (defaults to global.imagePullSecrets) | Secrets with credentials to pull images from a private registry |
632-
| codefresh.eventReporter.initContainers | list | `[]` | Init containers to add to the event reporter pod |
633-
| codefresh.eventReporter.metrics.applicationLabels.enabled | bool | `false` | Enables additional labels in argocd_app_labels metric |
634-
| codefresh.eventReporter.metrics.applicationLabels.labels | list | `[]` | Additional labels |
635-
| codefresh.eventReporter.metrics.enabled | bool | `false` | Deploy metrics service |
636-
| codefresh.eventReporter.metrics.rules.additionalLabels | object | `{}` | PrometheusRule labels |
637-
| codefresh.eventReporter.metrics.rules.annotations | object | `{}` | PrometheusRule annotations |
638-
| codefresh.eventReporter.metrics.rules.enabled | bool | `false` | Deploy a PrometheusRule for the event reporter |
639-
| codefresh.eventReporter.metrics.rules.namespace | string | `""` | PrometheusRule namespace |
640-
| codefresh.eventReporter.metrics.rules.selector | object | `{}` | PrometheusRule selector |
641-
| codefresh.eventReporter.metrics.rules.spec | list | `[]` | PrometheusRule.Spec for the event reporter |
642-
| codefresh.eventReporter.metrics.service.annotations | object | `{}` | Metrics service annotations |
643-
| codefresh.eventReporter.metrics.service.clusterIP | string | `""` | Metrics service clusterIP. `None` makes a "headless service" (no virtual IP) |
644-
| codefresh.eventReporter.metrics.service.labels | object | `{}` | Metrics service labels |
645-
| codefresh.eventReporter.metrics.service.portName | string | `"http-metrics"` | Metrics service port name |
646-
| codefresh.eventReporter.metrics.service.servicePort | int | `8087` | Metrics service port |
647-
| codefresh.eventReporter.metrics.service.type | string | `"ClusterIP"` | Metrics service type |
648-
| codefresh.eventReporter.metrics.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels |
649-
| codefresh.eventReporter.metrics.serviceMonitor.annotations | object | `{}` | Prometheus ServiceMonitor annotations |
650-
| codefresh.eventReporter.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor |
651-
| codefresh.eventReporter.metrics.serviceMonitor.interval | string | `"30s"` | Prometheus ServiceMonitor interval |
652-
| codefresh.eventReporter.metrics.serviceMonitor.metricRelabelings | list | `[]` | Prometheus [MetricRelabelConfigs] to apply to samples before ingestion |
653-
| codefresh.eventReporter.metrics.serviceMonitor.namespace | string | `""` | Prometheus ServiceMonitor namespace |
654-
| codefresh.eventReporter.metrics.serviceMonitor.relabelings | list | `[]` | Prometheus [RelabelConfigs] to apply to samples before scraping |
655-
| codefresh.eventReporter.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme |
656-
| codefresh.eventReporter.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector |
657-
| codefresh.eventReporter.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig |
658-
| codefresh.eventReporter.name | string | `"event-reporter"` | |
659-
| codefresh.eventReporter.nodeSelector | object | `{}` (defaults to global.nodeSelector) | [Node selector] |
660-
| codefresh.eventReporter.pdb.annotations | object | `{}` | Annotations to be added to event reporter pdb |
661-
| codefresh.eventReporter.pdb.enabled | bool | `false` | Deploy a [PodDisruptionBudget] for the event reporter |
662-
| codefresh.eventReporter.pdb.labels | object | `{}` | Labels to be added to event reporter pdb |
663-
| codefresh.eventReporter.pdb.maxUnavailable | string | `""` | Number of pods that are unavailable after eviction as number or percentage (eg.: 50%). |
664-
| codefresh.eventReporter.pdb.minAvailable | string | `""` (defaults to 0 if not specified) | Number of pods that are available after eviction as number or percentage (eg.: 50%) |
665-
| codefresh.eventReporter.podAnnotations | object | `{}` | Annotations to be added to event reporter pods |
666-
| codefresh.eventReporter.podLabels | object | `{}` | Labels to be added to event reporter pods |
667-
| codefresh.eventReporter.priorityClassName | string | `""` (defaults to global.priorityClassName) | Priority class for the event reporter pods |
668-
| codefresh.eventReporter.readinessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded |
669-
| codefresh.eventReporter.readinessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated |
670-
| codefresh.eventReporter.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] |
671-
| codefresh.eventReporter.readinessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed |
672-
| codefresh.eventReporter.readinessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out |
673-
| codefresh.eventReporter.replicas | int | `3` | |
674-
| codefresh.eventReporter.resources | object | `{}` | Resource limits and requests for the event reporter pods |
675-
| codefresh.eventReporter.serviceAccount.annotations | object | `{}` | Annotations applied to created service account |
676-
| codefresh.eventReporter.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account |
677-
| codefresh.eventReporter.serviceAccount.create | bool | `true` | Create a service account for the event reporter |
678-
| codefresh.eventReporter.serviceAccount.labels | object | `{}` | Labels applied to created service account |
679-
| codefresh.eventReporter.serviceAccount.name | string | `"event-reporter"` | Service account name |
680-
| codefresh.eventReporter.statefulsetAnnotations | object | `{}` | Annotations for the event reporter StatefulSet |
681-
| codefresh.eventReporter.terminationGracePeriodSeconds | int | `30` | terminationGracePeriodSeconds for container lifecycle hook |
682-
| codefresh.eventReporter.tolerations | list | `[]` (defaults to global.tolerations) | [Tolerations] for use with node taints |
683-
| codefresh.eventReporter.topologySpreadConstraints | list | `[]` (defaults to global.topologySpreadConstraints) | Assign custom [TopologySpreadConstraints] rules to the event reporter |
684-
| codefresh.eventReporter.version | string | `"v2"` | |
685-
| codefresh.eventReporter.volumeMounts | list | `[]` | Additional volumeMounts to the event reporter main container |
686-
| codefresh.eventReporter.volumes | list | `[]` | Additional volumes to the event reporter pod |
687-
| codefresh.promotions.notifications | object | `{}` | |
614+
| codefresh.promotions.notifications.context | object | `{}` | |
615+
| codefresh.promotions.notifications.notifigers | object | `{}` | |
616+
| codefresh.promotions.notifications.subscriptions | list | `[]` | |
617+
| codefresh.promotions.notifications.templates | object | `{}` | |
618+
| codefresh.promotions.notifications.triggers | object | `{}` | |
688619
| crds.additionalLabels | object | `{}` | Addtional labels to be added to all CRDs |
689620
| crds.annotations | object | `{}` | Annotations to be added to all CRDs |
690621
| crds.install | bool | `true` | Install and upgrade CRDs |
691622
| crds.keep | bool | `true` | Keep CRDs on chart uninstall |
692623
| createAggregateRoles | bool | `false` | Create aggregated roles that extend existing cluster roles to interact with argo-cd resources |
693624
| createClusterRoles | bool | `true` | Create cluster roles for cluster-wide installation. |
625+
| eventReporter.affinity | object | `{}` (defaults to global.affinity preset) | Assign custom [affinity] rules to the deployment |
626+
| eventReporter.clusterRoleRules.enabled | bool | `false` | Enable custom rules for the event reporter's ClusterRole resource |
627+
| eventReporter.clusterRoleRules.rules | list | `[]` | List of custom rules for the event reporter's ClusterRole resource |
628+
| eventReporter.containerPorts.health | int | `8088` | |
629+
| eventReporter.containerPorts.metrics | int | `8087` | Metrics container port |
630+
| eventReporter.containerSecurityContext | object | See [values.yaml] | Event reporter container-level security context |
631+
| eventReporter.dnsConfig | object | `{}` | [DNS configuration] |
632+
| eventReporter.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for event reporter pods |
633+
| eventReporter.enabled | bool | `true` | |
634+
| eventReporter.env | list | `[]` | Environment variables to pass to event reporter |
635+
| eventReporter.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to event reporter |
636+
| eventReporter.extraArgs | list | `[]` | Additional command line arguments to pass to event reporter |
637+
| eventReporter.extraContainers | list | `[]` | Additional containers to be added to the event reporter pod |
638+
| eventReporter.hostNetwork | bool | `false` | Host Network for event reporter pods |
639+
| eventReporter.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the event reporter |
640+
| eventReporter.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the event reporter |
641+
| eventReporter.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the event reporter |
642+
| eventReporter.imagePullSecrets | list | `[]` (defaults to global.imagePullSecrets) | Secrets with credentials to pull images from a private registry |
643+
| eventReporter.initContainers | list | `[]` | Init containers to add to the event reporter pod |
644+
| eventReporter.metrics.applicationLabels.enabled | bool | `false` | Enables additional labels in argocd_app_labels metric |
645+
| eventReporter.metrics.applicationLabels.labels | list | `[]` | Additional labels |
646+
| eventReporter.metrics.enabled | bool | `false` | Deploy metrics service |
647+
| eventReporter.metrics.rules.additionalLabels | object | `{}` | PrometheusRule labels |
648+
| eventReporter.metrics.rules.annotations | object | `{}` | PrometheusRule annotations |
649+
| eventReporter.metrics.rules.enabled | bool | `false` | Deploy a PrometheusRule for the event reporter |
650+
| eventReporter.metrics.rules.namespace | string | `""` | PrometheusRule namespace |
651+
| eventReporter.metrics.rules.selector | object | `{}` | PrometheusRule selector |
652+
| eventReporter.metrics.rules.spec | list | `[]` | PrometheusRule.Spec for the event reporter |
653+
| eventReporter.metrics.service.annotations | object | `{}` | Metrics service annotations |
654+
| eventReporter.metrics.service.clusterIP | string | `""` | Metrics service clusterIP. `None` makes a "headless service" (no virtual IP) |
655+
| eventReporter.metrics.service.labels | object | `{}` | Metrics service labels |
656+
| eventReporter.metrics.service.portName | string | `"http-metrics"` | Metrics service port name |
657+
| eventReporter.metrics.service.servicePort | int | `8087` | Metrics service port |
658+
| eventReporter.metrics.service.type | string | `"ClusterIP"` | Metrics service type |
659+
| eventReporter.metrics.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels |
660+
| eventReporter.metrics.serviceMonitor.annotations | object | `{}` | Prometheus ServiceMonitor annotations |
661+
| eventReporter.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor |
662+
| eventReporter.metrics.serviceMonitor.interval | string | `"30s"` | Prometheus ServiceMonitor interval |
663+
| eventReporter.metrics.serviceMonitor.metricRelabelings | list | `[]` | Prometheus [MetricRelabelConfigs] to apply to samples before ingestion |
664+
| eventReporter.metrics.serviceMonitor.namespace | string | `""` | Prometheus ServiceMonitor namespace |
665+
| eventReporter.metrics.serviceMonitor.relabelings | list | `[]` | Prometheus [RelabelConfigs] to apply to samples before scraping |
666+
| eventReporter.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme |
667+
| eventReporter.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector |
668+
| eventReporter.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig |
669+
| eventReporter.name | string | `"event-reporter"` | |
670+
| eventReporter.nodeSelector | object | `{}` (defaults to global.nodeSelector) | [Node selector] |
671+
| eventReporter.pdb.annotations | object | `{}` | Annotations to be added to event reporter pdb |
672+
| eventReporter.pdb.enabled | bool | `false` | Deploy a [PodDisruptionBudget] for the event reporter |
673+
| eventReporter.pdb.labels | object | `{}` | Labels to be added to event reporter pdb |
674+
| eventReporter.pdb.maxUnavailable | string | `""` | Number of pods that are unavailable after eviction as number or percentage (eg.: 50%). |
675+
| eventReporter.pdb.minAvailable | string | `""` (defaults to 0 if not specified) | Number of pods that are available after eviction as number or percentage (eg.: 50%) |
676+
| eventReporter.podAnnotations | object | `{}` | Annotations to be added to event reporter pods |
677+
| eventReporter.podLabels | object | `{}` | Labels to be added to event reporter pods |
678+
| eventReporter.priorityClassName | string | `""` (defaults to global.priorityClassName) | Priority class for the event reporter pods |
679+
| eventReporter.readinessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded |
680+
| eventReporter.readinessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated |
681+
| eventReporter.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] |
682+
| eventReporter.readinessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed |
683+
| eventReporter.readinessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out |
684+
| eventReporter.replicas | int | `3` | |
685+
| eventReporter.resources | object | `{}` | Resource limits and requests for the event reporter pods |
686+
| eventReporter.serviceAccount.annotations | object | `{}` | Annotations applied to created service account |
687+
| eventReporter.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account |
688+
| eventReporter.serviceAccount.create | bool | `true` | Create a service account for the event reporter |
689+
| eventReporter.serviceAccount.labels | object | `{}` | Labels applied to created service account |
690+
| eventReporter.serviceAccount.name | string | `"event-reporter"` | Service account name |
691+
| eventReporter.statefulsetAnnotations | object | `{}` | Annotations for the event reporter StatefulSet |
692+
| eventReporter.terminationGracePeriodSeconds | int | `30` | terminationGracePeriodSeconds for container lifecycle hook |
693+
| eventReporter.tolerations | list | `[]` (defaults to global.tolerations) | [Tolerations] for use with node taints |
694+
| eventReporter.topologySpreadConstraints | list | `[]` (defaults to global.topologySpreadConstraints) | Assign custom [TopologySpreadConstraints] rules to the event reporter |
695+
| eventReporter.version | string | `"v2"` | |
696+
| eventReporter.volumeMounts | list | `[]` | Additional volumeMounts to the event reporter main container |
697+
| eventReporter.volumes | list | `[]` | Additional volumes to the event reporter pod |
694698
| extraObjects | list | `[]` | Array of extra K8s manifests to deploy |
695699
| fullnameOverride | string | `""` | String to fully override `"argo-cd.fullname"` |
696700
| kubeVersionOverride | string | `""` | Override the Kubernetes version, which is used to evaluate certain manifests |

‎charts/argo-cd/templates/argocd-configs/argocd-notifications-cm.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ data:
1212
{{- with (merge .Values.notifications.context .Values.codefresh.promotions.notifications.context) }}
1313
{{- toYaml . | nindent 4 }}
1414
{{- end }}
15-
{{- with $notifiers }}
15+
{{- with (merge .Values.notifications.notifiers .Values.codefresh.promotions.notifications.notifiers) }}
1616
{{- toYaml . | nindent 2 }}
1717
{{- end }}
18-
{{- with (append .Values.notifications.subscriptions .Values.codefresh.promotions.notifications.subscriptions) }}
18+
{{- with (concat .Values.notifications.subscriptions .Values.codefresh.promotions.notifications.subscriptions) }}
1919
subscriptions: |
2020
{{- toYaml . | nindent 4 }}
2121
{{- end }}

‎charts/argo-cd/values.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3825,4 +3825,9 @@ eventReporter:
38253825

38263826
codefresh:
38273827
promotions:
3828-
notifications: {}
3828+
notifications:
3829+
context: {}
3830+
notifigers: {}
3831+
subscriptions: []
3832+
templates: {}
3833+
triggers: {}

0 commit comments

Comments
 (0)