From 1a174efee4de8b204caf182226c03bfa38753d0c Mon Sep 17 00:00:00 2001 From: Bas Meijer Date: Mon, 16 Dec 2024 10:34:28 +0100 Subject: [PATCH] dependencies update --- .gitignore | 4 +++- galaxy_roles/.gitkeep | 3 --- inventory/dev/group_vars/all.yml | 9 +++++++++ inventory/dev/hosts | 9 +++------ inventory/test/group_vars/all.yml | 11 ++++++++++- provision.yml | 11 ++++++++--- roles/requirements.yml | 3 --- 7 files changed, 33 insertions(+), 17 deletions(-) delete mode 100644 galaxy_roles/.gitkeep diff --git a/.gitignore b/.gitignore index b353c20..7ad90dc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,9 @@ .output-images/ .vagrant/ .vscode/ -galaxy_roles/* +roles/andrewrothstein.* +roles/bbaassssiiee.* +roles/geerlingguy.* files/* *.iso *.box diff --git a/galaxy_roles/.gitkeep b/galaxy_roles/.gitkeep deleted file mode 100644 index 6fd127a..0000000 --- a/galaxy_roles/.gitkeep +++ /dev/null @@ -1,3 +0,0 @@ -## roles_path: galaxy_roles:roles -# To install -ansible-galaxy install -p galaxy_roles -r roles/requirements.yml diff --git a/inventory/dev/group_vars/all.yml b/inventory/dev/group_vars/all.yml index 5c679a9..29d0deb 100644 --- a/inventory/dev/group_vars/all.yml +++ b/inventory/dev/group_vars/all.yml @@ -3,4 +3,13 @@ docker_users: - "{{ ansible_user }}" docker_install_compose: true docker_install_compose_plugin: true + +kubectl_ver: v1.29.3 +kubectl_install_dir: /usr/bin +use_krew: true +krew_install_plugins: + - ctx + - ns + - stern + server_name: "{{ ansible_fqdn | default(ansible_hostname) }}" diff --git a/inventory/dev/hosts b/inventory/dev/hosts index d212d63..94005c8 100644 --- a/inventory/dev/hosts +++ b/inventory/dev/hosts @@ -1,6 +1,3 @@ -[local] -localhost connection=local - [dev:children] control @@ -10,11 +7,11 @@ semaphore web [database] -controller ansible_host=10.0.0.206 +controller ansible_host=192.168.178.60 [semaphore] -controller ansible_host=10.0.0.206 +controller ansible_host=192.168.178.60 [web] -controller ansible_host=10.0.0.206 +controller ansible_host=192.168.178.60 [dev:vars] ansible_user=vagrant diff --git a/inventory/test/group_vars/all.yml b/inventory/test/group_vars/all.yml index 665e38b..76e6ba3 100644 --- a/inventory/test/group_vars/all.yml +++ b/inventory/test/group_vars/all.yml @@ -1,5 +1,14 @@ --- docker_install_compose: true docker_install_compose_plugin: true -server_name: acsNode + +kubectl_ver: v1.29.3 +kubectl_install_dir: /usr/bin +use_krew: true +krew_install_plugins: + - ctx + - ns + - stern + postgres_listen_addresses: '127.0.0.1' +server_name: acsNode diff --git a/provision.yml b/provision.yml index 8da7451..773dbfb 100755 --- a/provision.yml +++ b/provision.yml @@ -25,7 +25,7 @@ read -sp "Enter database password: " DB_PASS && export DB_PASS ; echo roles: - - role: postgres + - role: bbaassssiiee.postgres_ssl - name: Semaphore in Systemd hosts: semaphore @@ -63,7 +63,7 @@ - name: Install Squid proxy ansible.builtin.import_role: - name: proxy + name: bbaassssiiee.proxy tags: [proxy] - name: Tools @@ -77,6 +77,11 @@ - semaphore tasks: + - name: Install Krew + when: use_krew | bool + ansible.builtin.include_role: + name: andrewrothstein.krew + - name: Install OpenTofu when: use_opentofu | bool ansible.builtin.include_role: @@ -121,5 +126,5 @@ become: true gather_facts: true roles: - - role: nginx + - role: bbaassssiiee.nginx_ssl tags: [nginx] diff --git a/roles/requirements.yml b/roles/requirements.yml index 0e827ba..507718e 100644 --- a/roles/requirements.yml +++ b/roles/requirements.yml @@ -11,11 +11,8 @@ roles: - src: geerlingguy.docker version: 7.4.3 - src: bbaassssiiee.postgres_ssl - name: postgres version: 1.1.0 - src: bbaassssiiee.nginx_ssl - name: nginx version: 1.0.5 - src: bbaassssiiee.proxy - name: proxy version: 1.0.3