ZachiNachshon · ZachiNachshon · May 16, 2025 · Apr 12, 2025 · Apr 12, 2025 · Apr 14, 2025
@@ -1,4 +1,5 @@
 default: help
+PYTHON_VERSION=3.11
 POETRY_DEV=external/shell_scripts_lib/python/poetry_dev.sh
 POETRY_PIP_RELEASER=external/shell_scripts_lib/python/poetry_pip_releaser.sh
 PLUGINS_ROOT_FOLDER=plugins
@@ -9,14 +10,22 @@ PLUGINS_ROOT_FOLDER=plugins
 #     - Generate new token on the classic mode with full 'repo' scope
 #     - Copy the GitHub PAT secret
 #  2. Add the private key as a secret in the repository running the workflow:
-#     - Go to the repository’s settings page on GitHub.
-#     - Click on “Secrets and variables” in the left sidebar and then "Actions".
-#     - Click on “New repository secret”.
-#     - Enter a name for the secret, such as MY_REPO_ACCESS_TOKEN, and paste the contents of the private key file into the “Value” field.
-#     - Click on “Add secret”.
+#     - Go to the repository's settings page on GitHub.
+#     - Click on "Secrets and variables" in the left sidebar and then "Actions".
+#     - Click on "New repository secret".
+#     - Enter a name for the secret, such as MY_REPO_ACCESS_TOKEN, and paste the contents of the private key file into the "Value" field.
+#     - Click on "Add secret".
 #  3. On the GitHub workflow use is as:
 #     - token: ${{ secrets.MY_REPO_ACCESS_TOKEN }}
 
+.PHONY: init
+init: ## Initialize project using uv package manager
+	@uv venv --python $(PYTHON_VERSION)
+	@source .venv/bin/activate
+	@source .venv/bin/python -m ensurepip --upgrade
+	@source .venv/bin/pip3 install --upgrade pip setuptools wheel
+	@poetry self add poetry-multiproject-plugin
+
 .PHONY: prod-mode
 prod-mode: ## Enable production mode for packaging and distribution
 	@poetry self add poetry-multiproject-plugin
@@ -35,17 +44,17 @@ deps-install: ## Update and install pyproject.toml dependencies on all virtual e
 	@poetry install --with dev --sync -v
 	@poetry lock
 
-.PHONY: dev-mode-pip-sdists
-dev-mode-pip-sdists: ## Enable local development from built sdists into project .venv
-	@rm -rf provisioner_shared/dist
-	@cd provisioner_shared; poetry build-project -f sdist; cd ..
-	@mv provisioner_shared/dist/provisioner_shared*.tar.gz dockerfiles/poetry/dists/
-	@rm -rf provisioner/dist
-	$(MAKE) pip-install-runtime
-	@mv provisioner/dist/provisioner*.tar.gz dockerfiles/poetry/dists/
-	@rm -rf plugins/provisioner_installers_plugin/dist
-	@cd plugins/provisioner_installers_plugin; poetry build-project -f sdist; cd ../..
-	@mv plugins/provisioner_installers_plugin/dist/provisioner_*_plugin*.tar.gz dockerfiles/poetry/dists/
+# .PHONY: dev-mode-pip-sdists
+# dev-mode-pip-sdists: ## Enable local development from built sdists into project .venv
+# 	@rm -rf provisioner_shared/dist
+# 	@cd provisioner_shared; poetry build-project -f sdist; cd ..
+# 	@mv provisioner_shared/dist/provisioner_shared*.tar.gz dockerfiles/poetry/dists/
+# 	@rm -rf provisioner/dist
+# 	$(MAKE) pip-install-runtime
+# 	@mv provisioner/dist/provisioner*.tar.gz dockerfiles/poetry/dists/
+# 	@rm -rf plugins/provisioner_installers_plugin/dist
+# 	@cd plugins/provisioner_installers_plugin; poetry build-project -f sdist; cd ../..
+# 	@mv plugins/provisioner_installers_plugin/dist/provisioner_*_plugin*.tar.gz dockerfiles/poetry/dists/
 
 # $(MAKE) prod-mode
 # @./.venv/bin/pip3 install provisioner_shared/dist/provisioner_shared*.tar.gz
