From 5a46edce3cc8ca3bf1e82830456407a994874229 Mon Sep 17 00:00:00 2001 From: Vassiliy Yegorov Date: Wed, 25 Jun 2025 12:31:30 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B2=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=B5=20?= =?UTF-8?q?generate.sh=20=D0=B4=D0=BB=D1=8F=20=D1=83=D0=BB=D1=83=D1=87?= =?UTF-8?q?=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=87=D0=B8=D1=82=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=D0=BE=D1=81=D1=82=D0=B8,=20=D0=B8=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=20IP-=D0=B0=D0=B4=D1=80=D0=B5=D1=81=20=D0=B2?= =?UTF-8?q?=20cilium/values.yaml,=20=D0=B7=D0=B0=D0=BA=D0=BE=D0=BC=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20?= =?UTF-8?q?=D1=80=D0=B5=D1=81=D1=83=D1=80=D1=81=D1=8B=20=D0=B2=20kustomiza?= =?UTF-8?q?tion.yaml.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- talos-k8s-flux/clusters/t8s-demo/kustomization.yaml | 12 ++++++------ talos-k8s/cilium/values.yaml | 2 +- talos-k8s/generate.sh | 10 ++++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/talos-k8s-flux/clusters/t8s-demo/kustomization.yaml b/talos-k8s-flux/clusters/t8s-demo/kustomization.yaml index b95acd5..16bfe5a 100644 --- a/talos-k8s-flux/clusters/t8s-demo/kustomization.yaml +++ b/talos-k8s-flux/clusters/t8s-demo/kustomization.yaml @@ -18,17 +18,17 @@ resources: - ../../soft/pgadmin.yaml - ../../soft/coroot.yaml -- install/piraeus.yaml +# - install/piraeus.yaml # - install/nfs-provisioner.yaml - install/ingress-nginx.yaml - install/metrics-server.yaml -- install/monitoring.yaml +# - install/monitoring.yaml # - install/loki.yaml # - install/promtail.yaml -- install/kyverno.yaml -- install/cpng.yaml -- install/vswh.yaml -- install/stakater.yaml +# - install/kyverno.yaml +# - install/cpng.yaml +# - install/vswh.yaml +# - install/stakater.yaml # - install/keycloak.yaml # - install/redis.yaml # - install/pgadmin.yaml diff --git a/talos-k8s/cilium/values.yaml b/talos-k8s/cilium/values.yaml index 48d8f8a..fefa525 100644 --- a/talos-k8s/cilium/values.yaml +++ b/talos-k8s/cilium/values.yaml @@ -23,7 +23,7 @@ cgroup: autoMount: enabled: false hostRoot: /sys/fs/cgroup -k8sServiceHost: 192.168.23.22 +k8sServiceHost: 192.168.23.79 k8sServicePort: 6443 l2announcements: enabled: true diff --git a/talos-k8s/generate.sh b/talos-k8s/generate.sh index 7b3aef7..8af23d1 100755 --- a/talos-k8s/generate.sh +++ b/talos-k8s/generate.sh @@ -745,14 +745,16 @@ talosctl apply-config --insecure -n $FIRST_CP_IP_CLEAN --file config/cp1.yaml echo -e "${GREEN}Применен конфиг на первом control-plane ($FIRST_CP_IP_CLEAN)${NC}" echo -e "${YELLOW}--------------------------------------------------${NC}" echo -e "${RED} Обязательно дождитесь ребута и предложения в логе о bootstrap ${NC}" -echo -e "${YELLOW}--------------------------------------------------${NC}" +echo -e "${GREEN}--------------------------------------------------${NC}" read -p "Выполнить bootstrap на первом control-plane ($FIRST_CP_IP_CLEAN)? [Enter для продолжения]" talosctl bootstrap --nodes $FIRST_CP_IP_CLEAN --endpoints $FIRST_CP_IP_CLEAN --talosconfig=config/talosconfig -echo -e "${RED}Выполнен bootstrap на первом control-plane ($FIRST_CP_IP_CLEAN)${NC}" -echo "Обазятельно дождитесь полного завершения bootstrap" -echo "Остальные ноды можно применять без ожидания" +echo -e "${GREEN}Выполнен bootstrap на первом control-plane ($FIRST_CP_IP_CLEAN)${NC}" echo -e "${YELLOW}--------------------------------------------------${NC}" +echo -e "${RED}Обазятельно дождитесь полного завершения bootstrap${NC}" +echo -e "${YELLOW}--------------------------------------------------${NC}" +echo "Остальные ноды можно применять без ожидания" +echo -e "${GREEN}--------------------------------------------------${NC}" if (( CP_COUNT > 1 )); then for i in $(seq 2 $CP_COUNT); do