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.

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

Fix Terraform credential error #226

Merged
merged 3 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions .github/workflows/publish-master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ jobs:
- uses: actions/checkout@v3

# https://learn.hashicorp.com/tutorials/terraform/github-actions?in=terraform/automation
- uses: hashicorp/setup-terraform@v2
- uses: hashicorp/setup-terraform@v3
with:
terraform_version: "1.7.5"
- name: Terraform Init
run: terraform init
working-directory: deploy/terraform
Expand All @@ -41,9 +43,10 @@ jobs:
id: tf_ip_addr
run: terraform output -raw ipv4_address
working-directory: deploy/terraform
- uses: hashicorp/setup-terraform@v2 # Remove wrapper so that we can output directly to files
- uses: hashicorp/setup-terraform@v3
with:
terraform_wrapper: false
terraform_version: "1.7.5"
terraform_wrapper: false # Remove wrapper so that we can output directly to files
- name: Get Cloudflare token for Let's Encrypt
id: tf_cf_le_token
run: terraform output -raw cloudflare-le-token > ../kubernetes/tmeit-se/certificate/cloudflare-api-token
Expand Down Expand Up @@ -175,7 +178,7 @@ jobs:
runs-on: ubuntu-latest
needs: deploy # Run after deploy so that we can get the docker image for publishing
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: '0'
- uses: actions/setup-python@v3
Expand Down
19 changes: 11 additions & 8 deletions .github/workflows/test-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: Are version numbers incremented
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.2.0
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Required due to get git tag list due to the way Git works
- uses: actions/setup-python@v3
Expand All @@ -23,7 +23,7 @@ jobs:
name: Lint GH Actions workflows
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.2.0
- uses: actions/checkout@v4
- uses: reviewdog/action-actionlint@v1
plan-terraform: # https://learn.hashicorp.com/tutorials/terraform/github-actions?in=terraform/automation
name: Run Terraform Validate and Plan
Expand All @@ -38,7 +38,9 @@ jobs:
TF_VAR_pw_hash: ${{ secrets.NODE_ROOT_USER_PW_HASH }}
steps:
- uses: actions/checkout@v3
- uses: hashicorp/setup-terraform@v2
- uses: hashicorp/setup-terraform@v3
with:
terraform_version: "1.7.5"
- id: fmt
run: terraform fmt -check
- id: init
Expand Down Expand Up @@ -91,8 +93,9 @@ jobs:
id: tf_ip_addr
run: terraform output -raw ipv4_address
working-directory: deploy/terraform
- uses: hashicorp/setup-terraform@v2
- uses: hashicorp/setup-terraform@v3
with:
terraform_version: "1.7.5"
terraform_wrapper: false
- name: Get SSH key
run: terraform output -raw ssh_key > "$HOME/id_ed25519"
Expand All @@ -119,7 +122,7 @@ jobs:
runs-on: ubuntu-latest
needs: plan-terraform # Needs kubeconfig from terraform
steps:
- uses: actions/checkout@v2.2.0
- uses: actions/checkout@v4
- uses: actions/setup-python@v3
with:
python-version: '3.10'
Expand Down Expand Up @@ -149,7 +152,7 @@ jobs:
name: Build app containers
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.2.0
- uses: actions/checkout@v4
- name: Build containers
uses: redhat-actions/buildah-build@v2
with:
Expand All @@ -164,7 +167,7 @@ jobs:
name: Test app
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.2.0
- uses: actions/checkout@v4
- name: Build test container
uses: redhat-actions/buildah-build@v2
with:
Expand All @@ -185,7 +188,7 @@ jobs:
POSTGRES_DB: tmeit_backend
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
steps:
- uses: actions/checkout@v2.2.0
- uses: actions/checkout@v4
- name: Build tester container
run: |
docker build . -f containerfiles/create-test-db.Containerfile -t create-test-db
Expand Down
2 changes: 1 addition & 1 deletion back/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "tmeit_backend"
version = "1.3.1"
version = "1.3.2"
description = "Python backend for the TMEIT website"
authors = ["TraditionsMEsterIT"]
license = "AGPL-3.0"
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/tmeit-se/postgres/set_image_tag.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
{
"op": "replace",
"path": "/spec/jobTemplate/spec/template/spec/containers/0/image",
"value": "ghcr.io/tmeit/db-backup-agent:1.3.1"
"value": "ghcr.io/tmeit/db-backup-agent:1.3.2"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
{
"op": "replace",
"path": "/spec/template/spec/containers/0/image",
"value": "ghcr.io/tmeit/tmeit-run-migrations:1.3.1"
"value": "ghcr.io/tmeit/tmeit-run-migrations:1.3.2"
}
]
2 changes: 1 addition & 1 deletion deploy/kubernetes/tmeit-se/tmeit-app/set_image_tag.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
{
"op": "replace",
"path": "/spec/template/spec/containers/0/image",
"value": "ghcr.io/tmeit/tmeit-app:1.3.1"
"value": "ghcr.io/tmeit/tmeit-app:1.3.2"
}
]
2 changes: 1 addition & 1 deletion deploy/kubernetes/tmeit-se/tmeit-worker/set_image_tag.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
{
"op": "replace",
"path": "/spec/template/spec/containers/0/image",
"value": "ghcr.io/tmeit/tmeit-worker:1.3.1"
"value": "ghcr.io/tmeit/tmeit-worker:1.3.2"
}
]
2 changes: 1 addition & 1 deletion front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"sideEffects": [
"*.css"
],
"version": "1.3.1",
"version": "1.3.2",
"description": "Front-end for the TMEIT website.",
"main": "index.js",
"scripts": {
Expand Down
Loading