From 80c0b5e7e435cda2ef8a62e0642e7b035893486b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9=20=D0=92=D0=B8?= =?UTF-8?q?=D0=B3=D0=B4=D0=BE=D1=80=D0=BE=D0=B2?= Date: Sat, 28 Jun 2025 21:41:00 +0300 Subject: [PATCH] fix k8s config --- .drone.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.drone.yml b/.drone.yml index e81a035..8df3c0c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -42,18 +42,18 @@ steps: from_secret: KUBE_CONFIG commands: # Готовим переменные для dev-окружения - - export APP_NAMESPACE="dev-ns" # Будем деплоить в отдельный неймспейс - - export HOSTNAME="dev.examples-for-kids.vigdorov.ru" - - export IMAGE_TAG="${DRONE_COMMIT_SHA:0:7}" - - export IMAGE_NAME="ci.vigdorov.ru/library/examples-for-kids-app" - - export SECRET_NAME="dev-test-tls" + - 'export APP_NAMESPACE="dev-ns"' # Будем деплоить в отдельный неймспейс + - 'export HOSTNAME="dev.examples-for-kids.vigdorov.ru"' + - 'export IMAGE_TAG="${DRONE_COMMIT_SHA:0:7}"' + - 'export IMAGE_NAME="ci.vigdorov.ru/library/examples-for-kids-app"' + - 'export SECRET_NAME="dev-test-tls"' # Создаем неймспейс, если его нет - - kubectl create namespace $APP_NAMESPACE --dry-run=client -o yaml | kubectl apply -f - + - 'kubectl create namespace $APP_NAMESPACE --dry-run=client -o yaml | kubectl apply -f -' # Заменяем метки в шаблонах на реальные значения и применяем - - sed -e "s|__IMAGE__|$IMAGE_NAME:$IMAGE_TAG|g" k8s/deployment.yaml | kubectl apply -n $APP_NAMESPACE -f - - - kubectl apply -n $APP_NAMESPACE -f k8s/service.yaml - - sed -e "s|__HOSTNAME__|$HOSTNAME|g" -e "s|__SECRET_NAME__|$SECRET_NAME|g" k8s/ingress.yaml | kubectl apply -n $APP_NAMESPACE -f - - - echo "Deployed to DEV: https://$HOSTNAME" + - 'sed -e "s|__IMAGE__|$IMAGE_NAME:$IMAGE_TAG|g" k8s/deployment.yaml | kubectl apply -n $APP_NAMESPACE -f -' + - 'kubectl apply -n $APP_NAMESPACE -f k8s/service.yaml' + - 'sed -e "s|__HOSTNAME__|$HOSTNAME|g" -e "s|__SECRET_NAME__|$SECRET_NAME|g" k8s/ingress.yaml | kubectl apply -n $APP_NAMESPACE -f -' + - 'echo "Deployed to DEV: https://$HOSTNAME"' # --- Шаг 3: Развертывание в PROD-окружение --- - name: deploy-prod @@ -67,15 +67,15 @@ steps: from_secret: KUBE_CONFIG commands: # Готовим переменные для prod-окружения - - export APP_NAMESPACE="prod-ns" - - export HOSTNAME="examples-for-kids.vigdorov.ru" - - export IMAGE_TAG="${DRONE_COMMIT_SHA:0:7}" - - export IMAGE_NAME="ci.vigdorov.ru/library/examples-for-kids-app" - - export SECRET_NAME="prod-test-tls" + - 'export APP_NAMESPACE="prod-ns"' + - 'export HOSTNAME="examples-for-kids.vigdorov.ru"' + - 'export IMAGE_TAG="${DRONE_COMMIT_SHA:0:7}"' + - 'export IMAGE_NAME="ci.vigdorov.ru/library/examples-for-kids-app"' + - 'export SECRET_NAME="prod-test-tls"' # Создаем неймспейс - - kubectl create namespace $APP_NAMESPACE --dry-run=client -o yaml | kubectl apply -f - + - 'kubectl create namespace $APP_NAMESPACE --dry-run=client -o yaml | kubectl apply -f -' # Разворачиваем приложение - - sed -e "s|__IMAGE__|$IMAGE_NAME:$IMAGE_TAG|g" k8s/deployment.yaml | kubectl apply -n $APP_NAMESPACE -f - - - kubectl apply -n $APP_NAMESPACE -f k8s/service.yaml - - sed -e "s|__HOSTNAME__|$HOSTNAME|g" -e "s|__SECRET_NAME__|$SECRET_NAME|g" k8s/ingress.yaml | kubectl apply -n $APP_NAMESPACE -f - - - echo "Deployed to PROD: https://$HOSTNAME" \ No newline at end of file + - 'sed -e "s|__IMAGE__|$IMAGE_NAME:$IMAGE_TAG|g" k8s/deployment.yaml | kubectl apply -n $APP_NAMESPACE -f -' + - 'kubectl apply -n $APP_NAMESPACE -f k8s/service.yaml' + - 'sed -e "s|__HOSTNAME__|$HOSTNAME|g" -e "s|__SECRET_NAME__|$SECRET_NAME|g" k8s/ingress.yaml | kubectl apply -n $APP_NAMESPACE -f -' + - 'echo "Deployed to PROD: https://$HOSTNAME"' \ No newline at end of file