From 8e4b1f0e3f6724a407280587fc42f4d70eb07ad8 Mon Sep 17 00:00:00 2001 From: Simon Ungar Felding Date: Thu, 10 Oct 2024 15:57:10 +0200 Subject: [PATCH] fix spelling error with backwards compatiblity --- README.md | 3 ++- defaults/main.yml | 3 ++- molecule/cluster/converge.yml | 2 +- molecule/default/converge.yml | 2 +- molecule/ha_cluster/converge.yml | 2 +- molecule/ha_cluster_kubevip/converge.yml | 2 +- templates/config.yaml.j2 | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c29fa0b..f8e4df4 100644 --- a/README.md +++ b/README.md @@ -244,7 +244,8 @@ rke2_etcd_snapshot_destination_dir: "{{ rke2_data_path }}/server/db/snapshots" # region: "" # optional - defaults to us-east-1 # folder: "" # optional - defaults to top level of bucket # Override default containerd snapshotter -rke2_snapshooter: overlayfs +rke2_snapshotter: "{{ rke2_snapshooter }}" +rke2_snapshooter: overlayfs # legacy variable that only exists to keep backward compatibility with previous configurations # Deploy RKE2 with default CNI canal rke2_cni: canal diff --git a/defaults/main.yml b/defaults/main.yml index bb19979..e4f7e7f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -206,7 +206,8 @@ rke2_etcd_snapshot_destination_dir: "{{ rke2_data_path }}/server/db/snapshots" # region: "" # optional - defaults to us-east-1 # folder: "" # optional - defaults to top level of bucket # Override default containerd snapshotter -rke2_snapshooter: overlayfs +rke2_snapshotter: "{{ rke2_snapshooter }}" +rke2_snapshooter: overlayfs # legacy variable that only exists to keep backward compatibility with previous configurations # Deploy RKE2 with default CNI canal rke2_cni: canal diff --git a/molecule/cluster/converge.yml b/molecule/cluster/converge.yml index 29a5eea..b1c2aa2 100644 --- a/molecule/cluster/converge.yml +++ b/molecule/cluster/converge.yml @@ -4,7 +4,7 @@ become: yes vars: rke2_version: v1.22.12+rke2r1 - rke2_snapshooter: native + rke2_snapshotter: native rke2_server_node_taints: - 'CriticalAddonsOnly=true:NoExecute' roles: diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index d82f895..0f52e44 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -4,6 +4,6 @@ become: yes vars: rke2_version: v1.27.1+rke2r1 - rke2_snapshooter: native + rke2_snapshotter: native roles: - role: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}" diff --git a/molecule/ha_cluster/converge.yml b/molecule/ha_cluster/converge.yml index 9714bef..75bcd93 100644 --- a/molecule/ha_cluster/converge.yml +++ b/molecule/ha_cluster/converge.yml @@ -6,7 +6,7 @@ rke2_version: v1.22.12+rke2r1 rke2_ha_mode: true rke2_api_ip: 192.168.123.100 - rke2_snapshooter: native + rke2_snapshotter: native rke2_server_node_taints: - 'CriticalAddonsOnly=true:NoExecute' roles: diff --git a/molecule/ha_cluster_kubevip/converge.yml b/molecule/ha_cluster_kubevip/converge.yml index 0170e9c..aee049b 100644 --- a/molecule/ha_cluster_kubevip/converge.yml +++ b/molecule/ha_cluster_kubevip/converge.yml @@ -8,7 +8,7 @@ rke2_api_ip: 192.168.123.100 rke2_version: v1.22.12+rke2r1 rke2_cis_profile: cis-1.23 - rke2_snapshooter: native + rke2_snapshotter: native rke2_ha_mode_keepalived: false rke2_ha_mode: true rke2_ha_mode_kubevip: true diff --git a/templates/config.yaml.j2 b/templates/config.yaml.j2 index a5e6289..86950d6 100644 --- a/templates/config.yaml.j2 +++ b/templates/config.yaml.j2 @@ -44,7 +44,7 @@ node-label: - {{ label }} {% endfor %} {% endif %} -snapshotter: {{ rke2_snapshooter }} +snapshotter: {{ rke2_snapshotter }} node-name: {{ rke2_node_name }} {% if ( disable_kube_proxy | bool ) %} disable-kube-proxy: true