Make changes so runner deploys

Author: ronardcaktus

deploy/deploy-runner.yml

@@ -107,36 +107,6 @@
       ansible.builtin.service:
         name: docker
         state: restarted
-    # Poetry
-    - name: Install Poetry dependencies
-      ansible.builtin.package:
-        name:
-          - acl
-          - python3-pip
-          - python3-venv
-    - name: Install pipx Python package
-      ansible.builtin.pip:
-        name: pipx
-    - name: Install poetry
-      community.general.pipx:
-        name: poetry
-        state: present
-      environment:
-        PIPX_HOME: /opt/pipx
-        PIPX_BIN_DIR: /usr/local/bin
-    - name: Install pipx
-      ansible.builtin.shell:
-        cmd: |
-          python3 -m pip install --user pipx
-          python3 -m pipx ensurepath
-        chdir: /home/{{ github_runner_user }}
-      become_user: "{{ github_runner_user }}"
-    - name: Install Poetry
-      ansible.builtin.shell:
-        cmd: |
-          pipx install poetry
-        chdir: /home/{{ github_runner_user }}
-      become_user: "{{ github_runner_user }}"
     - name: Install the runner [If error, RUNNER_CFG_PAT might be missing or expired! See README.md]
       ansible.builtin.shell:
         cmd: >

deploy/group_vars/all.yml

@@ -11,14 +11,18 @@ stack_name: "{{ long_app_name }}-stack"
 aws_profile: "{{ long_app_name }}"
 cluster_name: "{{ stack_name }}-cluster"
 
-ansible_connection: local
-ansible_python_interpreter: "{{ ansible_playbook_python }}"
+# ansible_connection: local
+# ansible_python_interpreter: "{{ ansible_playbook_python }}"
 
 k8s_cluster_name: "{{ cluster_name }}"
 k8s_namespace: "{{ app_name }}-{{ env_name }}" 
 
-# Caktus office IP address
-administrator_ip_cidr: "70.62.97.170/32"
+# IP addresses
+administrator_ip_cidrs:
+  - 70.62.97.170/32  # Caktus office
+  - 107.15.45.253/32  # Tobias
+  - 47.230.11.28/32  # Ronard
+  - 107.223.185.195/32  # Colin
 
 # CloudFormation Outputs
 # These values are taken from the CF 'Output' tab
@@ -54,9 +58,9 @@ cloudformation_stack:
 
   template_parameters:
     UseAES256Encryption: "true"
-    AdministratorIPAddress: "{{ administrator_ip_cidr }}"
-    BastionAMI: "" # Needed - don't know how to get it.
-    BastionKeyName: ron_hip
+    AdministratorIPAddress: "{{ administrator_ip_cidrs[0] }}"  # Stack allows only single IP here to SSH to bastion
+    BastionAMI: "ami-0ad554caf874569d2" # https://cloud-images.ubuntu.com/locator/ec2/ [us-east-1 amd64]
+    BastionKeyName: rluna_hip
     BastionInstanceType: t3.small # Is this a proper size?
     BastionType: SSH
     CustomerManagedCmkArn: ""
@@ -77,7 +81,7 @@ cloudformation_stack:
     DatabasePassword: "{{ admin_database_password }}"
     DatabaseMultiAZ: "true"
     EksClusterName: "philly-hip-stack-cluster"
-    EksPublicAccessCidrs: " {{ administrator_ip_cidr }}"
+    EksPublicAccessCidrs: " {{ administrator_ip_cidrs | join(',') }}"
   tags:
     Environment: "{{ app_name }}"
 

deploy/inventory

@@ -1,3 +1,5 @@
+runner ansible_host=100.29.176.240
+
 [k8s]
 dr
 staging

deploy/requirements.yml

@@ -12,3 +12,6 @@
 - src: https://github.com/caktus/ansible-role-k8s-hosting-services
   name: caktus.k8s-hosting-services
   version: v0.12.0
+
+- src: weareinteractive.users
+  version: 1.17.0