.github/workflows/main.yml

@@ -21,44 +21,32 @@ jobs:
         id: get_version
         uses: battila7/get-version-action@v2.0.0
 
-      - name: install buildx
+      - name: Build container image
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v1
-        with:
-          version: latest
-
-      - name: Docker Login
-        # 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: Docker Build & Push
         env:
           IMAGE_TAG: ${{ steps.get_version.outputs.version-without-v }}
-        run: |
+        run: docker build -t registry.digitalocean.com/djpianalto/goff:$IMAGE_TAG .
-          docker buildx build --push \
+
-          --tag ${{ secrets.DR_URL }}/goff:$IMAGE_TAG \
+      - name: Install doctl
-          --platform linux/amd64,linux/arm/v7,linux/arm64 . 
+        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
+        env:
+          IMAGE_TAG: ${{ steps.get_version.outputs.version-without-v }}
+        run: docker push registry.digitalocean.com/djpianalto/goff:$IMAGE_TAG
 
       - name: Update deployment file
-        run: TAG=${{ steps.get_version.outputs.version-without-v }} && sed -i 's|<IMAGE>|${{ secrets.DR_URL }}/goff:'${TAG}'|' $GITHUB_WORKSPACE/deployment.yml
+        run: TAG=${{ steps.get_version.outputs.version-without-v }} && sed -i 's|<IMAGE>|registry.digitalocean.com/djpianalto/goff:'${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 deployment/goff -n discord-bots
+        run: kubectl rollout status deployment/goff

deployment.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: goff
-  namespace: discord-bots
+  namespace: default
   labels:
     app: goff
 spec:
@@ -21,42 +21,8 @@ spec:
         app: goff
     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: goff
-                  key: pgbouncer_url
-            - name: SERVER_TLS_SSLMODE
-              valueFrom:
-                secretKeyRef:
-                  name: goff
-                  key: pgbouncer_ssl
-            - name: AUTH_TYPE
-              valueFrom:
-                secretKeyRef:
-                  name: goff
-                  key: pgbouncer_auth
-          ports:
-            - containerPort: 5432
         - name: goff
           image: <IMAGE>
-          resources:
-            requests:
-              memory: "512Mi"
-              cpu: "1"
-            limits:
-              memory: "1Gi"
-              cpu: "2"
           env:
             - name: DATABASE_URL
               valueFrom:
@@ -78,5 +44,3 @@ spec:
                 secretKeyRef:
                   name: goff
                   key: email_password
-      imagePullSecrets:
-        - name: registry-1

internal/exts/user_management/member_join.go

@@ -103,7 +103,13 @@ func OnGuildMemberUpdate(s *discordgo.Session, member *discordgo.GuildMemberUpda
 			log.Println("Error getting Auto Join Roles: ", err)
 		}
 		log.Println(roles)
+	RoleLoop:
 		for _, r := range roles {
+			for _, rl := range member.Roles {
+				if rl == r.ID {
+					continue RoleLoop
+				}
+			}
 			role, err := s.State.Role(member.GuildID, r.ID)
 			if err != nil {
 				log.Println("Error getting role: ", err)