From 8d4fd6f444e557f991b4c5c101c33ea91e51d4d3 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Fri, 19 May 2023 16:02:43 +0800 Subject: [PATCH] =?UTF-8?q?feature:TSG-12552:=E6=96=B0=E5=A2=9Ek3s?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=AF=81=E4=B9=A6=E8=BD=AE=E8=BD=AC=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/roles/k3s-install/files/multus-daemonset.yml | 1 + .../roles/k3s-install/files/service_set_RuntimeMaxSec.conf | 2 ++ ansible/roles/k3s-install/tasks/main.yml | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 ansible/roles/k3s-install/files/service_set_RuntimeMaxSec.conf diff --git a/ansible/roles/k3s-install/files/multus-daemonset.yml b/ansible/roles/k3s-install/files/multus-daemonset.yml index 1a4f116c..dc53f42d 100644 --- a/ansible/roles/k3s-install/files/multus-daemonset.yml +++ b/ansible/roles/k3s-install/files/multus-daemonset.yml @@ -184,6 +184,7 @@ spec: args: - "--multus-conf-file=auto" - "--cni-version=0.3.1" + - "--multus-kubeconfig-file-host=/etc/rancher/k3s/k3s.yaml" resources: requests: cpu: "100m" diff --git a/ansible/roles/k3s-install/files/service_set_RuntimeMaxSec.conf b/ansible/roles/k3s-install/files/service_set_RuntimeMaxSec.conf new file mode 100644 index 00000000..ab9d1c71 --- /dev/null +++ b/ansible/roles/k3s-install/files/service_set_RuntimeMaxSec.conf @@ -0,0 +1,2 @@ +[Service] +RuntimeMaxSec=300d diff --git a/ansible/roles/k3s-install/tasks/main.yml b/ansible/roles/k3s-install/tasks/main.yml index 055bdf18..cdc4ab24 100644 --- a/ansible/roles/k3s-install/tasks/main.yml +++ b/ansible/roles/k3s-install/tasks/main.yml @@ -65,3 +65,8 @@ copy: src: "{{ role_path }}/files/crontab_clean_orphaned_pods_dir" dest: /var/spool/cron/root + +- name: "copy override service file to dest" + copy: + src: "{{ role_path }}/files/service_set_RuntimeMaxSec.conf" + dest: /usr/lib/systemd/system/k3s.service.d/