diff --git a/README.md b/README.md index 4515fe1..5f61354 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ We have the following tools: - [slack-event-log](./slack-event-log): Event logging for global Kubernetes events. Watch users join, create/remove emoji, and so forth. - [slack-report-message](./slack-report-message): Enables users to optionally anonymously report messages, and sends those reports to some Slack channel - [slack-moderator](./slack-moderator): Like `slack-report-message`, but if a Slack Admin or Owner uses the "report" button, instead lets them remove users and/or their content. +- [slack-moderator-words](./slack-moderator-words): Displays a message to users if they use non-inclusive langauge - [slack-welcomer](./slack-welcomer): Sends a welcome message to every user who joins Slack. - [slack-post-message](./slack-post-message): Enables users who are part of a given slack usergroup(s), to post message in multiple channel(s) using a Modal form - [Tempelis](./tempelis): Control your Slack setup with yaml config files. Combine with a CI system to implement Slack GitOps. diff --git a/cluster/slack-moderator-words/deployment.yaml b/cluster/slack-moderator-words/deployment.yaml index a742955..6f2b1fe 100644 --- a/cluster/slack-moderator-words/deployment.yaml +++ b/cluster/slack-moderator-words/deployment.yaml @@ -16,11 +16,11 @@ spec: spec: containers: - name: slack-moderator-words - image: gcr.io/kubernetes-tools/slack-moderator-words:latest + image: gcr.io/k8s-staging-slack-infra/slack-moderator-words:latest imagePullPolicy: Always args: - --config-path=/etc/slack-moderator-words/config.json - - --filter-config-path=/etc/slack-moderator-words/filters.yaml + - --filter-config-path=/etc/filters/filters.yaml ports: - containerPort: 8080 protocol: TCP @@ -28,24 +28,19 @@ spec: - name: PATH_PREFIX value: /infra/moderator-words volumeMounts: - - mountPath: /etc/slack-moderator-words/ - name: configs - readOnly: true + - mountPath: /etc/slack-moderator-words + name: config + - mountPath: /etc/filters + name: filters readinessProbe: httpGet: path: /healthz scheme: HTTP - port: 8077 - livenessProbe: - httpGet: - path: /healthz - scheme: HTTP - port: 8077 + port: 8080 volumes: - - name: configs - projected: - sources: - - secret: - name: slack-moderator-words-config - - secret: - name: slack-moderator-words-filters + - name: config + secret: + secretName: slack-moderator-words-config + - name: filters + configMap: + name: slack-moderator-words-filters diff --git a/cluster/slack-moderator-words/filters.yaml b/cluster/slack-moderator-words/filters.yaml new file mode 100644 index 0000000..a3c1721 --- /dev/null +++ b/cluster/slack-moderator-words/filters.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: slack-moderator-words-filters +data: + filters.yaml: |- + - triggers: + - guys + action: chat.postEphemeral + message: "May I suggest \"all\" instead when addessing a group of people? Thank you. :slightly_smiling_face:" diff --git a/cluster/slack-moderator-words/service.yaml b/cluster/slack-moderator-words/service.yaml index d467701..05b26e1 100644 --- a/cluster/slack-moderator-words/service.yaml +++ b/cluster/slack-moderator-words/service.yaml @@ -9,4 +9,4 @@ spec: ports: - protocol: TCP port: 80 - targetPort: 8077 + targetPort: 8080 diff --git a/slack-moderate-words/Dockerfile b/slack-moderate-words/Dockerfile deleted file mode 100644 index 119759f..0000000 --- a/slack-moderate-words/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM gcr.io/distroless/base -ADD slack-moderate-words /slack-moderate-words -ENTRYPOINT ["/slack-moderate-words"] diff --git a/slack-moderate-words/.gcloudignore b/slack-moderator-words/.gcloudignore similarity index 100% rename from slack-moderate-words/.gcloudignore rename to slack-moderator-words/.gcloudignore diff --git a/slack-moderate-words/.gitignore b/slack-moderator-words/.gitignore similarity index 53% rename from slack-moderate-words/.gitignore rename to slack-moderator-words/.gitignore index cea7c5f..44251b6 100644 --- a/slack-moderate-words/.gitignore +++ b/slack-moderator-words/.gitignore @@ -1,4 +1,4 @@ config.json # go binary -slack-moderate-words +slack-moderator-words diff --git a/slack-moderator-words/Dockerfile b/slack-moderator-words/Dockerfile new file mode 100644 index 0000000..5f3051f --- /dev/null +++ b/slack-moderator-words/Dockerfile @@ -0,0 +1,3 @@ +FROM gcr.io/distroless/base +ADD slack-moderator-words /slack-moderator-words +ENTRYPOINT ["/slack-moderator-words"] diff --git a/slack-moderate-words/README.md b/slack-moderator-words/README.md similarity index 96% rename from slack-moderate-words/README.md rename to slack-moderator-words/README.md index a5fc919..1bcbed2 100644 --- a/slack-moderate-words/README.md +++ b/slack-moderator-words/README.md @@ -1,6 +1,6 @@ # slack-moderator-words -slack-moderator-words provides a moderation when positng some specific words, and will let the user know how to write better messages. +slack-moderator-words provides a moderation when posting some specific words, and will let the user know how to write better messages. ## Configuration diff --git a/slack-moderate-words/events.go b/slack-moderator-words/events.go similarity index 98% rename from slack-moderate-words/events.go rename to slack-moderator-words/events.go index 38a8230..d3192f8 100644 --- a/slack-moderate-words/events.go +++ b/slack-moderator-words/events.go @@ -26,7 +26,7 @@ import ( "strings" "sigs.k8s.io/slack-infra/slack" - "sigs.k8s.io/slack-infra/slack-moderate-words/model" + "sigs.k8s.io/slack-infra/slack-moderator-words/model" ) type handler struct { diff --git a/slack-moderate-words/events_test.go b/slack-moderator-words/events_test.go similarity index 100% rename from slack-moderate-words/events_test.go rename to slack-moderator-words/events_test.go diff --git a/slack-moderate-words/filters.yaml b/slack-moderator-words/filters.yaml similarity index 100% rename from slack-moderate-words/filters.yaml rename to slack-moderator-words/filters.yaml diff --git a/slack-moderate-words/healthz.go b/slack-moderator-words/healthz.go similarity index 100% rename from slack-moderate-words/healthz.go rename to slack-moderator-words/healthz.go diff --git a/slack-moderate-words/healthz_test.go b/slack-moderator-words/healthz_test.go similarity index 100% rename from slack-moderate-words/healthz_test.go rename to slack-moderator-words/healthz_test.go diff --git a/slack-moderate-words/main.go b/slack-moderator-words/main.go similarity index 97% rename from slack-moderate-words/main.go rename to slack-moderator-words/main.go index 629cb11..a3b2c1f 100644 --- a/slack-moderate-words/main.go +++ b/slack-moderator-words/main.go @@ -27,7 +27,7 @@ import ( "gopkg.in/yaml.v3" "sigs.k8s.io/slack-infra/slack" - "sigs.k8s.io/slack-infra/slack-moderate-words/model" + "sigs.k8s.io/slack-infra/slack-moderator-words/model" ) type options struct { diff --git a/slack-moderate-words/model/types.go b/slack-moderator-words/model/types.go similarity index 100% rename from slack-moderate-words/model/types.go rename to slack-moderator-words/model/types.go diff --git a/variants.yaml b/variants.yaml index 8e954d7..ff50411 100644 --- a/variants.yaml +++ b/variants.yaml @@ -11,3 +11,5 @@ variants: TOOL: tempelis slack-post-message: TOOL: slack-post-message + slack-moderator-words: + TOOL: slack-moderator-words