@@ -98,39 +107,40 @@ test-coverage-html: ## Run tests suite on runtime and all plugins (output: HTML
 test-coverage-xml: ## Run tests suite on runtime and all plugins NO E2E (output: XML report)
 	./run_tests.py --all --skip-e2e --report xml
 
-.PHONY: pip-install-runtime
-pip-install-runtime: ## [LOCAL] Install provisioner runtime to local pip
+.PHONY: pip-install-runtime-to-venv
+pip-install-runtime-to-venv: ## [LOCAL] Install provisioner runtime to local pip
 	@echo "\n========= PROJECT: provisioner_shared ==============\n"; \
-	pip3 uninstall -y provisioner_shared; \
+	uv pip uninstall provisioner_shared; \
 	cd provisioner_shared; poetry build-project -f wheel; cd ..; \
-	pip3 install provisioner_shared/dist/provisioner_shared*.whl; \
+	uv pip install provisioner_shared/dist/provisioner_shared*.whl; \
 	echo "\n========= PROJECT: provisioner ==============\n"; \
-	pip3 uninstall -y provisioner; \
+	uv pip uninstall provisioner; \
 	cd provisioner; poetry build-project -f wheel; cd ..; \
-	pip3 install provisioner/dist/provisioner_*.whl
+	uv pip install provisioner/dist/provisioner_*.whl;
 
+# @./scripts/install_to_global_pip.sh
 # @cd provisioner; poetry build-project -f sdist; cd ..
 # @pip3 install provisioner/dist/provisioner_*.tar.gz	
 
-.PHONY: pip-install-plugin
-pip-install-plugin: ## [LOCAL] Install any plugin to local pip (make pip-install-plugin examples)
+.PHONY: pip-install-plugin-to-venv
+pip-install-plugin-to-venv: ## [LOCAL] Install any plugin to local pip (make pip-install-plugin examples)
 	@if [ -z "$(word 2, $(MAKECMDGOALS))" ]; then \
 		echo "Error: plugin name is required. Usage: make pip-install-plugin <plugin_name>"; \
 		exit 1; \
 	fi
 	@PLUGIN=$(word 2, $(MAKECMDGOALS)); \
 	echo "\n========= PLUGIN: $$PLUGIN ==============\n"; \
-	pip3 uninstall -y provisioner_$${PLUGIN}_plugin; \
+	uv pip uninstall provisioner_$${PLUGIN}_plugin; \
 	cd ${PLUGINS_ROOT_FOLDER}/provisioner_$${PLUGIN}_plugin; poetry build-project -f wheel; cd ../..; \
-	pip3 install ${PLUGINS_ROOT_FOLDER}/provisioner_$${PLUGIN}_plugin/dist/provisioner_*.whl;
+	uv pip install ${PLUGINS_ROOT_FOLDER}/provisioner_$${PLUGIN}_plugin/dist/provisioner_*.whl;
 
 # cd ${PLUGINS_ROOT_FOLDER}/provisioner_$${PLUGIN}_plugin; poetry build-project -f sdist; cd ../..; \
 # pip3 install ${PLUGINS_ROOT_FOLDER}/provisioner_$${PLUGIN}_plugin/dist/provisioner_*.tar.gz;
 
 .PHONY: pip-uninstall-runtime
 pip-uninstall-runtime: ## [LOCAL] Uninstall provisioner from local pip
 	@echo "\n========= PROJECT: provisioner ==============\n"
-	@cd provisioner; pip3 uninstall -y provisioner_shared provisioner_runtime; cd ..
+	@cd provisioner; uv pip uninstall provisioner_shared provisioner_runtime; cd ..
 
 .PHONY: pip-uninstall-plugin
 pip-uninstall-plugin: ## [LOCAL] Uninstall any plugins source distributions from local pip (make pip-uninstall-plugin example)
@@ -140,7 +150,7 @@ pip-uninstall-plugin: ## [LOCAL] Uninstall any plugins source distributions from
 	fi
 	@PLUGIN=$(word 2, $(MAKECMDGOALS)); \
 	echo "\n========= PLUGIN: $$PLUGIN ==============\n"; \
-	pip3 uninstall -y provisioner_$${PLUGIN}_plugin;
+	uv pip uninstall provisioner_$${PLUGIN}_plugin;
 
 .PHONY: clear-project
 clear-project: ## Clear Poetry virtual environments and clear Python cache

