From fc394207f5476ae592f21bfbc4f7c530f2403782 Mon Sep 17 00:00:00 2001
From: Atif Ali <atif@coder.com>
Date: Tue, 25 Jul 2023 10:58:31 +0000
Subject: [PATCH 1/9] set up custom domain

---
 .github/workflows/pr-deploy.yaml | 42 +++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr-deploy.yaml b/.github/workflows/pr-deploy.yaml
index 83a040026fb4f..50d0a6a05e6b7 100644
--- a/.github/workflows/pr-deploy.yaml
+++ b/.github/workflows/pr-deploy.yaml
@@ -150,6 +150,35 @@ jobs:
           kubectl delete namespace "pr${{ env.PR_NUMBER }}" || true
           kubectl create namespace "pr${{ env.PR_NUMBER }}"
 
+      - name: Setup ingress
+        run: |
+          echo <<EOF
+          apiVersion: networking.k8s.io/v1
+          kind: Ingress
+          metadata:
+            name: pr${{ env.PR_NUMBER }}-ingress
+            namespace: pr${{ env.PR_NUMBER }}
+            annotations:
+              cert-manager.io/cluster-issuer: letsencrypt-prod
+          spec:
+            tls:
+            - hosts:
+              - "pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"
+              secretName: pr${{ env.PR_NUMBER }}-tls
+            rules:
+            - host: "pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"
+              http:
+                paths:
+                - pathType: Prefix
+                  path: /
+                  backend:
+                    service:
+                      name: coder
+                      port:
+                        number: 80
+          EOF > ingress.yaml
+          kubectl apply -f ingress.yaml
+
       - name: Install Helm chart
         run: |
           helm upgrade --install pr${{ env.PR_NUMBER }}  ./helm \
@@ -159,7 +188,18 @@ jobs:
           --set coder.service.type=ClusterIP \
           --set coder.serviceAccount.enableDeployments=true \
           --set coder.env[0].name=CODER_ACCESS_URL \
-          --set coder.env[0].value="" \
+          --set coder.env[0].value="https://pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}" \
+          --set coder.env[1].name=CODER_OAUTH2_GITHUB_ALLOW_SIGNUPS \
+          --set coder.env[1].value=true \
+          --set coder.env[2].name=CODER_OAUTH2_GITHUB_CLIENT_ID \
+          --set coder.env[2].value=${{ secrets.PR_DEPLOYMENTS_GITHUB_OAUTH_CLIENT_ID }} \
+          --set coder.env[3].name=CODER_OAUTH2_GITHUB_CLIENT_SECRET \
+          --set coder.env[3].value=${{ secrets.PR_DEPLOYMENTS_GITHUB_OAUTH_CLIENT_SECRET }} \
+          --set coder.env[4].name=CODER_OAUTH2_GITHUB_ALLOWED_ORGS \
+          --set coder.env[4].value=coder \
+          # Uncomment this when https://github.com/coder/coder/issues/8714 is resolved
+          # --set coder.env[5].name=CODER_OAUTH2_GITHUB_REDIRECT_URI \
+          # --set coder.env[5].value="https://pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}/gitauth/github/callback \
           --force
 
       - name: Get deployment URL

From f89ee84562000ce340e1eea95d4b9905a71fd6a4 Mon Sep 17 00:00:00 2001
From: Atif Ali <atif@coder.com>
Date: Tue, 25 Jul 2023 14:38:11 +0000
Subject: [PATCH 2/9] prepare for Github OAuth

---
 .github/workflows/pr-deploy.yaml | 40 ++++++++++++--------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/pr-deploy.yaml b/.github/workflows/pr-deploy.yaml
index 50d0a6a05e6b7..5886c3b3e9f4f 100644
--- a/.github/workflows/pr-deploy.yaml
+++ b/.github/workflows/pr-deploy.yaml
@@ -152,11 +152,11 @@ jobs:
 
       - name: Setup ingress
         run: |
-          echo <<EOF
+          cat <<EOF > ingress.yaml
           apiVersion: networking.k8s.io/v1
           kind: Ingress
           metadata:
-            name: pr${{ env.PR_NUMBER }}-ingress
+            name: pr${{ env.PR_NUMBER }}
             namespace: pr${{ env.PR_NUMBER }}
             annotations:
               cert-manager.io/cluster-issuer: letsencrypt-prod
@@ -176,7 +176,7 @@ jobs:
                       name: coder
                       port:
                         number: 80
-          EOF > ingress.yaml
+          EOF
           kubectl apply -f ingress.yaml
 
       - name: Install Helm chart
@@ -189,35 +189,25 @@ jobs:
           --set coder.serviceAccount.enableDeployments=true \
           --set coder.env[0].name=CODER_ACCESS_URL \
           --set coder.env[0].value="https://pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}" \
-          --set coder.env[1].name=CODER_OAUTH2_GITHUB_ALLOW_SIGNUPS \
-          --set coder.env[1].value=true \
-          --set coder.env[2].name=CODER_OAUTH2_GITHUB_CLIENT_ID \
-          --set coder.env[2].value=${{ secrets.PR_DEPLOYMENTS_GITHUB_OAUTH_CLIENT_ID }} \
-          --set coder.env[3].name=CODER_OAUTH2_GITHUB_CLIENT_SECRET \
-          --set coder.env[3].value=${{ secrets.PR_DEPLOYMENTS_GITHUB_OAUTH_CLIENT_SECRET }} \
-          --set coder.env[4].name=CODER_OAUTH2_GITHUB_ALLOWED_ORGS \
-          --set coder.env[4].value=coder \
           # Uncomment this when https://github.com/coder/coder/issues/8714 is resolved
+          # --set coder.env[1].name=CODER_OAUTH2_GITHUB_ALLOW_SIGNUPS \
+          # --set coder.env[1].value=true \
+          # --set coder.env[2].name=CODER_OAUTH2_GITHUB_CLIENT_ID \
+          # --set coder.env[2].value=${{ secrets.PR_DEPLOYMENTS_GITHUB_OAUTH_CLIENT_ID }} \
+          # --set coder.env[3].name=CODER_OAUTH2_GITHUB_CLIENT_SECRET \
+          #--set coder.env[3].value=${{ secrets.PR_DEPLOYMENTS_GITHUB_OAUTH_CLIENT_SECRET }} \
+          #--set coder.env[4].name=CODER_OAUTH2_GITHUB_ALLOWED_ORGS \
+          #--set coder.env[4].value=coder \
           # --set coder.env[5].name=CODER_OAUTH2_GITHUB_REDIRECT_URI \
           # --set coder.env[5].value="https://pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}/gitauth/github/callback \
           --force
 
-      - name: Get deployment URL
-        id: deployment_url
-        run: |
-          set -euo pipefail
-          kubectl rollout status deployment/coder --namespace "pr${{ env.PR_NUMBER }}"
-          POD_NAME=$(kubectl get pods -n "pr${{ env.PR_NUMBER }}" | awk 'NR==2{print $1}')
-          CODER_ACCESS_URL=$(kubectl logs $POD_NAME -n "pr${{ env.PR_NUMBER }}" | grep "Web UI:" | awk -F ':' '{print $2":"$3}' | awk '{$1=$1};1')
-          echo "::add-mask::$CODER_ACCESS_URL"
-          echo "CODER_ACCESS_URL=$CODER_ACCESS_URL" >> $GITHUB_OUTPUT
-
       - name: Install coder-logstream-kube
         run: |
           helm repo add coder-logstream-kube https://helm.coder.com/logstream-kube
-          helm install coder-logstream-kube coder-logstream-kube/coder-logstream-kube \
+          helm upgrade --install coder-logstream-kube coder-logstream-kube/coder-logstream-kube \
             --namespace "pr${{ env.PR_NUMBER }}" \
-            --set url="${{ steps.deployment_url.outputs.CODER_ACCESS_URL }}"
+            --set url="https://pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"
 
       - name: Send Slack notification
         run: |
@@ -226,7 +216,7 @@ jobs:
             "pr_number": "'"${{ env.PR_NUMBER }}"'",
             "pr_url": "'"${{ env.PR_URL }}"'",
             "pr_title": "'"${{ env.PR_TITLE }}"'",
-            "pr_access_url": "'"${{ steps.deployment_url.outputs.CODER_ACCESS_URL }}"'" }' ${{ secrets.PR_DEPLOYMENTS_SLACK_WEBHOOK }}
+            "pr_access_url": "'"https://pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"'" }' ${{ secrets.PR_DEPLOYMENTS_SLACK_WEBHOOK }}
           echo "Slack notification sent"
 
       - name: Comment on PR
@@ -237,6 +227,6 @@ jobs:
           comment-id: ${{ needs.pr_commented.outputs.COMMENT_ID }}
           body: |
             :heavy_check_mark: Deployed PR ${{ env.PR_NUMBER }} successfully.
-            :rocket: Access the deployment link [here](https://codercom.slack.com/archives/C05DNE982E8).
+            :rocket: Access the deployment link [here](${{ secrets.PR_DEPLOYMENTS_SLACK_CHANNEL_URL }}).
             :warning: This deployment will be deleted when the PR is closed.
           reactions: "+1"

From d3dfa35bfe4e2e1931d9c736cd76c13bd4f7bab9 Mon Sep 17 00:00:00 2001
From: Atif Ali <atif@coder.com>
Date: Tue, 25 Jul 2023 20:03:20 +0000
Subject: [PATCH 3/9] WIP

---
 .github/workflows/pr-deploy.yaml | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/pr-deploy.yaml b/.github/workflows/pr-deploy.yaml
index d4f8a09c65d5f..be6ac5cd5048f 100644
--- a/.github/workflows/pr-deploy.yaml
+++ b/.github/workflows/pr-deploy.yaml
@@ -190,18 +190,20 @@ jobs:
           --set coder.service.type=ClusterIP \
           --set coder.serviceAccount.enableDeployments=true \
           --set coder.env[0].name=CODER_ACCESS_URL \
-          --set coder.env[0].value="https://pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}" \
+          --set coder.env[0].value="pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}" \
+          --set coder.env[1].name=CODER_WILD_CARD_ACCESS_URL \
+          --set coder.env[1].value="*--pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}" \
           # Uncomment this when https://github.com/coder/coder/issues/8714 is resolved
-          # --set coder.env[1].name=CODER_OAUTH2_GITHUB_ALLOW_SIGNUPS \
-          # --set coder.env[1].value=true \
-          # --set coder.env[2].name=CODER_OAUTH2_GITHUB_CLIENT_ID \
-          # --set coder.env[2].value=${{ secrets.PR_DEPLOYMENTS_GITHUB_OAUTH_CLIENT_ID }} \
-          # --set coder.env[3].name=CODER_OAUTH2_GITHUB_CLIENT_SECRET \
-          #--set coder.env[3].value=${{ secrets.PR_DEPLOYMENTS_GITHUB_OAUTH_CLIENT_SECRET }} \
-          #--set coder.env[4].name=CODER_OAUTH2_GITHUB_ALLOWED_ORGS \
-          #--set coder.env[4].value=coder \
-          # --set coder.env[5].name=CODER_OAUTH2_GITHUB_REDIRECT_URI \
-          # --set coder.env[5].value="https://pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}/gitauth/github/callback \
+          # --set coder.env[2].name=CODER_OAUTH2_GITHUB_ALLOW_SIGNUPS \
+          # --set coder.env[2].value=true \
+          # --set coder.env[3].name=CODER_OAUTH2_GITHUB_CLIENT_ID \
+          # --set coder.env[3].value=${{ secrets.PR_DEPLOYMENTS_GITHUB_OAUTH_CLIENT_ID }} \
+          # --set coder.env[4].name=CODER_OAUTH2_GITHUB_CLIENT_SECRET \
+          # --set coder.env[4].value=${{ secrets.PR_DEPLOYMENTS_GITHUB_OAUTH_CLIENT_SECRET }} \
+          # --set coder.env[5].name=CODER_OAUTH2_GITHUB_ALLOWED_ORGS \
+          # --set coder.env[5].value=coder \
+          # --set coder.env[6].name=CODER_OAUTH2_GITHUB_REDIRECT_URI \
+          # --set coder.env[7].value="https://pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}/gitauth/github/callback \
           --force
 
       - name: Install coder-logstream-kube
@@ -218,8 +220,10 @@ jobs:
             "pr_number": "'"${{ env.PR_NUMBER }}"'",
             "pr_url": "'"${{ env.PR_URL }}"'",
             "pr_title": "'"${{ env.PR_TITLE }}"'",
-            "pr_access_url": "'"https://pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"'" }' ${{ secrets.PR_DEPLOYMENTS_SLACK_WEBHOOK }}
+            "pr_access_url": "'"${{ env.PR_DEPLOYMENT_ACCESS_URL }}'" }' ${{ secrets.PR_DEPLOYMENTS_SLACK_WEBHOOK }}
           echo "Slack notification sent"
+        env:
+          PR_DEPLOYMENT_ACCESS_URL: "https://pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"
 
       - name: Comment on PR
         uses: peter-evans/create-or-update-comment@v3
@@ -229,6 +233,8 @@ jobs:
           comment-id: ${{ needs.pr_commented.outputs.COMMENT_ID }}
           body: |
             :heavy_check_mark: Deployed PR ${{ env.PR_NUMBER }} successfully.
-            :rocket: Access the deployment link [here](${{ secrets.PR_DEPLOYMENTS_SLACK_CHANNEL_URL }}).
+            :rocket: Access the deployment link [here](${{ env.PR_DEPLOYMENT_ACCESS_URL }}).
             :warning: This deployment will be deleted when the PR is closed.
           reactions: "+1"
+        env:
+          PR_DEPLOYMENT_ACCESS_URL: "https://pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"

From df9be79c83b30ae61f774c0a8e69d22cba6a6113 Mon Sep 17 00:00:00 2001
From: Atif Ali <atif@coder.com>
Date: Tue, 25 Jul 2023 20:04:24 +0000
Subject: [PATCH 4/9] fix typo

---
 .github/workflows/pr-deploy.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/pr-deploy.yaml b/.github/workflows/pr-deploy.yaml
index 140ddc5274466..8817712719b91 100644
--- a/.github/workflows/pr-deploy.yaml
+++ b/.github/workflows/pr-deploy.yaml
@@ -43,6 +43,7 @@ jobs:
             PR_NUMBER=${{ github.event.inputs.pr_number }}"
           else
             PR_NUMBER=${{ github.event.issue.number }}"
+          fi
           PR_TITLE=$(gh pr view $PR_NUMBER --json title | jq -r '.title')
           PR_BRANCH=$(gh pr view $PR_NUMBER --json headRefName | jq -r '.headRefName')
           echo "PR_URL=https://github.com/coder/coder/pull/$PR_NUMBER" >> $GITHUB_OUTPUT

From 7382ee3c6bf886b1fb1d48ac52522e0dd289a0f1 Mon Sep 17 00:00:00 2001
From: Atif Ali <atif@coder.com>
Date: Tue, 25 Jul 2023 20:06:56 +0000
Subject: [PATCH 5/9] update Ingress

---
 .github/workflows/pr-deploy.yaml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-deploy.yaml b/.github/workflows/pr-deploy.yaml
index 8817712719b91..2fb3138495433 100644
--- a/.github/workflows/pr-deploy.yaml
+++ b/.github/workflows/pr-deploy.yaml
@@ -165,18 +165,29 @@ jobs:
             name: pr${{ env.PR_NUMBER }}
             namespace: pr${{ env.PR_NUMBER }}
             annotations:
-              cert-manager.io/cluster-issuer: letsencrypt-prod
+              cert-manager.io/cluster-issuer: letsencrypt
           spec:
             tls:
             - hosts:
               - "pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"
+              - "*--pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"
               secretName: pr${{ env.PR_NUMBER }}-tls
             rules:
             - host: "pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"
               http:
                 paths:
                 - pathType: Prefix
-                  path: /
+                  path: "/"
+                  backend:
+                    service:
+                      name: coder
+                      port:
+                        number: 80
+            - host: "*--pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"
+              http:
+                paths:
+                - pathType: Prefix
+                  path: "/"
                   backend:
                     service:
                       name: coder

From 03981fa1872fb692dd16ed857e58b9fff8094973 Mon Sep 17 00:00:00 2001
From: Atif Ali <atif@coder.com>
Date: Tue, 25 Jul 2023 20:48:20 +0000
Subject: [PATCH 6/9] fix Ingress and wildcard

---
 .github/workflows/pr-deploy.yaml | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/pr-deploy.yaml b/.github/workflows/pr-deploy.yaml
index 2fb3138495433..70abba5ce297c 100644
--- a/.github/workflows/pr-deploy.yaml
+++ b/.github/workflows/pr-deploy.yaml
@@ -169,8 +169,7 @@ jobs:
           spec:
             tls:
             - hosts:
-              - "pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"
-              - "*--pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"
+              - "*.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"
               secretName: pr${{ env.PR_NUMBER }}-tls
             rules:
             - host: "pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"
@@ -183,16 +182,6 @@ jobs:
                       name: coder
                       port:
                         number: 80
-            - host: "*--pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"
-              http:
-                paths:
-                - pathType: Prefix
-                  path: "/"
-                  backend:
-                    service:
-                      name: coder
-                      port:
-                        number: 80
           EOF
           kubectl apply -f ingress.yaml
 
@@ -206,7 +195,7 @@ jobs:
           --set coder.serviceAccount.enableDeployments=true \
           --set coder.env[0].name=CODER_ACCESS_URL \
           --set coder.env[0].value="pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}" \
-          --set coder.env[1].name=CODER_WILD_CARD_ACCESS_URL \
+          --set coder.env[1].name=CODER_WILDCARD_ACCESS_URL \
           --set coder.env[1].value="*--pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}" \
           # Uncomment this when https://github.com/coder/coder/issues/8714 is resolved
           # --set coder.env[2].name=CODER_OAUTH2_GITHUB_ALLOW_SIGNUPS \

From 5c18f3df4fbcf3f2204323a736f30f9ab4c2d3c9 Mon Sep 17 00:00:00 2001
From: Atif Ali <atif@coder.com>
Date: Tue, 25 Jul 2023 20:49:27 +0000
Subject: [PATCH 7/9] update KUBECONFIG secret name

---
 .github/workflows/pr-deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-deploy.yaml b/.github/workflows/pr-deploy.yaml
index 70abba5ce297c..197717e259d61 100644
--- a/.github/workflows/pr-deploy.yaml
+++ b/.github/workflows/pr-deploy.yaml
@@ -146,7 +146,7 @@ jobs:
         run: |
           set -euxo pipefail
           mkdir -p ~/.kube
-          echo "${{ secrets.DELIVERYBOT_KUBECONFIG }}" > ~/.kube/config
+          echo "${{ secrets.PR_DEPLOYMENTS_KUBECONFIG }}" > ~/.kube/config
           export KUBECONFIG=~/.kube/config
 
       - name: Create PR namespace

From b5ece697e2b47fd0bfd2f766bf7e469d653326e7 Mon Sep 17 00:00:00 2001
From: Atif Ali <atif@coder.com>
Date: Tue, 25 Jul 2023 20:51:55 +0000
Subject: [PATCH 8/9] Enable experiments

---
 .github/workflows/pr-deploy.yaml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/pr-deploy.yaml b/.github/workflows/pr-deploy.yaml
index 197717e259d61..abf68ef4ab0b3 100644
--- a/.github/workflows/pr-deploy.yaml
+++ b/.github/workflows/pr-deploy.yaml
@@ -197,16 +197,18 @@ jobs:
           --set coder.env[0].value="pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}" \
           --set coder.env[1].name=CODER_WILDCARD_ACCESS_URL \
           --set coder.env[1].value="*--pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}" \
+          --set coder.env[2].name=CODER_EXPERIMENTS \
+          --set coder.env[2].value="*" \
           # Uncomment this when https://github.com/coder/coder/issues/8714 is resolved
-          # --set coder.env[2].name=CODER_OAUTH2_GITHUB_ALLOW_SIGNUPS \
-          # --set coder.env[2].value=true \
-          # --set coder.env[3].name=CODER_OAUTH2_GITHUB_CLIENT_ID \
-          # --set coder.env[3].value=${{ secrets.PR_DEPLOYMENTS_GITHUB_OAUTH_CLIENT_ID }} \
-          # --set coder.env[4].name=CODER_OAUTH2_GITHUB_CLIENT_SECRET \
-          # --set coder.env[4].value=${{ secrets.PR_DEPLOYMENTS_GITHUB_OAUTH_CLIENT_SECRET }} \
-          # --set coder.env[5].name=CODER_OAUTH2_GITHUB_ALLOWED_ORGS \
-          # --set coder.env[5].value=coder \
-          # --set coder.env[6].name=CODER_OAUTH2_GITHUB_REDIRECT_URI \
+          # --set coder.env[3].name=CODER_OAUTH2_GITHUB_ALLOW_SIGNUPS \
+          # --set coder.env[3].value=true \
+          # --set coder.env[4].name=CODER_OAUTH2_GITHUB_CLIENT_ID \
+          # --set coder.env[4].value=${{ secrets.PR_DEPLOYMENTS_GITHUB_OAUTH_CLIENT_ID }} \
+          # --set coder.env[5].name=CODER_OAUTH2_GITHUB_CLIENT_SECRET \
+          # --set coder.env[5].value=${{ secrets.PR_DEPLOYMENTS_GITHUB_OAUTH_CLIENT_SECRET }} \
+          # --set coder.env[6].name=CODER_OAUTH2_GITHUB_ALLOWED_ORGS \
+          # --set coder.env[6].value=coder \
+          # --set coder.env[7].name=CODER_OAUTH2_GITHUB_REDIRECT_URI \
           # --set coder.env[7].value="https://pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}/gitauth/github/callback \
           --force
 

From ba8e3ac8f7c08a10dee3f076144bf361db53626c Mon Sep 17 00:00:00 2001
From: Atif Ali <atif@coder.com>
Date: Tue, 25 Jul 2023 21:35:50 +0000
Subject: [PATCH 9/9] update comments

---
 .github/workflows/pr-deploy.yaml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/pr-deploy.yaml b/.github/workflows/pr-deploy.yaml
index abf68ef4ab0b3..d535578c5c0e4 100644
--- a/.github/workflows/pr-deploy.yaml
+++ b/.github/workflows/pr-deploy.yaml
@@ -29,7 +29,6 @@ jobs:
       PR_TITLE: ${{ steps.pr_number.outputs.PR_TITLE }}
       PR_URL: ${{ steps.pr_number.outputs.PR_URL }}
       PR_BRANCH: ${{ steps.pr_number.outputs.PR_BRANCH }}
-      COMMENT_ID: ${{ steps.comment_id.outputs.comment-id }}
       CODER_BASE_IMAGE_TAG: ${{ steps.set_tags.outputs.CODER_BASE_IMAGE_TAG }}
       CODER_IMAGE_TAG: ${{ steps.set_tags.outputs.CODER_IMAGE_TAG }}
 
@@ -63,24 +62,15 @@ jobs:
           CODER_BASE_IMAGE_TAG: ghcr.io/coder/coder-preview-base:pr${{ steps.pr_number.outputs.PR_NUMBER }}
           CODER_IMAGE_TAG: ghcr.io/coder/coder-preview:pr${{ steps.pr_number.outputs.PR_NUMBER }}
 
-      - name: Find Comment
-        uses: peter-evans/find-comment@v2
-        id: fc
-        with:
-          issue-number: ${{ steps.pr_number.outputs.PR_NUMBER }}
-          comment-author: "github-actions[bot]"
-          body-includes: This deployment will be deleted when the PR is closed
-
       - name: Comment on PR
         id: comment_id
         uses: peter-evans/create-or-update-comment@v3
         with:
-          comment-id: ${{ steps.fc.outputs.comment-id }}
           issue-number: ${{ steps.pr_number.outputs.PR_NUMBER }}
-          edit-mode: replace
           body: |
             :rocket: Deploying PR ${{ steps.pr_number.outputs.PR_NUMBER }} ...
             :warning: This deployment will be deleted when the PR is closed.
+          reactions: "-1"
 
   build:
     needs: pr_commented
@@ -231,16 +221,28 @@ jobs:
         env:
           PR_DEPLOYMENT_ACCESS_URL: "https://pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"
 
+      - name: Find Comment
+        uses: peter-evans/find-comment@v2
+        id: fc
+        with:
+          issue-number: ${{ env.PR_NUMBER }}
+          comment-author: "github-actions[bot]"
+          body-includes: This deployment will be deleted when the PR is closed
+
       - name: Comment on PR
         uses: peter-evans/create-or-update-comment@v3
         with:
           issue-number: ${{ env.PR_NUMBER }}
           edit-mode: replace
-          comment-id: ${{ needs.pr_commented.outputs.COMMENT_ID }}
+          comment-id: ${{ steps.fc.outputs.comment-id }}
           body: |
             :heavy_check_mark: Deployed PR ${{ env.PR_NUMBER }} successfully.
             :rocket: Access the deployment link [here](${{ env.PR_DEPLOYMENT_ACCESS_URL }}).
             :warning: This deployment will be deleted when the PR is closed.
-          reactions: "+1"
+          reactions: |
+            +1
+            rocket
+          reactions-edit-mode: replace
+
         env:
           PR_DEPLOYMENT_ACCESS_URL: "https://pr${{ env.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"