.github/workflows/main.yml

@@ -20,45 +20,41 @@ jobs:
       - name: Get Version
         id: get_version
         uses: battila7/get-version-action@v2.0.0
-      
-      - name: install buildx
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v1
-        with:
-          version: latest
 
-      - name: Docker Login
+      - name: Install go-bindata and build migrations
-        # You may pin to the exact commit or the version.
+        env:
-        # uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+          GOPATH: /home/runner/work/Geeksbot/
-        uses: docker/login-action@v1.10.0
+        run: |
-        with:
+            go get -u github.com/go-bindata/go-bindata/...
-          registry: ${{ secrets.DR_URL }}
+            /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/
-          # Username used to log against the Docker registry
+            head $GITHUB_WORKSPACE/pkg/database/migrations/bindata.go
-          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: Docker Build & Push
+      - 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 }}
+
+      - name: Login to DigitalOcean Container Registry with short-lived credentials
+        run: doctl registry login --expiry-seconds 600
+
+      - name: Push image to DigitalOcean Container Registry
+        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>|${{ secrets.DR_URL }}/geeksbot:'${TAG}'|' $GITHUB_WORKSPACE/deployment.yml
+        run: TAG=${{ steps.get_version.outputs.version-without-v }} && sed -i 's|<IMAGE>|registry.digitalocean.com/djpianalto/geeksbot:'${TAG}'|' $GITHUB_WORKSPACE/deployment.yml
 
-      - uses: azure/k8s-set-context@v1
+      - name: Save DigitalOcean kubeconfig with short-lived credentials
-        with:
+        run: doctl kubernetes cluster kubeconfig save --expiry-seconds 600 discord-bots
-          method: kubeconfig
-          kubeconfig: ${{ secrets.KUBE_CONFIG }}
-        id: setcontext
 
-      - name: Deploy to Kubernetes
+      - name: Deploy to DigitalOcean Kubernetes
         run: kubectl apply -f $GITHUB_WORKSPACE/deployment.yml
 
       - name: Verify deployment
-        run: kubectl rollout status -n discord-bots deployment/geeksbot
+        run: kubectl rollout status 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: discord-bots
+  namespace: default
   labels:
     app: geeksbot
 spec:
@@ -21,42 +21,8 @@ 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:
@@ -68,5 +34,3 @@ spec:
                 secretKeyRef:
                   name: geeksbot
                   key: discord_token
-      imagePullSecrets:
-        - name: registry-1

internal/exts/arcon/arcon.go

@@ -171,8 +171,8 @@ func broadcast(ctx disgoman.Context, server geeksbot.Server, message string) {
 		)
 		return
 	}
-	log.Printf("%T - %#v", response, response)
+	log.Printf(response)
-	if strings.Contains(response, "Server received, But no response!!") {
+	if response == "Server recieved, But no response!!\r\n" {
 		_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
 			fmt.Sprintf("**%s Broadcast Successful**", server.Name),
 		)