From 6e3183e7608275daf3c125c572ec1144ad413a93 Mon Sep 17 00:00:00 2001 From: Alexandre Pires Date: Tue, 24 Sep 2024 21:32:14 +0200 Subject: [PATCH 1/3] Refactor ansible-apply.yaml to use ansible user for fetching kube config --- .github/workflows/terraform-k8apps-apply.yaml | 2 +- .github/workflows/terraform-k8apps-validate.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/terraform-k8apps-apply.yaml b/.github/workflows/terraform-k8apps-apply.yaml index c939cfe..5cdbc69 100644 --- a/.github/workflows/terraform-k8apps-apply.yaml +++ b/.github/workflows/terraform-k8apps-apply.yaml @@ -77,7 +77,7 @@ jobs: SSH_AUTH_SOCK: /tmp/ssh_agent.sock run: | mkdir -p ~/.kube - ansible -i ansible/inventory/hosts -m fetch -a "src=/home/$ANSIBLE_USER/.kube/config dest=~/.kube/config flat=yes" microk8s + ansible -i ansible/inventory/hosts -u $ANSIBLE_USER -m fetch -a "src=/home/$ANSIBLE_USER/.kube/config dest=~/.kube/config flat=yes" microk8s - name: Terraform Init env: diff --git a/.github/workflows/terraform-k8apps-validate.yaml b/.github/workflows/terraform-k8apps-validate.yaml index 1e6b6c0..70c1cb7 100644 --- a/.github/workflows/terraform-k8apps-validate.yaml +++ b/.github/workflows/terraform-k8apps-validate.yaml @@ -80,7 +80,7 @@ jobs: SSH_AUTH_SOCK: /tmp/ssh_agent.sock run: | mkdir -p ~/.kube - ansible -i ansible/inventory/hosts -m fetch -a "src=/home/$ANSIBLE_USER/.kube/config dest=~/.kube/config flat=yes" microk8s + ansible -i ansible/inventory/hosts -u $ANSIBLE_USER -m fetch -a "src=/home/$ANSIBLE_USER/.kube/config dest=~/.kube/config flat=yes" microk8s - name: Terraform Init env: From c2dbfd87cf96d05a31da57b554fc0f0511481168 Mon Sep 17 00:00:00 2001 From: Alexandre Pires Date: Tue, 24 Sep 2024 21:32:35 +0200 Subject: [PATCH 2/3] Refactor ansible-apply.yaml to use ansible user for fetching kube config --- .github/workflows/terraform-k8apps-apply.yaml | 2 +- .github/workflows/terraform-k8apps-validate.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/terraform-k8apps-apply.yaml b/.github/workflows/terraform-k8apps-apply.yaml index 5cdbc69..45c15dc 100644 --- a/.github/workflows/terraform-k8apps-apply.yaml +++ b/.github/workflows/terraform-k8apps-apply.yaml @@ -72,8 +72,8 @@ jobs: - name: Copy Kube Config from remote host env: - ANSIBLE_USER: ${{ secrets.ANSIBLE_USER }} VAULT_MASTER_PASSWORD: ${{ secrets.VAULT_MASTER_PASSWORD }} + ANSIBLE_USER: ${{ secrets.ANSIBLE_USER }} SSH_AUTH_SOCK: /tmp/ssh_agent.sock run: | mkdir -p ~/.kube diff --git a/.github/workflows/terraform-k8apps-validate.yaml b/.github/workflows/terraform-k8apps-validate.yaml index 70c1cb7..9f70e8e 100644 --- a/.github/workflows/terraform-k8apps-validate.yaml +++ b/.github/workflows/terraform-k8apps-validate.yaml @@ -75,8 +75,8 @@ jobs: - name: Copy Kube Config from remote host env: - ANSIBLE_USER: ${{ secrets.ANSIBLE_USER }} VAULT_MASTER_PASSWORD: ${{ secrets.VAULT_MASTER_PASSWORD }} + ANSIBLE_USER: ${{ secrets.ANSIBLE_USER }} SSH_AUTH_SOCK: /tmp/ssh_agent.sock run: | mkdir -p ~/.kube From 7bfc5c07fb232a77138fc7cc6674d92920cc9924 Mon Sep 17 00:00:00 2001 From: Alexandre Pires Date: Tue, 24 Sep 2024 21:35:09 +0200 Subject: [PATCH 3/3] Refactor workflow file names to use consistent naming convention --- .github/workflows/terraform-k8apps-apply.yaml | 4 ++-- .github/workflows/terraform-k8apps-validate.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/terraform-k8apps-apply.yaml b/.github/workflows/terraform-k8apps-apply.yaml index 45c15dc..8de1da3 100644 --- a/.github/workflows/terraform-k8apps-apply.yaml +++ b/.github/workflows/terraform-k8apps-apply.yaml @@ -1,4 +1,4 @@ -name: Build and Release +name: Terraform Apply on: push: @@ -9,7 +9,7 @@ on: - .github/workflows/terraform-k8apps-apply.yaml jobs: - apply: + terraform-apply: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/terraform-k8apps-validate.yaml b/.github/workflows/terraform-k8apps-validate.yaml index 9f70e8e..81ac52e 100644 --- a/.github/workflows/terraform-k8apps-validate.yaml +++ b/.github/workflows/terraform-k8apps-validate.yaml @@ -1,4 +1,4 @@ -name: Validate Terraform +name: Terraform Validate on: pull_request: @@ -12,7 +12,7 @@ on: - synchronize - reopened jobs: - apply: + terraform-validate: runs-on: ubuntu-latest steps: