Add pgbouncer

.github/workflows/main.yml

@@ -21,40 +21,44 @@ jobs:
         id: get_version
         uses: battila7/get-version-action@v2.0.0
       
-      - name: Install go-bindata and build migrations
+      - name: install buildx
-        env:
+        id: buildx
-          GOPATH: /home/runner/work/Geeksbot/
+        uses: crazy-max/ghaction-docker-buildx@v1
-        run: |
-            go get -u github.com/go-bindata/go-bindata/...
-            /home/runner/work/Geeksbot/bin/go-bindata -pkg migrations -prefix $GITHUB_WORKSPACE/pkg/database/migrations/ -o $GITHUB_WORKSPACE/pkg/database/migrations/bindata.go $GITHUB_WORKSPACE/pkg/database/migrations/
-            head $GITHUB_WORKSPACE/pkg/database/migrations/bindata.go
-
-      - name: Build container image
-        env:
-          IMAGE_TAG: ${{ steps.get_version.outputs.version-without-v }}
-        run: docker build -t registry.digitalocean.com/djpianalto/geeksbot:$IMAGE_TAG .
-
-      - name: Install doctl
-        uses: digitalocean/action-doctl@v2
         with:
-          token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
+          version: latest
 
-      - name: Login to DigitalOcean Container Registry with short-lived credentials
+      - name: Docker Login
-        run: doctl registry login --expiry-seconds 600
+        # You may pin to the exact commit or the version.
+        # uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        uses: docker/login-action@v1.10.0
+        with:
+          registry: ${{ secrets.DR_URL }}
+          # Username used to log against the Docker registry
+          username: ${{ secrets.DH_USERNAME }}
+          # Password or personal access token used to log against the Docker registry
+          password: ${{ secrets.DH_PASSWORD }}
+          # Log out from the Docker registry at the end of a job
+          logout: true
 
-      - name: Push image to DigitalOcean Container Registry
+      - name: Docker Build & Push
-        run: docker push registry.digitalocean.com/djpianalto/geeksbot:$IMAGE_TAG
         env:
           IMAGE_TAG: ${{ steps.get_version.outputs.version-without-v }}
+        run: |
+          docker buildx build --push \
+          --tag ${{ secrets.DR_URL }}/geeksbot:$IMAGE_TAG \
+          --platform linux/amd64,linux/arm/v7,linux/arm64 . 
 
       - name: Update deployment file
-        run: TAG=${{ steps.get_version.outputs.version-without-v }} && sed -i 's|<IMAGE>|registry.digitalocean.com/djpianalto/geeksbot:'${TAG}'|' $GITHUB_WORKSPACE/deployment.yml
+        run: TAG=${{ steps.get_version.outputs.version-without-v }} && sed -i 's|<IMAGE>|${{ secrets.DR_URL }}/geeksbot:'${TAG}'|' $GITHUB_WORKSPACE/deployment.yml
 
-      - name: Save DigitalOcean kubeconfig with short-lived credentials
+      - uses: azure/k8s-set-context@v1
-        run: doctl kubernetes cluster kubeconfig save --expiry-seconds 600 discord-bots
+        with:
+          method: kubeconfig
+          kubeconfig: ${{ secrets.KUBE_CONFIG }}
+        id: setcontext
 
-      - name: Deploy to DigitalOcean Kubernetes
+      - name: Deploy to Kubernetes
         run: kubectl apply -f $GITHUB_WORKSPACE/deployment.yml
 
       - name: Verify deployment
-        run: kubectl rollout status deployment/geeksbot
+        run: kubectl rollout status -n discord-bots deployment/geeksbot

cmd/geeksbot/main.go

@@ -28,7 +28,7 @@ func main() {
 	}
 
 	database.ConnectDatabase(os.Getenv("DATABASE_URL"))
-	database.RunMigrations()
+	//database.RunMigrations()
 	services.InitializeServices()
 
 	owners := []string{

deployment.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: geeksbot
-  namespace: default
+  namespace: discord-bots
   labels:
     app: geeksbot
 spec:
@@ -21,8 +21,42 @@ spec:
         app: geeksbot
     spec:
       containers:
+        - name: pgbouncer
+          image: timoha/pgbouncer:1.15.0
+          resources:
+            requests:
+              memory: "256Mi"
+              cpu: "0.5"
+            limits:
+              memory: "512Mi"
+              cpu: "1"
+          env:
+            - name: DATABASE_URL
+              valueFrom:
+                secretKeyRef:
+                  name: geeksbot
+                  key: pgbouncer_url
+            - name: SERVER_TLS_SSLMODE
+              valueFrom:
+                secretKeyRef:
+                  name: geeksbot
+                  key: pgbouncer_ssl
+            - name: AUTH_TYPE
+              valueFrom:
+                secretKeyRef:
+                  name: geeksbot
+                  key: pgbouncer_auth
+          ports:
+            - containerPort: 5432
         - name: geeksbot
           image: <IMAGE>
+          resources:
+            requests:
+              memory: "512Mi"
+              cpu: "1"
+            limits:
+              memory: "1Gi"
+              cpu: "2"
           env:
             - name: DATABASE_URL
               valueFrom:
@@ -34,3 +68,5 @@ spec:
                 secretKeyRef:
                   name: geeksbot
                   key: discord_token
+      imagePullSecrets:
+        - name: registry-1

go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect
 	github.com/golang-migrate/migrate v3.5.4+incompatible // indirect
 	github.com/golang-migrate/migrate/v4 v4.14.1
+	github.com/gorcon/rcon v1.3.1
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/lib/pq v1.8.0
 )

go.sum

@@ -152,6 +152,8 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/gorcon/rcon v1.3.1 h1:z6a5iOlojfdkvA1qaKEng7QfCJuCzYlC9BUDs6/M+74=
+github.com/gorcon/rcon v1.3.1/go.mod h1:2gztBPSV2WxkPkqV4jiJkdHs+NT46mNSGb8JxbPesx4=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=

internal/exts/arcon/arcon.go

@@ -2,6 +2,7 @@ package arcon
 
 import (
 	"fmt"
+	"log"
 	"strings"
 
 	"github.com/dustinpianalto/disgoman"
@@ -126,7 +127,7 @@ func broadcastCommandFunc(ctx disgoman.Context, args []string) {
 	if !discord_utils.IsGuildAdmin(ctx, author) && !discord_utils.IsGuildMod(ctx, author) {
 		return
 	}
-	message := strings.Join(args[1:len(args)-1], " ")
+	message := strings.Join(args[1:len(args)], " ")
 	if strings.ToLower(args[0]) == "all" {
 		servers, err := services.ServerService.GuildServers(guild)
 		if err != nil {
@@ -170,7 +171,8 @@ func broadcast(ctx disgoman.Context, server geeksbot.Server, message string) {
 		)
 		return
 	}
-	if response == "Server recieved, But no response!!" {
+	log.Printf("%T - %#v", response, response)
+	if strings.Contains(response, "Server received, But no response!!") {
 		_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
 			fmt.Sprintf("**%s Broadcast Successful**", server.Name),
 		)

internal/exts/init.go

@@ -38,4 +38,5 @@ func AddCommandHandlers(g *disgoman.CommandManager) {
 	_ = g.AddCommand(requests.ViewCommand)
 	_ = g.AddCommand(requests.CommentCommand)
 	_ = g.AddCommand(arcon.ListplayersCommand)
+	_ = g.AddCommand(arcon.BroadcastCommand)
 }