Skip to content

updated with blockdomains #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ npm-debug.log
# IDE
.idea
.vscode

# hangops
.secrets.env
3 changes: 3 additions & 0 deletions .hangops/deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

gcloud builds submit --project=hangops-jobbot --config .hangops/gke-build-config.yaml
103 changes: 103 additions & 0 deletions .hangops/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
---
apiVersion: "v1"
kind: "ConfigMap"
metadata:
name: "hangops-inviterbot-config-tkm5"
namespace: "default"
labels:
app: "hangops-inviterbot"
data:
BLOCKDOMAINS_SLACK_LIST: "file:///blockdomains.txt"
SLACK_CHANNELS: "announcements"
SLACK_COC: "https://github.com/hangops/code-of-conduct"
SLACK_SUBDOMAIN: "hangops"
SLACKIN_INTERVAL: "300000"
SLACKIN_PORT: "3000"
---
apiVersion: "apps/v1"
kind: "Deployment"
metadata:
name: "hangops-inviterbot"
namespace: "default"
labels:
app: "hangops-inviterbot"
spec:
replicas: 3
selector:
matchLabels:
app: "hangops-inviterbot"
template:
metadata:
labels:
app: "hangops-inviterbot"
spec:
containers:
- name: "inviterbot"
image: "gcr.io/hangops-jobbot/inviterbot"
env:
- name: "BLOCKDOMAINS_SLACK_LIST"
valueFrom:
configMapKeyRef:
key: "BLOCKDOMAINS_SLACK_LIST"
name: "hangops-inviterbot-config-tkm5"
- name: "SLACK_CHANNELS"
valueFrom:
configMapKeyRef:
key: "SLACK_CHANNELS"
name: "hangops-inviterbot-config-tkm5"
- name: "SLACK_COC"
valueFrom:
configMapKeyRef:
key: "SLACK_COC"
name: "hangops-inviterbot-config-tkm5"
- name: "SLACK_SUBDOMAIN"
valueFrom:
configMapKeyRef:
key: "SLACK_SUBDOMAIN"
name: "hangops-inviterbot-config-tkm5"
- name: "SLACKIN_INTERVAL"
valueFrom:
configMapKeyRef:
key: "SLACKIN_INTERVAL"
name: "hangops-inviterbot-config-tkm5"
- name: "SLACKIN_PORT"
valueFrom:
configMapKeyRef:
key: "SLACKIN_PORT"
name: "hangops-inviterbot-config-tkm5"
- name: "SLACK_API_TOKEN"
valueFrom:
secretKeyRef:
name: "hangops-slack-api-token"
key: "SLACK_API_TOKEN"
- name: "GOOGLE_CAPTCHA_SECRET"
valueFrom:
secretKeyRef:
name: "hangops-captcha-config"
key: "GOOGLE_CAPTCHA_SECRET"
- name: "GOOGLE_CAPTCHA_SITEKEY"
valueFrom:
secretKeyRef:
name: "hangops-captcha-config"
key: "GOOGLE_CAPTCHA_SITEKEY"

---
apiVersion: "autoscaling/v2beta1"
kind: "HorizontalPodAutoscaler"
metadata:
name: "hangops-inviterbot-hpa-jfsl"
namespace: "default"
labels:
app: "hangops-inviterbot"
spec:
scaleTargetRef:
kind: "Deployment"
name: "hangops-inviterbot"
apiVersion: "apps/v1"
minReplicas: 1
maxReplicas: 5
metrics:
- type: "Resource"
resource:
name: "cpu"
targetAverageUtilization: 80
15 changes: 15 additions & 0 deletions .hangops/gke-build-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
steps:
# build the container image
- name: "gcr.io/cloud-builders/docker"
args: ["build", "-t", "gcr.io/hangops-jobbot/inviterbot:latest", "."]
# push container image
- name: "gcr.io/cloud-builders/docker"
args: ["push", "gcr.io/hangops-jobbot/inviterbot:latest"]
# deploy container image to GKE
- name: "gcr.io/cloud-builders/gke-deploy"
args:
- run
- --filename=.local/deployment.yaml
- --image=gcr.io/hangops-jobbot/inviterbot:latest
- --location=us-west2-a
- --cluster=hangops-jobbot-cluster
20 changes: 20 additions & 0 deletions .hangops/update-secrets.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash
set -Eeuo pipefail

if [ -f '.secrets.env' ]; then
source .secrets.env
else
echo 'no .secrets.env file present'
exit 1
fi

: ${KUBECTL_CONTEXT:="hangops"}

kubectl --context=${KUBECTL_CONTEXT} create secret generic hangops-slack-api-token --save-config --dry-run=client -o yaml \
--from-literal=SLACK_API_TOKEN=${HANGOPS_SLACK_API_TOKEN} \
| kubectl --context=${KUBECTL_CONTEXT} apply -f -

kubectl --context=${KUBECTL_CONTEXT} create secret generic hangops-captcha-config --save-config --dry-run=client -o yaml \
--from-literal=GOOGLE_CAPTCHA_SECRET=${HANGOPS_GOOGLE_CAPTCHA_SECRET} \
--from-literal=GOOGLE_CAPTCHA_SITEKEY=${HANGOPS_GOOGLE_CAPTCHA_SITEKEY} \
| kubectl --context=${KUBECTL_CONTEXT} apply -f -
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ ADD . /srv/www
WORKDIR /srv/www
RUN npm install --unsafe-perm
RUN npm run build
RUN mv -f /srv/www/blockdomains.txt /blockdomains.txt

CMD ./bin/slackin.js
8 changes: 8 additions & 0 deletions bin/slackin.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const args = require('args');
const hostenv = require('hostenv');
const dbg = require('debug');
const slackin = require('../lib');
const fs = require('fs');

require('dotenv').config();

Expand Down Expand Up @@ -86,12 +87,19 @@ const flags = args.parse(process.argv, {
// Required arguments
const org = args.sub[0] || process.env.SLACK_SUBDOMAIN;
const token = args.sub[1] || process.env.SLACK_API_TOKEN;
var blockDomains = process.env.BLOCKDOMAINS_SLACK_LIST || ''
// Try to read blockdomains in as a file.
if (blockDomains.startsWith('file://')) {
blockDomains = fs.readFileSync(blockDomains.substr(7)).toString()
}


if (flags.help || !org || !token) {
args.showHelp();
} else {
flags.org = org;
flags.token = token;
flags.blockDomains = blockDomains
}

// Group the reCAPTCHA settings
Expand Down
Loading