diff --git a/.github/workflows/create-gh-action-runners.yaml b/.github/workflows/create-gh-action-runners.yaml index 21f1fc8d..2a96525c 100644 --- a/.github/workflows/create-gh-action-runners.yaml +++ b/.github/workflows/create-gh-action-runners.yaml @@ -6,6 +6,7 @@ on: description: "Number of Runners to Deploy" required: true default: 5 + type: number runner_flavor: description: "The Flavor of VM to create. l3.nano (More Runners, Less Power) | l3.micro (Middle Ground) | l3.tiny (Less Runners, More Power)" @@ -23,8 +24,8 @@ jobs: env: OS_CLIENT_CONFIG_FILE: ${{ github.workspace }}/clouds.yaml FLAVOR_NAME: l3.nano - TF_VAR_runner_count: ${{ github.events.inputs.runner_count }} - TF_VAR_flavor_name: ${{ github.events.inputs.runner_flavor }} + TF_VAR_runner_count: ${{ inputs.runner_count }} + TF_VAR_flavor_name: ${{ inputs.runner_flavor }} TF_VAR_floating_ip: ${{ secrets.UA_FLOATING_IP }} steps: - name: Checkout repo @@ -49,7 +50,9 @@ jobs: run: terraform init - name: Terraform plan - run: terraform plan -out=tfplan 1> /dev/null + run: | + echo "$TF_VAR_runner_count" + terraform plan -out=tfplan 1> /dev/null - name: Terraform apply run: terraform apply -auto-approve tfplan 1> /dev/null diff --git a/self-hosted-gh-runners/playbooks/ansible_install_dependencies.yaml b/self-hosted-gh-runners/playbooks/ansible_install_dependencies.yaml index 8af03bc2..db17681f 100644 --- a/self-hosted-gh-runners/playbooks/ansible_install_dependencies.yaml +++ b/self-hosted-gh-runners/playbooks/ansible_install_dependencies.yaml @@ -28,7 +28,7 @@ name: ubuntu groups: docker append: yes - + - name: Extract Runner ansible.builtin.unarchive: src: https://github.com/actions/runner/releases/download/v{{RUNNER_VERSION}}/actions-runner-linux-x64-{{RUNNER_VERSION}}.tar.gz diff --git a/self-hosted-gh-runners/scripts/packer-scripts/setup_gh_runner_vm.sh b/self-hosted-gh-runners/scripts/packer-scripts/setup_gh_runner_vm.sh index 91e6c2e3..2e835984 100644 --- a/self-hosted-gh-runners/scripts/packer-scripts/setup_gh_runner_vm.sh +++ b/self-hosted-gh-runners/scripts/packer-scripts/setup_gh_runner_vm.sh @@ -7,6 +7,15 @@ sudo apt-get install -y ansible ansible --version +sudo apt-get install -y apt-transport-https ca-certificates curl gnupg +curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.36/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg +sudo chmod 644 /etc/apt/keyrings/kubernetes-apt-keyring.gpg +echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.36/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list +sudo chmod 644 /etc/apt/sources.list.d/kubernetes.list + +sudo apt-get update +sudo apt-get install -y kubectl + sudo chmod +x ~/runner-scripts/job_started.sh sudo chmod +x ~/runner-scripts/job_completed.sh sudo chown ubuntu:ubuntu ~/runner-scripts/job_started.sh