DevOpsTools/DevOpsLab
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: переименовать контейнер Kubernetes в k8s-controller
Some checks failed
Ansible Testing / lint (push) Has been cancelled
Details
Ansible Testing / test (default) (push) Has been cancelled
Details
Ansible Testing / test (minimal) (push) Has been cancelled
Details
Ansible Testing / test (performance) (push) Has been cancelled
Details
Ansible Testing / deploy-check (push) Has been cancelled
Details

Browse Source 
- Все команды make k8s теперь используют единый контейнер k8s-controller
- Упрощена логика именования контейнеров
- Контейнер k8s-controller используется для всех операций с Kubernetes
This commit is contained in:
Сергей Антропов
2025-10-26 08:28:19 +03:00
parent 377e15119a
commit 591cdaf831
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@@ -1036,7 +1036,7 @@ k8s:
ls -1 molecule/presets/k8s/*.yml 2>/dev/null | sed 's|molecule/presets/k8s/||g' | sed 's|\.yml||g' | sed 's/^/ - /' || echo " - k8s-minimal"; \ ls -1 molecule/presets/k8s/*.yml 2>/dev/null | sed 's|molecule/presets/k8s/||g' | sed 's|\.yml||g' | sed 's/^/ - /' || echo " - k8s-minimal"; \
exit 1; \ exit 1; \
fi; \ fi; \
CONTAINER_NAME=k8s-$$PRESET; \ CONTAINER_NAME=k8s-controller; \
docker run -d --name $$CONTAINER_NAME --rm \ docker run -d --name $$CONTAINER_NAME --rm \
-v "$(PWD):/workspace" -w /workspace \ -v "$(PWD):/workspace" -w /workspace \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
@@ -1055,7 +1055,7 @@ k8s:
echo "🗑️ Удаление Kind кластера и контейнеров..."; \ echo "🗑️ Удаление Kind кластера и контейнеров..."; \
PRESET_ARG="$(word 3, $(MAKECMDGOALS))"; \ PRESET_ARG="$(word 3, $(MAKECMDGOALS))"; \
PRESET=$${PRESET_ARG:-k8s-minimal}; \ PRESET=$${PRESET_ARG:-k8s-minimal}; \
CONTAINER_NAME=k8s-$$PRESET; \ CONTAINER_NAME=k8s-controller; \
if docker ps | grep -q $$CONTAINER_NAME; then \ if docker ps | grep -q $$CONTAINER_NAME; then \
echo "🗑️ Удаление Kind кластеров..."; \ echo "🗑️ Удаление Kind кластеров..."; \
docker exec $$CONTAINER_NAME bash -c "kind delete clusters --all" 2>/dev/null || true; \ docker exec $$CONTAINER_NAME bash -c "kind delete clusters --all" 2>/dev/null || true; \
@@ -1080,7 +1080,7 @@ k8s:
echo "💡 Пример: make k8s stop kubernetes"; \ echo "💡 Пример: make k8s stop kubernetes"; \
exit 1; \ exit 1; \
fi; \ fi; \
CONTAINER_NAME=k8s-$$PRESET_ARG; \ CONTAINER_NAME=k8s-controller; \
if docker ps | grep -q $$CONTAINER_NAME; then \ if docker ps | grep -q $$CONTAINER_NAME; then \
docker exec $$CONTAINER_NAME bash -c "kind get clusters | xargs -I {} kind stop cluster --name {}" 2>/dev/null || true; \ docker exec $$CONTAINER_NAME bash -c "kind get clusters | xargs -I {} kind stop cluster --name {}" 2>/dev/null || true; \
echo "✅ Kind кластер остановлен"; \ echo "✅ Kind кластер остановлен"; \
@@ -1098,7 +1098,7 @@ k8s:
echo "💡 Пример: make k8s start kubernetes"; \ echo "💡 Пример: make k8s start kubernetes"; \
exit 1; \ exit 1; \
fi; \ fi; \
CONTAINER_NAME=k8s-$$PRESET_ARG; \ CONTAINER_NAME=k8s-controller; \
if ! docker ps | grep -q $$CONTAINER_NAME; then \ if ! docker ps | grep -q $$CONTAINER_NAME; then \
echo "❌ Контейнер $$CONTAINER_NAME не запущен"; \ echo "❌ Контейнер $$CONTAINER_NAME не запущен"; \
echo "💡 Запустите: make k8s create $$PRESET_ARG"; \ echo "💡 Запустите: make k8s create $$PRESET_ARG"; \
@@ -1114,7 +1114,7 @@ k8s:
echo "💡 Пример: make k8s status kubernetes"; \ echo "💡 Пример: make k8s status kubernetes"; \
exit 1; \ exit 1; \
fi; \ fi; \
CONTAINER_NAME=k8s-$$PRESET_ARG; \ CONTAINER_NAME=k8s-controller; \
if docker ps | grep -q $$CONTAINER_NAME; then \ if docker ps | grep -q $$CONTAINER_NAME; then \
docker exec $$CONTAINER_NAME bash -c "kind get clusters" 2>/dev/null || echo " Нет кластеров"; \ docker exec $$CONTAINER_NAME bash -c "kind get clusters" 2>/dev/null || echo " Нет кластеров"; \
docker exec $$CONTAINER_NAME bash -c "kind get clusters | while read cluster; do echo \"Кластер: \$$cluster\"; kubectl --context kind-\$$cluster get nodes 2>/dev/null || true; done" 2>/dev/null || true; \ docker exec $$CONTAINER_NAME bash -c "kind get clusters | while read cluster; do echo \"Кластер: \$$cluster\"; kubectl --context kind-\$$cluster get nodes 2>/dev/null || true; done" 2>/dev/null || true; \
@@ -1130,7 +1130,7 @@ k8s:
echo "💡 Пример: make k8s config kubernetes"; \ echo "💡 Пример: make k8s config kubernetes"; \
exit 1; \ exit 1; \
fi; \ fi; \
CONTAINER_NAME=k8s-$$PRESET_ARG; \ CONTAINER_NAME=k8s-controller; \
if ! docker ps | grep -q $$CONTAINER_NAME; then \ if ! docker ps | grep -q $$CONTAINER_NAME; then \
echo "❌ Контейнер $$CONTAINER_NAME не запущен"; \ echo "❌ Контейнер $$CONTAINER_NAME не запущен"; \
echo "💡 Запустите: make k8s create $$PRESET_ARG"; \ echo "💡 Запустите: make k8s create $$PRESET_ARG"; \
@@ -1165,7 +1165,7 @@ k8s:
echo "💡 Пример: make k8s addon kubernetes https://example.com/manifest.yaml"; \ echo "💡 Пример: make k8s addon kubernetes https://example.com/manifest.yaml"; \
exit 1; \ exit 1; \
fi; \ fi; \
CONTAINER_NAME=k8s-$$PRESET_ARG; \ CONTAINER_NAME=k8s-controller; \
if ! docker ps | grep -q $$CONTAINER_NAME; then \ if ! docker ps | grep -q $$CONTAINER_NAME; then \
echo "❌ Контейнер $$CONTAINER_NAME не запущен"; \ echo "❌ Контейнер $$CONTAINER_NAME не запущен"; \
echo "💡 Запустите: make k8s create $$PRESET_ARG"; \ echo "💡 Запустите: make k8s create $$PRESET_ARG"; \
@@ -1183,7 +1183,7 @@ k8s:
echo "💡 Пример: make k8s nodes kubernetes"; \ echo "💡 Пример: make k8s nodes kubernetes"; \
exit 1; \ exit 1; \
fi; \ fi; \
CONTAINER_NAME=k8s-$$PRESET_ARG; \ CONTAINER_NAME=k8s-controller; \
if ! docker ps | grep -q $$CONTAINER_NAME; then \ if ! docker ps | grep -q $$CONTAINER_NAME; then \
echo "❌ Контейнер $$CONTAINER_NAME не запущен"; \ echo "❌ Контейнер $$CONTAINER_NAME не запущен"; \
echo "💡 Запустите: make k8s create $$PRESET_ARG"; \ echo "💡 Запустите: make k8s create $$PRESET_ARG"; \
@@ -1199,7 +1199,7 @@ k8s:
echo "💡 Пример: make k8s shell kubernetes"; \ echo "💡 Пример: make k8s shell kubernetes"; \
exit 1; \ exit 1; \
fi; \ fi; \
CONTAINER_NAME=k8s-$$PRESET_ARG; \ CONTAINER_NAME=k8s-controller; \
if docker ps | grep -q $$CONTAINER_NAME; then \ if docker ps | grep -q $$CONTAINER_NAME; then \
docker exec -it $$CONTAINER_NAME bash; \ docker exec -it $$CONTAINER_NAME bash; \
else \ else \
@@ -1216,7 +1216,7 @@ k8s:
echo "💡 Пример: make k8s manifest apply kubernetes https://example.com/manifest.yaml"; \ echo "💡 Пример: make k8s manifest apply kubernetes https://example.com/manifest.yaml"; \
exit 1; \ exit 1; \
fi; \ fi; \
CONTAINER_NAME=k8s-$$PRESET_ARG; \ CONTAINER_NAME=k8s-controller; \
if ! docker ps | grep -q $$CONTAINER_NAME; then \ if ! docker ps | grep -q $$CONTAINER_NAME; then \
echo "❌ Контейнер $$CONTAINER_NAME не запущен"; \ echo "❌ Контейнер $$CONTAINER_NAME не запущен"; \
echo "💡 Запустите: make k8s create $$PRESET_ARG"; \ echo "💡 Запустите: make k8s create $$PRESET_ARG"; \
@@ -1249,7 +1249,7 @@ k8s:
echo "💡 Пример: make k8s helm list kubernetes"; \ echo "💡 Пример: make k8s helm list kubernetes"; \
exit 1; \ exit 1; \
fi; \ fi; \
CONTAINER_NAME=k8s-$$PRESET_ARG; \ CONTAINER_NAME=k8s-controller; \
if ! docker ps | grep -q $$CONTAINER_NAME; then \ if ! docker ps | grep -q $$CONTAINER_NAME; then \
echo "❌ Контейнер $$CONTAINER_NAME не запущен"; \ echo "❌ Контейнер $$CONTAINER_NAME не запущен"; \
echo "💡 Запустите: make k8s create $$PRESET_ARG"; \ echo "💡 Запустите: make k8s create $$PRESET_ARG"; \
@@ -1316,7 +1316,7 @@ k8s:
echo "💡 Пример: make k8s helmrepo list kubernetes"; \ echo "💡 Пример: make k8s helmrepo list kubernetes"; \
exit 1; \ exit 1; \
fi; \ fi; \
CONTAINER_NAME=k8s-$$PRESET_ARG; \ CONTAINER_NAME=k8s-controller; \
if ! docker ps | grep -q $$CONTAINER_NAME; then \ if ! docker ps | grep -q $$CONTAINER_NAME; then \
echo "❌ Контейнер $$CONTAINER_NAME не запущен"; \ echo "❌ Контейнер $$CONTAINER_NAME не запущен"; \
echo "💡 Запустите: make k8s create $$PRESET_ARG"; \ echo "💡 Запустите: make k8s create $$PRESET_ARG"; \