@@ -1 +1 @@
-698369113440172af86b38e077c15476
+046d0da3727d84c5b31e7ed190fd0a9d
@@ -13,7 +13,7 @@
 FROM python:3.11-alpine
 
 # Enable testing mode for provisioner Ansible based tests
-ENV PROVISIONER_TESTING_MODE_ENABLED="true" \
+ENV PROVISIONER_INSTALLER_PLUGIN_TEST="true" \
     TEST_SDSIT_OUTPUTS_HOST_PATH="dists/*.tar.gz" \
     TEST_SDIST_OUTPUTS_CONTAINER_PATH="/tmp/provisioner-sdists/" \
     POETRY_VERSION=1.8.4 \

@@ -1 +1 @@
-c8cd1b9ecf2294bb3cc112a3cddb6890
+bea26f6652997e0a91d0881be5606525
@@ -3,7 +3,7 @@ FROM python:3.11-slim
 
 # Install necessary packages including OpenSSH and dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    openssh-server sudo curl wget systemd \
+    openssh-server sudo curl wget systemd iproute2 iputils-ping netcat-openbsd net-tools \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
     # ansible \
 

@@ -1,37 +1,41 @@
 ---
+- name: Set default facts
+  set_fact:
+    become_root: False
+    reboot_required: False
+  tags: ['reboot']
+
 - name: Display facts values
   debug:
     msg: |
-      dry_run: {{ dry_run }}
+      become_root: {{ become_root }}
+      reboot_required: {{ reboot_required }}
   tags: ['reboot']
 
-- name: Reboot a remote node
+- name: Reboot the remote server
   tags: ['reboot']
   shell: 'sleep 2 && shutdown -r now "Ansible reboot triggered"'
   async: 1
   poll: 0
-  become: "{{ not dry_run }}"
+  become: "{{ become_root }}"
   become_method: sudo
   ignore_errors: true
-  when: 
-    - not dry_run
+  when: reboot_required | bool
 
 - name: Wait for the reboot to complete
   tags: ['reboot']
-  when: 
-    - not dry_run
+  when: reboot_required | bool
   wait_for_connection:
     connect_timeout: 10
     sleep: 5
     delay: 5
     timeout: 300
 
-- name: Check the Uptime of the servers
+- name: Check the server is up
   tags: ['reboot']
   shell: "uptime"
   register: Uptime
-  when: 
-    - not dry_run
+  when: reboot_required | bool
 
 - debug: var=Uptime
   tags: ['reboot']
@@ -6,7 +6,7 @@
 # Description   Define a static IP on the DHCP clietn deamon
 #==============================================================================
 CURRENT_FOLDER_ABS_PATH=$(dirname "${BASH_SOURCE[0]}")
-ANSIBLE_TEMP_FOLDER_PATH="$HOME/.ansible/tmp"
+ANSIBLE_TEMP_FOLDER_PATH="/tmp"
 SHELL_SCRIPTS_LIB_IMPORT_PATH="${ANSIBLE_TEMP_FOLDER_PATH}/shell_lib.sh" 
 
 source "${SHELL_SCRIPTS_LIB_IMPORT_PATH}"
@@ -16,16 +16,16 @@ DHCPCD_NAME=dhcpcd
 DHCPCD_SERVICE_NAME=dhcpcd.service
 DHCPCD_CONFIG_FILEPATH=/etc/dhcpcd.conf
 
