From 553b1af9be53dbfc7b6ac52183b2003fded873e7 Mon Sep 17 00:00:00 2001 From: Vassiliy Yegorov Date: Tue, 24 Jun 2025 14:26:45 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BF=D0=B0=D1=80?= =?UTF-8?q?=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20dm-thin-pool=20=D0=B2=20=D1=81?= =?UTF-8?q?=D0=BA=D1=80=D0=B8=D0=BF=D1=82=20generate.sh,=20=D0=BE=D0=B1?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20IP-=D0=B0=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D1=81=D0=B0=20=D0=B2=20README.md=20=D0=B8=20=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=20=D0=B8=D0=BD=D1=82=D0=B5?= =?UTF-8?q?=D1=80=D0=B2=D0=B0=D0=BB=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20piraeus.yaml=20=D1=81=205?= =?UTF-8?q?=20=D0=BC=D0=B8=D0=BD=D1=83=D1=82=20=D0=BD=D0=B0=203=20=D0=BC?= =?UTF-8?q?=D0=B8=D0=BD=D1=83=D1=82=D1=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clusters/t8s-demo/install/piraeus.yaml | 2 +- talos-k8s/README.md | 44 +++++++++---------- talos-k8s/cilium/ippool.yaml | 2 +- talos-k8s/cilium/l2-announcement-policy.yaml | 4 +- talos-k8s/cilium/values.yaml | 4 +- talos-k8s/generate.sh | 1 + talos-k8s/run-stand.sh | 1 + 7 files changed, 30 insertions(+), 28 deletions(-) diff --git a/talos-k8s-flux/clusters/t8s-demo/install/piraeus.yaml b/talos-k8s-flux/clusters/t8s-demo/install/piraeus.yaml index a344398..5970b19 100644 --- a/talos-k8s-flux/clusters/t8s-demo/install/piraeus.yaml +++ b/talos-k8s-flux/clusters/t8s-demo/install/piraeus.yaml @@ -41,7 +41,7 @@ metadata: name: piraeus-cluster namespace: flux-system spec: - interval: 5m + interval: 3m path: talos-k8s-flux/soft/piraeus prune: true sourceRef: diff --git a/talos-k8s/README.md b/talos-k8s/README.md index 8e89599..cf6554a 100644 --- a/talos-k8s/README.md +++ b/talos-k8s/README.md @@ -21,7 +21,7 @@ ISO-образы для архитектур amd64 и arm64 доступны н ```bash talosctl gen secrets -o config/secrets.yaml -talosctl gen config --kubernetes-version 1.33.2 --with-secrets config/secrets.yaml talos-demo https://192.168.23.54:6443 --config-patch @patch.yaml +talosctl gen config --kubernetes-version 1.33.2 --with-secrets config/secrets.yaml talos-demo https://192.168.23.57:6443 --config-patch @patch.yaml talosctl machineconfig patch config/controlplane.yaml --patch @cp1.patch --output config/cp1.yaml talosctl machineconfig patch config/controlplane.yaml --patch @cp2.patch --output config/cp2.yaml @@ -34,16 +34,16 @@ talosctl machineconfig patch config/worker.yaml --patch @worker2.patch --output эту часть делаем мы ```bash -talosctl apply-config --insecure -n 192.168.23.54 --file config/cp1.yaml -talosctl bootstrap --nodes 192.168.23.54 --endpoints 192.168.23.54 --talosconfig=config/talosconfig +talosctl apply-config --insecure -n 192.168.23.57 --file config/cp1.yaml +talosctl bootstrap --nodes 192.168.23.57 --endpoints 192.168.23.57 --talosconfig=config/talosconfig -talosctl apply-config --insecure -n 192.168.23.52 --file config/cp2.yaml -talosctl apply-config --insecure -n 192.168.23.53 --file config/cp3.yaml +# talosctl apply-config --insecure -n 192.168.23.52 --file config/cp2.yaml +# talosctl apply-config --insecure -n 192.168.23.53 --file config/cp3.yaml -talosctl apply-config --insecure -n 192.168.23.55 --file config/worker1.yaml -talosctl apply-config --insecure -n 192.168.23.56 --file config/worker2.yaml +talosctl apply-config --insecure -n 192.168.23.59 --file config/worker1.yaml +talosctl apply-config --insecure -n 192.168.23.58 --file config/worker2.yaml -talosctl kubeconfig ~/.kube/talos-demo.yaml --nodes 192.168.23.54 --endpoints 192.168.23.54 --talosconfig config/talosconfig +talosctl kubeconfig ~/.kube/talos-demo.yaml --nodes 192.168.23.57 --endpoints 192.168.23.57 --talosconfig config/talosconfig ``` ## Cilium @@ -71,23 +71,23 @@ kubectl apply -f cilium/l2-announcement-policy.yaml ## Re-Apply configs ```bash -talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.51 --file config/cp1.yaml -talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.52 --file config/cp2.yaml -talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.53 --file config/cp3.yaml +talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.57 --file config/cp1.yaml +# talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.52 --file config/cp2.yaml +# talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.53 --file config/cp3.yaml -talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.54 --file config/worker1.yaml -talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.55 --file config/worker2.yaml +talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.58 --file config/worker1.yaml +talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.59 --file config/worker2.yaml ``` ## Re-Apply configs and reboot ```bash -talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.51 --file config/cp1.yaml --mode=reboot -talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.52 --file config/cp2.yaml --mode=reboot -talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.53 --file config/cp3.yaml --mode=reboot +talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.57 --file config/cp1.yaml --mode=reboot +# talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.52 --file config/cp2.yaml --mode=reboot +# talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.53 --file config/cp3.yaml --mode=reboot -talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.54 --file config/worker1.yaml --mode=reboot -talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.55 --file config/worker2.yaml --mode=reboot +talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.59 --file config/worker1.yaml --mode=reboot +talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.58 --file config/worker2.yaml --mode=reboot ``` ## Upgrade @@ -95,12 +95,12 @@ talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.55 --file c ```bash IMAGE=factory.talos.dev/metal-installer/956b9107edd250304169d2e7a765cdd4e0c31f9097036e2e113b042e6c01bb98:v1.10.4 -talosctl --talosconfig config/talosconfig upgrade --nodes 192.168.23.51 --image ${IMAGE} -talosctl --talosconfig config/talosconfig upgrade --nodes 192.168.23.52 --image ${IMAGE} -talosctl --talosconfig config/talosconfig upgrade --nodes 192.168.23.53 --image ${IMAGE} +talosctl --talosconfig config/talosconfig upgrade --nodes 192.168.23.54 --image ${IMAGE} +# talosctl --talosconfig config/talosconfig upgrade --nodes 192.168.23.52 --image ${IMAGE} +# talosctl --talosconfig config/talosconfig upgrade --nodes 192.168.23.53 --image ${IMAGE} -talosctl --talosconfig config/talosconfig upgrade --nodes 192.168.23.53 --image ${IMAGE} talosctl --talosconfig config/talosconfig upgrade --nodes 192.168.23.55 --image ${IMAGE} +talosctl --talosconfig config/talosconfig upgrade --nodes 192.168.23.56 --image ${IMAGE} ``` ## Upgrade k8s diff --git a/talos-k8s/cilium/ippool.yaml b/talos-k8s/cilium/ippool.yaml index 1088a0a..0dbafe6 100644 --- a/talos-k8s/cilium/ippool.yaml +++ b/talos-k8s/cilium/ippool.yaml @@ -4,4 +4,4 @@ metadata: name: pool spec: blocks: - - cidr: 192.168.23.57/32 + - cidr: 192.168.23.60/32 diff --git a/talos-k8s/cilium/l2-announcement-policy.yaml b/talos-k8s/cilium/l2-announcement-policy.yaml index cad7583..2b54952 100644 --- a/talos-k8s/cilium/l2-announcement-policy.yaml +++ b/talos-k8s/cilium/l2-announcement-policy.yaml @@ -7,7 +7,7 @@ spec: matchExpressions: - key: node-role.kubernetes.io/control-plane operator: DoesNotExist - interfaces: - - ^ens+ + # interfaces: + # - ^ens+ externalIPs: true loadBalancerIPs: true diff --git a/talos-k8s/cilium/values.yaml b/talos-k8s/cilium/values.yaml index 5d7bcb5..06fc2bb 100644 --- a/talos-k8s/cilium/values.yaml +++ b/talos-k8s/cilium/values.yaml @@ -23,11 +23,11 @@ cgroup: autoMount: enabled: false hostRoot: /sys/fs/cgroup -k8sServiceHost: 192.168.23.54 +k8sServiceHost: 192.168.23.57 k8sServicePort: 6443 l2announcements: enabled: true -devices: ^ens+ +# devices: ^ens+ hubble: relay: enabled: true diff --git a/talos-k8s/generate.sh b/talos-k8s/generate.sh index bc3d74a..ba2bed3 100755 --- a/talos-k8s/generate.sh +++ b/talos-k8s/generate.sh @@ -283,6 +283,7 @@ if [[ "$USE_DRBD" == "y" ]] && (( WORKER_COUNT == 0 )); then - name: drbd parameters: - usermode_helper=disabled + - name: dm-thin-pool EOF if [[ "$USE_ZFS" == "y" ]]; then cat >> "$PATCH_FILE" << EOF diff --git a/talos-k8s/run-stand.sh b/talos-k8s/run-stand.sh index b0ec75a..36483e4 100755 --- a/talos-k8s/run-stand.sh +++ b/talos-k8s/run-stand.sh @@ -38,6 +38,7 @@ echo "${VERB} stand" do ssh root@${nodeip} "pvesh create /nodes/${nodeid}/qemu/${vmid_template}/clone --newid ${vmid}${i} --full false --name ${vm_name}-cp-${i}" ssh root@${nodeip} "pvesh set /nodes/${nodeid}/qemu/${vmid}${i}/config --cores 2 --vcpus 2 --memory 6144" + ssh root@${nodeip} "pvesh set /nodes/${nodeid}/qemu/${vmid}${i}/config --scsihw virtio-scsi-pci --delete scsi1" ssh root@${nodeip} "pvesh set /pools/${poolid} --vms "${vmid}${i}"" ssh root@${nodeip} "pvesh create /nodes/${nodeid}/qemu/${vmid}${i}/status/start" done