Update

Author: YuryHrytsuk

scripts/.gitignore

@@ -0,0 +1 @@
+wait4x

scripts/common.Makefile

@@ -342,8 +342,13 @@ show-venv: venv  ## show venv info
 	@echo venv: $(VENV_DIR)
 
 .PHONY: install
-install: requirements.txt venv ## install dependencies from ./requirements.txt
-	@VIRTUAL_ENV=$(VENV_DIR) $(UV) pip install --requirement $<
+install: guard-optional-REQUIREMENTS_FILE venv ## install requirements.txt dependencies
+	@if [ -z "$(REQUIREMENTS_FILE)" ]; then \
+		REQUIREMENTS_FILE=./requirements.txt; \
+	else \
+		REQUIREMENTS_FILE=$(REQUIREMENTS_FILE); \
+	fi; \
+	VIRTUAL_ENV=$(VENV_DIR) $(UV) pip install --requirement $$REQUIREMENTS_FILE
 
 # https://github.com/kolypto/j2cli?tab=readme-ov-file#customization
 ifeq ($(shell test -f j2cli_customization.py && echo -n yes),yes)
@@ -362,3 +367,16 @@ define jinja
 endef
 
 endif
+
+#
+# wait-fot-it functionality
+#
+
+WAIT_FOR_IT := $(REPO_BASE_DIR)/scripts/wait4x
+
+# https://github.com/wait4x/wait4x
+$(WAIT_FOR_IT):
+	@curl --output-dir /tmp --silent --location --remote-name https://github.com/wait4x/wait4x/releases/download/v3.5.0/wait4x-linux-amd64.tar.gz
+	@tar -xf /tmp/wait4x-linux-amd64.tar.gz -C $(REPO_BASE_DIR)/scripts/
+	@rm /tmp/wait4x-linux-amd64.tar.gz
+	$@ version

services/monitoring/grafana/Makefile

@@ -39,29 +39,11 @@ terraform-apply: $(REPO_CONFIG_LOCATION) terraform/plan.cache $(TF_STATE_FILE) e
 	terraform -chdir=./terraform apply plan.cache
 
 .PHONY: ensure-grafana-online
-ensure-grafana-online:
+ensure-grafana-online: $(WAIT_FOR_IT)
 	@set -o allexport; \
 	source $(REPO_CONFIG_LOCATION); \
 	set +o allexport; \
-	url=$${TF_VAR_GRAFANA_URL}; \
-	echo "Waiting for grafana at $$url to become reachable..."; \
-	attempts=0; \
-	max_attempts=10; \
-	while [ $$attempts -lt $$max_attempts ]; do \
-		status_code=$$(curl -k -o /dev/null -s -w "%{http_code}" --max-time 10 $$url); \
-		if [ "$$status_code" -ge 200 ] && [ "$$status_code" -lt 400 ]; then \
-			echo "Grafana is online"; \
-			break; \
-		else \
-			echo "Grafana still unreachable, waiting 5s for grafana to become reachable... (Attempt $$((attempts+1)))"; \
-			sleep 5; \
-			attempts=$$((attempts + 1)); \
-		fi; \
-	done; \
-	if [ $$attempts -eq $$max_attempts ]; then \
-		echo "Max attempts reached, Grafana is still unreachable."; \
-		exit 1; \
-	fi;
+	$(WAIT_FOR_IT) http $$TF_VAR_GRAFANA_URL --timeout=120s --interval=5s --expect-status-code 200
 
 .PHONY: assets
 assets: ${REPO_CONFIG_LOCATION}

services/portainer/Makefile

@@ -15,42 +15,38 @@ include ${REPO_BASE_DIR}/scripts/common.Makefile
 .PHONY: up ## Deploys portainer stack
 up: .init .env secrets ${TEMP_COMPOSE}
 	@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE} ${STACK_NAME}
+	@$(MAKE) --noprint configure-portainer-registry
 
 .PHONY: up-local ## Deploys portainer stack for local deployment
 up-local: .init .env secrets ${TEMP_COMPOSE} ${TEMP_COMPOSE}-local
 	@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-local ${STACK_NAME}
+	@$(MAKE) --noprint configure-portainer-registry
 
 .PHONY: up-dalco ## Deploys portainer stack for Dalco Cluster
 up-dalco: .init .env secrets ${TEMP_COMPOSE}-dalco
 	@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-dalco ${STACK_NAME}
+	@$(MAKE) --noprint configure-portainer-registry
 
 .PHONY: up-aws ## Deploys portainer stack for AWS
 up-aws: .init .env secrets ${TEMP_COMPOSE}-aws
 	@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-aws ${STACK_NAME}
+	@$(MAKE) --noprint configure-portainer-registry
 
 .PHONY: up-public ## Deploys portainer stack for public access Cluster
 up-public: up-dalco
 
 .PHONY: up-master ## Deploys portainer stack for master Cluster
 up-master: .init .env secrets ${TEMP_COMPOSE}-master
 	@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-master ${STACK_NAME}
+	@$(MAKE) --noprint configure-portainer-registry
 
 
-.PHONY: configure-registry
-configure-registry:  ## Add if necessary dockerhub registry configuration to portainer.
-	@set -o allexport; \
-	source $(REPO_CONFIG_LOCATION); \
-	set +o allexport; \
-	while [ "$$(curl -s -o /dev/null -I -w "%{http_code}" --max-time 10  -H "Accept: application/json" -H "Content-Type: application/json" -X GET https://"$$MONITORING_DOMAIN"/portainer/#/auth)" != 200 ]; do\
-		echo "waiting for portainer to run...";\
-		sleep 5s;\
-	done;\
-	echo "Updating docker-hub config";\
-	authentificationToken=$$(curl -o /dev/null -X POST "https://"$$MONITORING_DOMAIN"/portainer/api/auth" -H  "Content-Type: application/json" -d "{  \"Username\": \"$${PORTAINER_ADMIN_LOGIN}\",  \"Password\": \"$${PORTAINER_ADMIN_PWD}\"}"); \
-	authentificationToken=$$(echo "$$authentificationToken" | jq --raw-output '.jwt'); \
-	update_hub=$$(curl -o /dev/null -X PUT "https://"$$MONITORING_DOMAIN"/portainer/api/dockerhub" -H  "accept: application/json" -H \
-	"Authorization: Bearer $${authentificationToken}" -H  "Content-Type: application/json" \
-	-d "{  \"Authentication\": true,  \"Username\": \"$$DOCKER_HUB_LOGIN\",  \"Password\": \"$$DOCKER_HUB_PASSWORD\"}"); \
+.PHONY: configure-portainer-registry
+configure-portainer-registry: venv $(VENV_BIN)/python $(WAIT_FOR_IT) ## Add if necessary dockerhub registry configuration to portainer.
+	@$(MAKE) --no-print install REQUIREMENTS_FILE=./scripts/requirements.txt
+	@set -o allexport; source $(REPO_CONFIG_LOCATION); set +o allexport; \
+	$(WAIT_FOR_IT) http $$PORTAINER_URL --timeout=120s --interval=5s --expect-status-code 200 && \
+	$(VENV_BIN)/python ./scripts/configure_portainer_registry.py
 
 
 # Helpers -------------------------------------------------

services/portainer/scripts/configure_registries.py renamed to services/portainer/scripts/configure_portainer_registry.py

@@ -1,2 +1,2 @@
-tenacity==2.32.4
-requests==9.1.2
+tenacity==9.1.2
+requests==2.32.4