-is_static_ip() {
-  [[ -n "${STATIC_IP}" ]]
+get_static_ip() {
+  echo "${STATIC_IP}"
 }
 
-is_gateway_address() {
-  [[ -n "${GATEWAY_ADDRESS}" ]]
+get_gateway_address() {
+  echo "${GATEWAY_ADDRESS}"
 }
 
-is_dns_address() {
-  [[ -n "${DNS_ADDRESS}" ]]
+get_dns_address() {
+  echo "${DNS_ADDRESS}"
 }
 
 maybe_start_dhcpcd_service() {
@@ -47,20 +47,25 @@ maybe_start_dhcpcd_service() {
 }
 
 configure_static_ip_address() {
+  local static_ip_address=$(get_static_ip)
+  local gateway_address=$(get_gateway_address)
+  local dns_address=$(get_dns_address)
+
   local eth0_static_ip_section="
 interface eth0
-static ip_address=${ENV_STATIC_IP}/24
-static routers=${ENV_GATEWAY_ADDRESS}
-static domain_name_servers=${ENV_DNS_ADDRESS}
+static ip_address=${static_ip_address}/24
+static routers=${gateway_address}
+static domain_name_servers=${dns_address}
 "
-
-  if ! is_dry_run && grep -q -w "ip_address=${ENV_STATIC_IP}" "${DHCPCD_CONFIG_FILEPATH}"; then
-    log_info "Entry '${ENV_STATIC_IP}' already exists in ${DHCPCD_CONFIG_FILEPATH}"
-  else
-    cmd_run "printf '${eth0_static_ip_section}' >> ${DHCPCD_CONFIG_FILEPATH}"
-    log_indicator_good "Updated DHCP client daemon config file. path: ${DHCPCD_CONFIG_FILEPATH}"
-#    touch /tmp/test.conf
-#    printf "${eth0_static_ip_section}" >> /tmp/test.conf
+
+  if ! is_dry_run; then
+    # Just check if the IP address is already defined and not commented out
+    if grep -q "static ip_address=${static_ip_address}/24" "${DHCPCD_CONFIG_FILEPATH}" && ! grep -q "^#.*static ip_address=${static_ip_address}/24" "${DHCPCD_CONFIG_FILEPATH}"; then
+      log_info "IP address ${static_ip_address} is already defined in ${DHCPCD_CONFIG_FILEPATH}, skipping..."
+    else
+      cmd_run "printf '${eth0_static_ip_section}' >> ${DHCPCD_CONFIG_FILEPATH}"
+      log_indicator_good "Updated DHCP client daemon config file. path: ${DHCPCD_CONFIG_FILEPATH}"
+    fi
   fi
 }
 
@@ -85,15 +90,15 @@ verify_mandatory_variables() {
     log_fatal "Missing mandatory RPi utility. path: ${RASPI_CONFIG_BINARY}"
   fi
 
-  if ! is_static_ip; then
+  if [[ -z "${STATIC_IP}" ]]; then
     log_fatal "Missing mandatory parameter. name: STATIC_IP"
   fi
 
-  if ! is_gateway_address; then
+  if [[ -z "${GATEWAY_ADDRESS}" ]]; then
     log_fatal "Missing mandatory parameter. name: GATEWAY_ADDRESS"
   fi
 
-  if ! is_dns_address; then
+  if [[ -z "${DNS_ADDRESS}" ]]; then
     log_fatal "Missing mandatory parameter. name: DNS_ADDRESS"
   fi
 }

@@ -1,13 +1,15 @@
 ---
 - name: Set default facts
   set_fact:
-    dry_run: False
+    become_root: False
+    reboot_required: False
   tags: ['define_static_ip']
 
 - name: Display facts values
   debug:
     msg: |
-      dry_run: {{ dry_run }}
+      become_root: {{ become_root }}
+      reboot_required: {{ reboot_required }}
   tags: ['define_static_ip']
 
 - name: Copy shell scripts library to remote host
@@ -22,7 +24,7 @@
   async: 0
   poll: 0
   ignore_errors: false
-  become: "{{ not dry_run }}"
+  become: "{{ become_root }}"
   environment:
     STATIC_IP: "{{ static_ip | mandatory }}"
     GATEWAY_ADDRESS: "{{ gateway_address | mandatory }}"

@@ -9,4 +9,24 @@ k3s_additional_cli_args: null
 # Paths
 local_bin_folder: "~/.local/bin"
 remote_kube_config_path: /etc/rancher/k3s/k3s.yaml
-local_kube_config_path: ~/.kube/k3s/config
+local_kube_config_path: ~/.kube/k3s/config
+
+
+
+
+
+
+
+# 
+# 
+# 
+# 
+# 
+# 
+# CONVERT THE K3S INSTALL VIA ANSIBLE TO AN INSTALLER CALLBACK
+# 
+# 
+# 
+# 
+# 
+# 
@@ -0,0 +1,2 @@
+---
+# No arguments are needed for this role
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		698369113440172af86b38e077c15476
		046d0da3727d84c5b31e7ed190fd0a9d
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		c8cd1b9ecf2294bb3cc112a3cddb6890
		bea26f6652997e0a91d0881be5606525