From 1604adcc3b60426373b2b3a15a8355a532972f88 Mon Sep 17 00:00:00 2001 From: Alexandre Pires Date: Sun, 29 Sep 2024 18:44:39 +0200 Subject: [PATCH] Refactor file path in actions-validate.yml and update input parameters for vault master password, ansible user, and trusted hosts --- .github/workflows/actions-validate.yml | 16 ++++++++-------- .github/workflows/ansible-apply-playbook.yml | 6 +++--- .../ansible-validate-playbook-on-pr.yml | 6 +++--- .../workflows/ansible-weekly-reconciliation.yml | 6 +++--- .github/workflows/terraform-microk8s-apply.yml | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/actions-validate.yml b/.github/workflows/actions-validate.yml index 0c71e80..aa061ca 100644 --- a/.github/workflows/actions-validate.yml +++ b/.github/workflows/actions-validate.yml @@ -23,9 +23,9 @@ jobs: - name: Setup Ansible environment (TEST) uses: ./.github/actions/setup-ansible-env with: - vault_master_password: ${{ secrets.VAULT_MASTER_PASSWORD }} - ansible_user: ${{ secrets.ANSIBLE_USER }} - trusted_hosts: ${{ secrets.TRUSTED_HOSTS }} + vault-master-password: ${{ secrets.VAULT_MASTER_PASSWORD }} + ansible-user: ${{ secrets.ANSIBLE_USER }} + trusted-hosts: ${{ secrets.TRUSTED_HOSTS }} test-setup-terraform-actions: runs-on: ubuntu-latest @@ -57,9 +57,9 @@ jobs: - name: Setup Ansible environment (TEST) uses: ./.github/actions/setup-ansible-env with: - vault_master_password: ${{ secrets.VAULT_MASTER_PASSWORD }} - ansible_user: ${{ secrets.ANSIBLE_USER }} - trusted_hosts: ${{ secrets.TRUSTED_HOSTS }} + vault-master-password: ${{ secrets.VAULT_MASTER_PASSWORD }} + ansible-user: ${{ secrets.ANSIBLE_USER }} + trusted-hosts: ${{ secrets.TRUSTED_HOSTS }} - name: Setup Terraform environment (TEST) uses: ./.github/actions/setup-terraform-env @@ -67,8 +67,8 @@ jobs: - name: Setup Kubernetes Environment (TEST) uses: ./.github/actions/setup-k8s-env with: - vault_master_password: ${{ secrets.VAULT_MASTER_PASSWORD }} - ansible_user: ${{ secrets.ANSIBLE_USER }} + vault-master-password: ${{ secrets.VAULT_MASTER_PASSWORD }} + ansible-user: ${{ secrets.ANSIBLE_USER }} - name: Test kubectl get nodes run: | diff --git a/.github/workflows/ansible-apply-playbook.yml b/.github/workflows/ansible-apply-playbook.yml index 57ea9b1..4eb95af 100644 --- a/.github/workflows/ansible-apply-playbook.yml +++ b/.github/workflows/ansible-apply-playbook.yml @@ -23,9 +23,9 @@ jobs: - name: Setup Ansible environment uses: ./.github/actions/setup-ansible-env with: - vault_master_password: ${{ secrets.VAULT_MASTER_PASSWORD }} - ansible_user: ${{ secrets.ANSIBLE_USER }} - trusted_hosts: ${{ secrets.TRUSTED_HOSTS }} + vault-master-password: ${{ secrets.VAULT_MASTER_PASSWORD }} + ansible-user: ${{ secrets.ANSIBLE_USER }} + trusted-hosts: ${{ secrets.TRUSTED_HOSTS }} - name: Apply the playbook that triggered the workflow env: diff --git a/.github/workflows/ansible-validate-playbook-on-pr.yml b/.github/workflows/ansible-validate-playbook-on-pr.yml index 0d277c0..037a65c 100644 --- a/.github/workflows/ansible-validate-playbook-on-pr.yml +++ b/.github/workflows/ansible-validate-playbook-on-pr.yml @@ -27,9 +27,9 @@ jobs: - name: Setup Ansible environment uses: ./.github/actions/setup-ansible-env with: - vault_master_password: ${{ secrets.VAULT_MASTER_PASSWORD }} - ansible_user: ${{ secrets.ANSIBLE_USER }} - trusted_hosts: ${{ secrets.TRUSTED_HOSTS }} + vault-master-password: ${{ secrets.VAULT_MASTER_PASSWORD }} + ansible-user: ${{ secrets.ANSIBLE_USER }} + trusted-hosts: ${{ secrets.TRUSTED_HOSTS }} - name: Apply the playbook that triggered the workflow env: diff --git a/.github/workflows/ansible-weekly-reconciliation.yml b/.github/workflows/ansible-weekly-reconciliation.yml index c952a91..9e9bb9a 100644 --- a/.github/workflows/ansible-weekly-reconciliation.yml +++ b/.github/workflows/ansible-weekly-reconciliation.yml @@ -20,9 +20,9 @@ jobs: - name: Setup Ansible environment uses: ./.github/actions/setup-ansible-env with: - vault_master_password: ${{ secrets.VAULT_MASTER_PASSWORD }} - ansible_user: ${{ secrets.ANSIBLE_USER }} - trusted_hosts: ${{ secrets.TRUSTED_HOSTS }} + vault-master-password: ${{ secrets.VAULT_MASTER_PASSWORD }} + ansible-user: ${{ secrets.ANSIBLE_USER }} + trusted-hosts: ${{ secrets.TRUSTED_HOSTS }} - name: Apply Hardening Playbook env: diff --git a/.github/workflows/terraform-microk8s-apply.yml b/.github/workflows/terraform-microk8s-apply.yml index 6b8cdfa..e36c832 100644 --- a/.github/workflows/terraform-microk8s-apply.yml +++ b/.github/workflows/terraform-microk8s-apply.yml @@ -23,8 +23,8 @@ jobs: - name: Setup Ansible Environment uses: ./.github/actions/setup-ansible-env with: - vault_master_password: ${{ secrets.VAULT_MASTER_PASSWORD }} - ansible_user: ${{ secrets.ANSIBLE_USER }} + vault-master_password: ${{ secrets.VAULT_MASTER_PASSWORD }} + ansible-user: ${{ secrets.ANSIBLE_USER }} trusted_hosts: ${{ secrets.TRUSTED_HOSTS }} - name: Setup Terraform Environment @@ -33,8 +33,8 @@ jobs: - name: Setup Kubernetes Environment uses: ./.github/actions/setup-k8s-env with: - vault_master_password: ${{ secrets.VAULT_MASTER_PASSWORD }} - ansible_user: ${{ secrets.ANSIBLE_USER }} + vault-master_password: ${{ secrets.VAULT_MASTER_PASSWORD }} + ansible-user: ${{ secrets.ANSIBLE_USER }} - name: Terraform Init env: