Skip to content

chore(dogfood): include multiple templates under dogfood/ #16846

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.

Sign up for GitHub

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

Merged
merged 16 commits into from
Mar 11, 2025
Merged

chore(dogfood): include multiple templates under dogfood/ #16846

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3a6b7cd
chore(dogfood): move dogfood template contents to subdir
johnstcn Mar 7, 2025
a2733a1
chore(dogfood): move coder-envbuilder template under VCS control
johnstcn Mar 7, 2025
9b50f9d
fixup! chore(dogfood): move coder-envbuilder template under VCS control
johnstcn Mar 7, 2025
bda4920
address PR comments
johnstcn Mar 10, 2025
97ea68d
fixup! address PR comments
johnstcn Mar 10, 2025
3bb008e
fixup! fixup! address PR comments
johnstcn Mar 10, 2025
d028fe3
replace hard-coded organization_id
johnstcn Mar 10, 2025
07644b1
deduplicate
johnstcn Mar 10, 2025
4b38f40
fix dirs
johnstcn Mar 10, 2025
c43a047
remove contents dirs
johnstcn Mar 11, 2025
8522da3
fixup! remove contents dirs
johnstcn Mar 11, 2025
93d08b4
fixup! fixup! remove contents dirs
johnstcn Mar 11, 2025
6df0590
undiff
johnstcn Mar 11, 2025
eae0f0d
more fixups
johnstcn Mar 11, 2025
f9b3552
another fixup
johnstcn Mar 11, 2025
6f9c950
fix pushd/popd
johnstcn Mar 11, 2025
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
Prev Previous commit
Next Next commit
deduplicate
  • Loading branch information
@johnstcn
johnstcn committed Mar 11, 2025
commit 07644b19158a01dfe73b7b7d7600767eb3930e91
56 changes: 5 additions & 51 deletions .github/workflows/dogfood.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
workload_identity_provider: projects/573722524737/locations/global/workloadIdentityPools/github/providers/github
service_account: coder-ci@coder-dogfood.iam.gserviceaccount.com

- name: Terraform init and validate
- name: Terraform init and validate coder template
run: |
cd dogfood/coder
terraform init -upgrade
Expand All @@ -120,54 +120,7 @@ jobs:
terraform init -upgrade
terraform validate

- name: Get short commit SHA
if: github.ref == 'refs/heads/main'
id: vars
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT

- name: Get latest commit title
if: github.ref == 'refs/heads/main'
id: message
run: echo "pr_title=$(git log --format=%s -n 1 ${{ github.sha }})" >> $GITHUB_OUTPUT

- name: "Push template"
if: github.ref == 'refs/heads/main'
run: |
cd dogfood/coder
terraform apply -auto-approve
env:
# Consumed by coderd provider
CODER_URL: https://dev.coder.com
CODER_SESSION_TOKEN: ${{ secrets.CODER_SESSION_TOKEN }}
# Template source & details
TF_VAR_CODER_TEMPLATE_NAME: ${{ secrets.CODER_TEMPLATE_NAME }}
TF_VAR_CODER_TEMPLATE_VERSION: ${{ steps.vars.outputs.sha_short }}
TF_VAR_CODER_TEMPLATE_DIR: ./contents
TF_VAR_CODER_TEMPLATE_MESSAGE: ${{ steps.message.outputs.pr_title }}
TF_LOG: info

deploy_template_envbuilder:
needs: build_image
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
with:
egress-policy: audit

- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Setup Terraform
uses: ./.github/actions/setup-tf

- name: Authenticate to Google Cloud
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
with:
workload_identity_provider: projects/573722524737/locations/global/workloadIdentityPools/github/providers/github
service_account: coder-ci@coder-dogfood.iam.gserviceaccount.com

- name: Terraform init and validate
- name: Terraform init and validate coder-envbuilder template
run: |
cd dogfood/coder-envbuilder
terraform init -upgrade
Expand All @@ -189,14 +142,15 @@ jobs:
- name: "Push template"
if: github.ref == 'refs/heads/main'
run: |
cd dogfood/coder-envbuilder
cd dogfood/
terraform apply -auto-approve
env:
# Consumed by coderd provider
CODER_URL: https://dev.coder.com
CODER_SESSION_TOKEN: ${{ secrets.CODER_SESSION_TOKEN }}
# Template source & details
TF_VAR_CODER_TEMPLATE_NAME: "${{ secrets.CODER_TEMPLATE_NAME }}-envbuilder"
TF_VAR_CODER_TEMPLATE_NAME: ${{ secrets.CODER_TEMPLATE_NAME }}
TF_VAR_CODER_TEMPLATE_VERSION: ${{ steps.vars.outputs.sha_short }}
TF_VAR_CODER_TEMPLATE_DIR: ./contents
TF_VAR_CODER_TEMPLATE_MESSAGE: ${{ steps.message.outputs.pr_title }}
TF_LOG: info