From 833621ba7deade42d266107b41b71680b3688460 Mon Sep 17 00:00:00 2001
From: Kingdon Barrett <kingdon@weave.works>
Date: Mon, 10 Jan 2022 08:38:24 -0500
Subject: [PATCH] enable slack notifications

---
 .../slack-notification.yaml                   |  4 +-
 .../moo-cluster/slack-app-token-secret.yaml   | 40 +++++++++++++++++++
 .../moo-cluster/webhook-slack-url-secret.yaml | 38 ------------------
 3 files changed, 42 insertions(+), 40 deletions(-)
 create mode 100644 secrets/moo-cluster/slack-app-token-secret.yaml
 delete mode 100644 secrets/moo-cluster/webhook-slack-url-secret.yaml

diff --git a/clusters/moo-cluster/flux-system-extras/slack-notification.yaml b/clusters/moo-cluster/flux-system-extras/slack-notification.yaml
index cb987847..ab81a19d 100644
--- a/clusters/moo-cluster/flux-system-extras/slack-notification.yaml
+++ b/clusters/moo-cluster/flux-system-extras/slack-notification.yaml
@@ -5,6 +5,6 @@ metadata:
   namespace: flux-system
 spec:
   type: slack
-  channel: general
+  channel: gitops
   secretRef:
-    name: slack-url
+    name: slack-token
diff --git a/secrets/moo-cluster/slack-app-token-secret.yaml b/secrets/moo-cluster/slack-app-token-secret.yaml
new file mode 100644
index 00000000..82e3651c
--- /dev/null
+++ b/secrets/moo-cluster/slack-app-token-secret.yaml
@@ -0,0 +1,40 @@
+apiVersion: v1
+data:
+    address: ENC[AES256_GCM,data:YXYusX3tvBwC4S3Z+odgeVyKNHLAjymr/1W75zjCae0SNxUvIht5h6be056MBGSfrPOuSQ==,iv:T6PKGgd9/vl8qLPMAdphhn455Bq2XesM/RLuI2eufcg=,tag:3NzOwlQt7hkURrZ9rlhslg==,type:str]
+    token: ENC[AES256_GCM,data:FkeKhtehhzawJd2K6VPVDJuhkM++WNcP1f76lX45mhIl0ueezSxhARFyCvcCAg9hHDtJRX/IfmXScYT42yWfEpcvUBvUgYYlbhk+Kg==,iv:FHWGCiLO863hqPLAMda4inNDOpiWOzzKJ5wkHOK2SPw=,tag:xZ9sWuUSBVxD/82OXs+aHQ==,type:str]
+kind: Secret
+metadata:
+    name: slack-token
+    namespace: flux-system
+type: Opaque
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2022-01-10T13:36:54Z"
+    mac: ENC[AES256_GCM,data:yedfZIxDa8AolJO7+XW9VcolUAGwJUB6+wSvttXSHmyjUoZzasbXCEibfd4LfhQSt3bAMZmgVvXqZAocYu0xq/45F4/vsKQrRLGH8/L3EzuhRziO/M/tYTuv+Y3KI0nIU6Vjeq+5bSWQNwUxS8MwR9SDiDGwQJ+F4vMB3Zf0x0A=,iv:jKlacPPx4rzRFMsbR22FG2YvpZJQTDOaYHI9EPh8Toc=,tag:vw6ZZyK1fa99bLTz/ziTQA==,type:str]
+    pgp:
+        - created_at: "2022-01-10T13:36:53Z"
+          enc: |
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMA06rSFOpPqRMAQ/+ORiVOjEbsy9Z+OUj6gVTNtcjLX6VskIN2ySLJD7tFSjW
+            sdfm8FOC8xD3oroCf9HrBJ1S6Uwv1/N7+dgpPGwEfM1kEMbdiCXOPUXGht8sbKn8
+            USgT8kJAFYzTajoerJZkKlsBTnWC0Sc9j9WXm7HjuFigS+b2En3kp8/+0CbycTD0
+            k+zzOsAK9mxRyZMLfY0PnmIccFlLY965ozVl0E9irl4tm751kNvWWbW6CR2/yC/b
+            i9985GkquuCgQUk3V8q26ctg9SDRaWPOWpqTsrJd42kq7yLr6WzuhoSMKoOInxAy
+            Sm/jVaULheXQ9m0BAi75JEUocsX3cSvRF1Amx0n+DDljuL0adw3RjLYTUcNc+E0K
+            TkS6+semvzKIRiEMb93XQt098yajoPbG5vIC4hQTQu4LgOgUBmEO/SEfZK7qz1Z8
+            AL+BqZeHZ/YfwtRnAZApEuXsPTGIXM0sRqgngUy00ueil0fJIdAlB0U3Tu+LfrnS
+            JfHlXFDX+u3Gu1bUi+Cauj1wUuz66WVblYu7msBLL09oPPL7mM0RDVTRCXAy9pUG
+            Zt1y9m2JO9DxRh3F41ubK6FcTjWlLQ8rmtn7Lw/uc1amyluFYQwVkmx/v0ye+7w6
+            nYsh2K3RfZN3H9WH/nIywljhY47FhuP4ISRCCR9izmgD4QU/eQ05crHbASjYiIfS
+            XgFWEy1y9oYZxAA1P8kQvqJUvv59u+oPNIsY9jFjHMoNgsabayozjIYg5y4xxrkV
+            eOfofy7Z2wCxAAakPTmAWvmUq2RucequQaIgPnTBK0NaWlP4JGdD4WJ3Ivjhx3E=
+            =LEBn
+            -----END PGP MESSAGE-----
+          fp: A883B02E14B7EAF0A6BDAF69ECD23C5916E31D4F
+    encrypted_regex: ^(data|stringData)$
+    version: 3.7.1
diff --git a/secrets/moo-cluster/webhook-slack-url-secret.yaml b/secrets/moo-cluster/webhook-slack-url-secret.yaml
deleted file mode 100644
index 6e4d6d9b..00000000
--- a/secrets/moo-cluster/webhook-slack-url-secret.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: v1
-stringData:
-    address: ENC[AES256_GCM,data:Xwx/GKiPGaPClB/tW43Zf5W2csQovzI+crmFf5zX1sKlv2rMVfxZzaAMnCUT8i0JI60ehyBr8bl0mI/mcoPZGcvlYpUQu3pR6W39sSp/fw==,iv:pQCo6o7j1Grjr1wtergCz3AEqbxng0xO8w5Fibb9fwo=,tag:LvHbrez1yCQuteNo77xXgg==,type:str]
-kind: Secret
-metadata:
-    name: slack-url
-    namespace: flux-system
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age: []
-    lastmodified: "2021-10-09T16:33:00Z"
-    mac: ENC[AES256_GCM,data:2fUfemX9IxueDjoKK0JeMER1upjmcMJgLnTU5MTwEFH4ZuqbrIGhvPDz9TaoN0HHW5AdYaxvYuA3UuhKKBCxqPSbm7Alwa2iA5vyLS2eah0zB12TvTc/y4yIcMw9Sxixsorv4Z6h1BWlbC8g6Mry3XX/tiBM0mkgLpda8aEPUoE=,iv:hrw4n35wYBKuzgzQB3ERMD44v+F6mNFRgkKfVExpWAw=,tag:XYW++Mvu1VtvGqpXOpfqCw==,type:str]
-    pgp:
-        - created_at: "2021-04-25T21:26:18Z"
-          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA06rSFOpPqRMAQ//U8/y5FwiWEvJcTDbWjlZASf5W3y3E6kbUAM+xkcWsnfV
-            6txx1lDvU5LRnjmlcfUc1c0YPsHpYuSYqxEewsX4vdqd75KItOB9Kue4ugykkowo
-            q8z50biMY2pQVklWBtJb200xPnY5mwd4ti/tzAs6U21t4ehSLFQFExS1Up67a5M0
-            BpUWzpBeQCtDWKAWyvWzbBqmuh7aP/ZSuewCkCUepdP86cxv/efnQmEQWDcRRSWj
-            hGghy1Z1csX4LFZL0D8QARAVj21xkm/DEOAaI9brJaH6Dp6k2Oj5ge7R5ZW25/Hb
-            rdxXYJ/oDpsBfcfkpJrAHwWm5AYZ6wpqo+jYj3zFjcvvmbEgfYUtSR+DwOz0GNeR
-            Aji4KVitb1J/OQzlUa061msU3Aw7f+i5/5dLK+K2E+nnghIXpvuwJZFbzs+9XtUZ
-            dQzsRZv8qVrWHS9v6Gn+KYSIJBExPKa7FpFRTBvAiIE6N6iBebFukFOJv245Igne
-            6qJA6c5dePOgJ+zEVbxbAvGS5+NKEK7IeDe5rqw4m6TP5e/lGStnRPHw0ebsX+UP
-            NKMSWmstM+Pkj4zul6X25oX9Se2gcC+6eBOnAly5vLrIDdy+An2+WJQgzE9ybX0Z
-            ZorwsSdnlGDPgCz6ZXTqK9r9k8e1chhOr0kArf0zghCugDwsHPKxlul/FlQ/Lz7S
-            XgEmELsv+nIeU9hMLjvRkjW4qHb7BkkCAPmq1DPqJYAD5Q3hCQ/emTKVCHHJZqzJ
-            jj3dBi7H4L9PY/+cIt9SO1WiU5toh4xM+nn0uRD7BWNvr79r7dEIdl/1mzVT31o=
-            =bsXA
-            -----END PGP MESSAGE-----
-          fp: A883B02E14B7EAF0A6BDAF69ECD23C5916E31D4F
-    encrypted_regex: ^(data|stringData)$
-    version: 3.7.1