diff --git a/.github/workflows/terraform-microk8s-apply.yml b/.github/workflows/terraform-k8sapps-apply.yml similarity index 82% rename from .github/workflows/terraform-microk8s-apply.yml rename to .github/workflows/terraform-k8sapps-apply.yml index c9ab8bf..66be0d9 100644 --- a/.github/workflows/terraform-microk8s-apply.yml +++ b/.github/workflows/terraform-k8sapps-apply.yml @@ -1,4 +1,4 @@ -name: Terraform K8S Apps apply +name: OpenTofu K8S Apps apply on: schedule: @@ -31,8 +31,8 @@ jobs: ansible-user: ${{ secrets.ANSIBLE_USER }} host-group: microk8s - - name: Setup Terraform Environment - uses: ./.github/actions/setup-terraform-env + - name: Setup OpenTofu Environment + uses: ./.github/actions/setup-opentofu-env - name: Setup Kubernetes Environment uses: ./.github/actions/setup-k8s-env @@ -42,7 +42,7 @@ jobs: access-token: ${{ secrets.BW_ACCESS_TOKEN }} ansible-user: ${{ secrets.ANSIBLE_USER }} - - name: Terraform Init and Apply + - name: OpenTofu Init and Apply env: BW_PROJECT_ID: ${{ secrets.BW_PROJECT_ID }} BW_ORGANIZATION_ID: ${{ secrets.BW_ORGANIZATION_ID }} @@ -51,5 +51,5 @@ jobs: SSH_AUTH_SOCK: ${{ steps.setup_ansible_env.outputs.ssh-auth-sock }} run: | cd terraform/k8sapps - sectool -f ../../sectool.json exec terraform init - sectool -f ../../sectool.json exec terraform apply --auto-approve + sectool -f ../../sectool.json exec tofu init + sectool -f ../../sectool.json exec tofu apply --auto-approve diff --git a/.github/workflows/terraform-microk8s-validate.yml b/.github/workflows/terraform-k8sapps-validate.yml similarity index 75% rename from .github/workflows/terraform-microk8s-validate.yml rename to .github/workflows/terraform-k8sapps-validate.yml index 5f4b4e8..251ff0a 100644 --- a/.github/workflows/terraform-microk8s-validate.yml +++ b/.github/workflows/terraform-k8sapps-validate.yml @@ -1,4 +1,4 @@ -name: Terraform K8s Apps Validate on Pull Request +name: OpenTofu K8s Apps Validate on Pull Request on: pull_request: @@ -33,8 +33,8 @@ jobs: ansible-user: ${{ secrets.ANSIBLE_USER }} host-group: microk8s - - name: Setup Terraform Environment - uses: ./.github/actions/setup-terraform-env + - name: Setup OpenTofu Environment + uses: ./.github/actions/setup-opentofu-env - name: Setup Kubernetes Environment uses: ./.github/actions/setup-k8s-env @@ -44,14 +44,14 @@ jobs: access-token: ${{ secrets.BW_ACCESS_TOKEN }} ansible-user: ${{ secrets.ANSIBLE_USER }} - - name: Terraform Init and Validate + - name: OpenTofu Init and Validate env: BW_PROJECT_ID: ${{ secrets.BW_PROJECT_ID }} BW_ORGANIZATION_ID: ${{ secrets.BW_ORGANIZATION_ID }} BW_ACCESS_TOKEN: ${{ secrets.BW_ACCESS_TOKEN }} run: | cd terraform/k8sapps - sectool -f ../../sectool.json exec terraform init - sectool -f ../../sectool.json exec terraform validate - sectool -f ../../sectool.json exec terraform fmt -check - sectool -f ../../sectool.json exec terraform plan + sectool -f ../../sectool.json exec tofu init + sectool -f ../../sectool.json exec tofu validate + sectool -f ../../sectool.json exec tofu fmt -check + sectool -f ../../sectool.json exec tofu plan diff --git a/terraform/k8sapps/backend.tf b/terraform/k8sapps/backend.tf index 2a25f85..6daa22b 100644 --- a/terraform/k8sapps/backend.tf +++ b/terraform/k8sapps/backend.tf @@ -1,7 +1,7 @@ terraform { backend "s3" { - bucket = "a13labs.infra" - key = "alexpires.me-k8sapps.tfstate" - region = "us-east-1" + bucket = "a13labs.infra.eu" + key = "k8sapps.core.infra.tfstate" + region = "eu-west-1" } }