From 77d1bafabc76cde44d41ded9a281849c166cbe81 Mon Sep 17 00:00:00 2001 From: royalcat <k.adamovich20@gmail.com> Date: Mon, 24 Mar 2025 03:55:07 +0400 Subject: [PATCH] ansible update --- .ansible/inventory.yaml | 23 +++++++++++-------- .../k3s-configs-templates/kubeconfig.yaml | 1 + .ansible/k3s-configs-templates/vpn-auth.yaml | 1 + 3 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 .ansible/k3s-configs-templates/kubeconfig.yaml create mode 100644 .ansible/k3s-configs-templates/vpn-auth.yaml diff --git a/.ansible/inventory.yaml b/.ansible/inventory.yaml index 89cda51..e898d7b 100644 --- a/.ansible/inventory.yaml +++ b/.ansible/inventory.yaml @@ -5,19 +5,26 @@ k3s_cluster: ansible_host: 130.61.173.37 k3s_control_node: true k3s_server: - # write-kubeconfig-mode: 777 - write-kubeconfig-mode: 777 - vpn-auth: "name=tailscale,controlServerURL=https://headscale.kmsign.ru,joinKey=544cd542cee22ea076d01c2d87b9cc606525b31fe966b168,extraArgs=--advertise-tags=tag:cloud-cluster" advertise-address: "130.61.173.37" node-external-ip: "130.61.173.37" tls-san: - "130.61.173.37" + k3s_server_config_yaml_d_files: + - ./k3s-configs-templates/kubeconfig.yaml + - ./k3s-configs-templates/vpn-auth.yaml - murino-worker-1: + # murino-worker-1: + # ansible_user: root + # ansible_host: 192.168.220.17 + # k3s_state: uninstalled + # k3s_agent: + # vpn-auth: "name=tailscale,controlServerURL=https://headscale.kmsign.ru,joinKey=68f87d4350aa0059d7edf9a027c7b0b3a15a027bc1651fbd,extraArgs=--advertise-tags=tag:cloud-cluster" + + murino-worker-2: ansible_user: root - ansible_host: 192.168.220.17 - k3s_agent: - vpn-auth: "name=tailscale,controlServerURL=https://headscale.kmsign.ru,joinKey=544cd542cee22ea076d01c2d87b9cc606525b31fe966b168,extraArgs=--advertise-tags=tag:cloud-cluster" + ansible_host: 192.168.220.18 + k3s_agent_config_yaml_d_files: + - ./k3s-configs-templates/vpn-auth.yaml # kube-2: # ansible_host: 152.70.184.40 @@ -27,5 +34,3 @@ k3s_cluster: ansible_port: 22 ansible_user: ubuntu ansible_python_interpreter: /usr/bin/python3 - k3s_server: - write-kubeconfig-mode: 777 diff --git a/.ansible/k3s-configs-templates/kubeconfig.yaml b/.ansible/k3s-configs-templates/kubeconfig.yaml new file mode 100644 index 0000000..1447c2b --- /dev/null +++ b/.ansible/k3s-configs-templates/kubeconfig.yaml @@ -0,0 +1 @@ +write-kubeconfig-mode: 777 diff --git a/.ansible/k3s-configs-templates/vpn-auth.yaml b/.ansible/k3s-configs-templates/vpn-auth.yaml new file mode 100644 index 0000000..2d6033a --- /dev/null +++ b/.ansible/k3s-configs-templates/vpn-auth.yaml @@ -0,0 +1 @@ +vpn-auth: "name=tailscale,controlServerURL=https://headscale.kmsign.ru,joinKey=68f87d4350aa0059d7edf9a027c7b0b3a15a027bc1651fbd,extraArgs=--advertise-tags=tag:cloud-cluster"