Skip to content
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

Switch to pull non-secret values from env #436

Merged
merged 1 commit into from
Mar 24, 2023
Merged

Switch to pull non-secret values from env #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .github/workflows/cleanup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:

- uses: 'google-github-actions/auth@main'
with:
workload_identity_provider: '${{ secrets.WIF_PROVIDER_NAME }}'
service_account: '${{ secrets.SERVICE_ACCOUNT_EMAIL }}'
workload_identity_provider: '${{ vars.WIF_PROVIDER_NAME }}'
service_account: '${{ vars.SERVICE_ACCOUNT_EMAIL }}'

- uses: 'google-github-actions/setup-gcloud@main'

- name: Delete services
run: |-
gcloud config set core/project "${{ secrets.PROJECT_ID }}"
gcloud config set core/project "${{ vars.PROJECT_ID }}"
gcloud config set run/region "us-central1"

# List and delete all services that were deployed 30 minutes ago or
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ jobs:

- uses: 'google-github-actions/auth@main'
with:
workload_identity_provider: '${{ secrets.WIF_PROVIDER_NAME }}'
service_account: '${{ secrets.SERVICE_ACCOUNT_EMAIL }}'
workload_identity_provider: '${{ vars.WIF_PROVIDER_NAME }}'
service_account: '${{ vars.SERVICE_ACCOUNT_EMAIL }}'

- id: 'deploy-cloudrun'
name: 'Deploy'
Expand All @@ -63,8 +63,8 @@ jobs:
ZIP=zap
env_vars_file: './tests/fixtures/env_vars.txt'
secrets: |-
MY_SECRET=${{ secrets.SECRET_NAME }}:latest
MY_SECOND_SECRET=${{ secrets.SECRET_NAME }}:1
MY_SECRET=${{ vars.SECRET_NAME }}:latest
MY_SECOND_SECRET=${{ vars.SECRET_NAME }}:1
labels: |-
label1=value1
label2=value2
Expand All @@ -73,10 +73,10 @@ jobs:

- run: 'npm run e2e-tests'
env:
PROJECT_ID: ${{ secrets.PROJECT_ID }}
PROJECT_ID: ${{ vars.PROJECT_ID }}
SERVICE: '${{ env.SERVICE_NAME }}'
ENV: 'FOO=bar,ZIP=zap,TEXT_FOO=bar,TEXT_ZIP=zap'
SECRET_ENV: MY_SECRET=${{ secrets.SECRET_NAME }}:latest,MY_SECOND_SECRET=${{ secrets.SECRET_NAME }}:1
SECRET_ENV: MY_SECRET=${{ vars.SECRET_NAME }}:latest,MY_SECOND_SECRET=${{ vars.SECRET_NAME }}:1
PARAMS: '{"cpu":2, "containerConcurrency":20}'
LABELS: '{"label1":"value1", "label2":"value2"}'

Expand All @@ -90,15 +90,15 @@ jobs:
env_vars: |-
ABC=123
DEF=456
secrets: /api/secrets/my-secret=${{ secrets.SECRET_NAME }}:latest
secrets: /api/secrets/my-secret=${{ vars.SECRET_NAME }}:latest

- run: 'npm run e2e-tests'
env:
PROJECT_ID: ${{ secrets.PROJECT_ID }}
PROJECT_ID: ${{ vars.PROJECT_ID }}
SERVICE: '${{ env.SERVICE_NAME }}'
ENV: 'FOO=bar,ZIP=zap,TEXT_FOO=bar,TEXT_ZIP=zap,ABC=123,DEF=456'
SECRET_ENV: MY_SECRET=${{ secrets.SECRET_NAME }}:latest,MY_SECOND_SECRET=${{ secrets.SECRET_NAME }}:1
SECRET_VOLUMES: /api/secrets/my-secret=${{ secrets.SECRET_NAME }}:latest
SECRET_ENV: MY_SECRET=${{ vars.SECRET_NAME }}:latest,MY_SECOND_SECRET=${{ vars.SECRET_NAME }}:1
SECRET_VOLUMES: /api/secrets/my-secret=${{ vars.SECRET_NAME }}:latest
PARAMS: '{"cpu":2, "containerConcurrency":20}'
LABELS: '{"label1":"value1", "label2":"value2", "commit-sha":"${{ github.sha }}", "managed-by":"github-actions"}'
REVISION_COUNT: 2
Expand Down Expand Up @@ -126,8 +126,8 @@ jobs:

- uses: 'google-github-actions/auth@main'
with:
workload_identity_provider: '${{ secrets.WIF_PROVIDER_NAME }}'
service_account: '${{ secrets.SERVICE_ACCOUNT_EMAIL }}'
workload_identity_provider: '${{ vars.WIF_PROVIDER_NAME }}'
service_account: '${{ vars.SERVICE_ACCOUNT_EMAIL }}'

- id: 'deploy-cloudrun'
name: 'Deploy'
Expand All @@ -137,7 +137,7 @@ jobs:

- run: 'npm run e2e-tests'
env:
PROJECT_ID: '${{ secrets.PROJECT_ID }}'
PROJECT_ID: '${{ vars.PROJECT_ID }}'
SERVICE: '${{ env.SERVICE_NAME }}'
PARAMS: '{"cpu":2, "memory":"1Gi", "containerConcurrency":20}'
ANNOTATIONS: '{"run.googleapis.com/cloudsql-instances":"test-project:us-central1:my-test-instance"}'
Expand All @@ -152,7 +152,7 @@ jobs:

- run: 'npm run e2e-tests' # Check that config isn't overwritten
env:
PROJECT_ID: '${{ secrets.PROJECT_ID }}'
PROJECT_ID: '${{ vars.PROJECT_ID }}'
SERVICE: '${{ env.SERVICE_NAME }}'
PARAMS: '{"cpu":2, "memory":"1Gi", "containerConcurrency":20}'
ANNOTATIONS: '{"run.googleapis.com/cloudsql-instances":"test-project:us-central1:my-test-instance"}'
Expand Down