diff --git a/talos-k8s-flux/clusters/t8s-default/soft.md b/talos-k8s-flux/clusters/t8s-default/soft.md index 9588c5a..ec3cbd3 100644 --- a/talos-k8s-flux/clusters/t8s-default/soft.md +++ b/talos-k8s-flux/clusters/t8s-default/soft.md @@ -1,13 +1,17 @@ # Soft Install ```bash +helm repo add nfs-subdir-external-provisioner https://kubernetes-sigs.github.io/nfs-subdir-external-provisioner/ helm upgrade --install --create-namespace -n nfs-provisioner nfs-provisioner nfs-subdir-external-provisioner/nfs-subdir-external-provisioner \ - --set nfs.server=192.168.8.4 --set nfs.path=/volume1/t8s --set nfs.reclaimPolicy=delete \ - --set storageClass.create=true --set storageClass.defaultClass=true \ - --set storageClass.name=nfs-client --set storageClass.archiveOnDelete=false + --set nfs.server=192.168.8.4 \ + --set nfs.path=/volume1/t8s \ + --set nfs.reclaimPolicy=delete \ + --set storageClass.create=true \ + --set storageClass.defaultClass=true \ + --set storageClass.name=nfs-client \ + --set storageClass.archiveOnDelete=false ``` - ## Проверка работы ```yaml @@ -37,7 +41,7 @@ spec: - protocol: TCP port: 80 targetPort: 80 - + --- apiVersion: apps/v1 kind: Deployment diff --git a/talos-k8s/README.md b/talos-k8s/README.md index ffe9957..b32956e 100644 --- a/talos-k8s/README.md +++ b/talos-k8s/README.md @@ -92,22 +92,22 @@ rm ~/.talos/config ## Генерация и установка -эту часть делает ренератор generator.sh +эту часть делает утилита talostpl ```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.57:6443 --config-patch @patch.yaml +talosctl gen config --kubernetes-version 1.33.2 --with-secrets 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 -talosctl machineconfig patch config/controlplane.yaml --patch @cp3.patch --output config/cp3.yaml +talosctl machineconfig patch controlplane.yaml --patch @cp1.patch --output cp1.yaml +talosctl machineconfig patch controlplane.yaml --patch @cp2.patch --output cp2.yaml +talosctl machineconfig patch controlplane.yaml --patch @cp3.patch --output cp3.yaml -talosctl machineconfig patch config/worker.yaml --patch @worker1.patch --output config/worker1.yaml -talosctl machineconfig patch config/worker.yaml --patch @worker2.patch --output config/worker2.yaml +talosctl machineconfig patch worker.yaml --patch @worker1.patch --output worker1.yaml +talosctl machineconfig patch worker.yaml --patch @worker2.patch --output worker2.yaml -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.57 --file cp1.yaml +talosctl bootstrap --nodes 192.168.23.57 --endpoints 192.168.23.57 --talosconfig=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 @@ -115,7 +115,7 @@ talosctl bootstrap --nodes 192.168.23.57 --endpoints 192.168.23.57 --talosconfig talosctl apply-config --insecure -n 192.168.23.63 --file config/worker1.yaml talosctl apply-config --insecure -n 192.168.23.64 --file config/worker2.yaml -talosctl kubeconfig ~/.kube/talos-demo.yaml --nodes 192.168.23.57 --endpoints 192.168.23.57 --talosconfig config/talosconfig +talosctl kubeconfig ~/.kube/talos-demo.yaml --nodes 192.168.23.57 --endpoints 192.168.23.57 --talosconfig talosconfig ``` ## Cilium @@ -143,7 +143,7 @@ kubectl apply -f cilium/l2-announcement-policy.yaml ## Re-Apply configs ```bash -talosctl --talosconfig config/talosconfig apply-config -n 192.168.23.57 --file config/cp1.yaml +talosctl --talosconfig talosconfig apply-config -n 192.168.23.57 --file 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 diff --git a/talos-k8s/cilium/ippool.yaml b/talos-k8s/cilium/ippool.yaml index 07ed94d..f3ea7da 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.24/32 + - cidr: 192.168.23.22/32 diff --git a/talos-k8s/cilium/values.yaml b/talos-k8s/cilium/values.yaml index fefa525..35f829d 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.79 +k8sServiceHost: 192.168.23.21 k8sServicePort: 6443 l2announcements: enabled: true diff --git a/talos-k8s/schema.excalidraw.png b/talos-k8s/schema.excalidraw.png index b62dceb..9f170af 100644 Binary files a/talos-k8s/schema.excalidraw.png and b/talos-k8s/schema.excalidraw.png differ