From 97dbed36a8aaee40069ecb3e08300e51e5b85c91 Mon Sep 17 00:00:00 2001 From: Martin Lefler Date: Wed, 31 Aug 2022 13:37:10 +0200 Subject: [PATCH 1/4] fix for node labels not propagating --- roles/rke2_common/tasks/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/rke2_common/tasks/config.yml b/roles/rke2_common/tasks/config.yml index 9ebdd639..a939f7cb 100644 --- a/roles/rke2_common/tasks/config.yml +++ b/roles/rke2_common/tasks/config.yml @@ -60,6 +60,11 @@ register: updated_rke2_config changed_when: false +- name: Update rke2_config to take value of updated_rke2_config + set_fact: + rke2_config: "{{ updated_rke2_config.rke2_config }}" + changed_when: false + # --node-taint value (agent/node) Registering kubelet with set of taints - name: get rke2_config node-taints set_fact: From 138585c4e3c83f9cd549d8dea487462a7e44e01d Mon Sep 17 00:00:00 2001 From: Martin Lefler Date: Wed, 31 Aug 2022 13:38:51 +0200 Subject: [PATCH 2/4] fix agent config losing url/token on update --- roles/rke2_common/tasks/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/rke2_common/tasks/config.yml b/roles/rke2_common/tasks/config.yml index a939f7cb..05d05bf3 100644 --- a/roles/rke2_common/tasks/config.yml +++ b/roles/rke2_common/tasks/config.yml @@ -248,7 +248,8 @@ - name: Drop in final /etc/rancher/rke2/config.yaml copy: - content: "{{ rke2_config | to_nice_yaml(indent=0) }}" + src: /tmp/ansible-config.txt + remote_src: yes dest: /etc/rancher/rke2/config.yaml mode: "0640" owner: root From 34e7718f21a54d205c569ab6d4b1bf7cfc801c4e Mon Sep 17 00:00:00 2001 From: Martin Lefler Date: Wed, 31 Aug 2022 13:44:55 +0200 Subject: [PATCH 3/4] do not add token/server url to config if it's empty --- roles/rke2_common/tasks/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/rke2_common/tasks/config.yml b/roles/rke2_common/tasks/config.yml index 05d05bf3..eb71f22e 100644 --- a/roles/rke2_common/tasks/config.yml +++ b/roles/rke2_common/tasks/config.yml @@ -215,7 +215,7 @@ line: "{{ original_token }}" state: present insertbefore: BOF - when: previous_rke2_config.stat.exists + when: previous_rke2_config.stat.exists and original_token | length > 0 changed_when: false - name: Get original server @@ -230,7 +230,7 @@ line: "{{ original_server }}" state: present insertbefore: BOF - when: previous_rke2_config.stat.exists + when: previous_rke2_config.stat.exists and original_server | length > 0 changed_when: false - name: Stat tmp config From e4c1eb22305eb3b8e313f1bfaf24c584667cb0cc Mon Sep 17 00:00:00 2001 From: Martin Lefler Date: Tue, 11 Oct 2022 14:17:17 +0200 Subject: [PATCH 4/4] fix: config not generated when adding new server --- roles/rke2_common/tasks/config.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/roles/rke2_common/tasks/config.yml b/roles/rke2_common/tasks/config.yml index eb71f22e..752e333b 100644 --- a/roles/rke2_common/tasks/config.yml +++ b/roles/rke2_common/tasks/config.yml @@ -1,5 +1,4 @@ --- - - name: Does the /etc/rancher/rke2 dir exist? stat: path: /etc/rancher/rke2 @@ -102,7 +101,7 @@ register: updated_rke2_config changed_when: false -- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler +- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler set_fact: rke2_config: "{{ updated_rke2_config.rke2_config }}" when: updated_rke2_config.changed @@ -118,7 +117,7 @@ register: updated_rke2_config changed_when: false -- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler +- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler set_fact: rke2_config: "{{ updated_rke2_config.rke2_config }}" when: updated_rke2_config.changed @@ -134,7 +133,7 @@ register: updated_rke2_config changed_when: false -- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler +- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler set_fact: rke2_config: "{{ updated_rke2_config.rke2_config }}" when: updated_rke2_config.changed @@ -151,7 +150,7 @@ register: updated_rke2_config changed_when: false -- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler +- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler set_fact: rke2_config: "{{ updated_rke2_config.rke2_config }}" when: updated_rke2_config.changed @@ -167,7 +166,7 @@ register: updated_rke2_config changed_when: false -- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler +- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler set_fact: rke2_config: "{{ updated_rke2_config.rke2_config }}" when: updated_rke2_config.changed @@ -182,7 +181,7 @@ when: (cloud_provider_name is defined) and (cloud_provider_name|length > 0) register: updated_rke2_config -- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler +- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler set_fact: rke2_config: "{{ updated_rke2_config.rke2_config }}" when: updated_rke2_config.changed @@ -200,7 +199,6 @@ mode: "0600" owner: root group: root - when: previous_rke2_config.stat.exists changed_when: false - name: Get original token @@ -237,13 +235,11 @@ stat: path: /tmp/ansible-config.txt register: tmp_config - when: previous_rke2_config.stat.exists changed_when: false - name: Get cksum of tmp config set_fact: tmp_sha1: "{{ tmp_config.stat.checksum }}" - when: previous_rke2_config.stat.exists changed_when: false - name: Drop in final /etc/rancher/rke2/config.yaml