Merge pull request #2350 from lsst-sqre/tickets/DM-40060b

DM-40060: Change mobu disableSlackAlerts to slackAlerts
lsst-sqre · Jul 25, 2023 · d4bcacf · d4bcacf
2 parents bb213c1 + a42b8c6
commit d4bcacf
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/applications/mobu/README.md b/applications/mobu/README.md
@@ -13,8 +13,8 @@ Continuous integration testing
 | affinity | object | `{}` | Affinity rules for the mobu frontend pod |
 | config.autostart | list | `[]` | Autostart specification. Must be a list of mobu flock specifications. Each flock listed will be automatically started when mobu is started. |
 | config.debug | bool | `false` | If set to true, include the output from all flocks in the main mobu log and disable structured JSON logging. |
-| config.disableSlackAlerts | bool | `false` | If set to true, do not configure mobu to send alerts to Slack. |
 | config.pathPrefix | string | `"/mobu"` | Prefix for mobu's API routes. |
+| config.slackAlerts | bool | `true` | Whether to send alerts and status to Slack. |
 | fullnameOverride | string | `""` | Override the full name for resources (includes the release name) |
 | global.baseUrl | string | Set by Argo CD | Base URL for the environment |
 | global.host | string | Set by Argo CD | Host name for ingress |

diff --git a/applications/mobu/templates/deployment.yaml b/applications/mobu/templates/deployment.yaml
@@ -24,7 +24,7 @@ spec:
       containers:
         - name: {{ .Chart.Name }}
           env:
-            {{- if (not .Values.config.disableSlackAlerts) }}
+            {{- if .Values.config.slackAlerts }}
             - name: "ALERT_HOOK"
               valueFrom:
                 secretKeyRef:

diff --git a/applications/mobu/templates/vault-secrets.yaml b/applications/mobu/templates/vault-secrets.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.config.slackAlerts }}
 apiVersion: ricoberger.de/v1alpha1
 kind: VaultSecret
 metadata:
@@ -7,3 +8,4 @@ metadata:
 spec:
   path: "{{ .Values.global.vaultSecretsPath }}/mobu"
   type: "Opaque"
+{{- end }}
diff --git a/applications/mobu/values-minikube.yaml b/applications/mobu/values-minikube.yaml
@@ -1,2 +1,2 @@
 config:
-  disableSlackAlerts: true
+  slackAlerts: false
diff --git a/applications/mobu/values-usdfdev.yaml b/applications/mobu/values-usdfdev.yaml
@@ -1,2 +1,2 @@
 config:
-  disableSlackAlerts: true
+  slackAlerts: false
diff --git a/applications/mobu/values-usdfprod.yaml b/applications/mobu/values-usdfprod.yaml
@@ -1,2 +1,2 @@
 config:
-  disableSlackAlerts: true
+  slackAlerts: false
diff --git a/applications/mobu/values.yaml b/applications/mobu/values.yaml
@@ -30,8 +30,8 @@ config:
   # and disable structured JSON logging.
   debug: false
 
-  # -- If set to true, do not configure mobu to send alerts to Slack.
-  disableSlackAlerts: false
+  # -- Whether to send alerts and status to Slack.
+  slackAlerts: true
 
   # -- Prefix for mobu's API routes.
   pathPrefix: "/mobu"