diff --git a/molecule/autodeploy/converge.yml b/molecule/autodeploy/converge.yml index c52511c..e474928 100644 --- a/molecule/autodeploy/converge.yml +++ b/molecule/autodeploy/converge.yml @@ -24,6 +24,5 @@ filename: 05-metallb-namespace.yml k3s_service_env_vars: K3S_TEST_VAR: "Hello world!" - k3s_skip_post_checks: true roles: - role: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}" diff --git a/molecule/debug/converge.yml b/molecule/debug/converge.yml index 48eec86..a1ecea3 100644 --- a/molecule/debug/converge.yml +++ b/molecule/debug/converge.yml @@ -3,10 +3,9 @@ hosts: all become: true vars: - k3s_skip_post_checks: true pyratlabs_issue_controller_dump: true - k3s_agent: - snapshotter: native + # k3s_agent: + # snapshotter: native pre_tasks: - name: Ensure k3s_debug is set ansible.builtin.set_fact: diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 4a3d138..7e64a4f 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -7,7 +7,6 @@ vars: molecule_is_test: true k3s_install_hard_links: true - k3s_skip_post_checks: true k3s_release_version: stable - k3s_agent: - snapshotter: native + # k3s_agent: + # snapshotter: native diff --git a/molecule/highavailabilitydb/converge.yml b/molecule/highavailabilitydb/converge.yml index 20946c5..e559028 100644 --- a/molecule/highavailabilitydb/converge.yml +++ b/molecule/highavailabilitydb/converge.yml @@ -9,10 +9,9 @@ k3s_control_token: 55ba04e5-e17d-4535-9170-3e4245453f4d k3s_server: datastore-endpoint: "postgres://postgres:verybadpass@database:5432/postgres?sslmode=disable" - k3s_agent: - snapshotter: native + # k3s_agent: + # snapshotter: native k3s_service_env_file: /tmp/k3s.env - k3s_skip_post_checks: true pre_tasks: - name: Set each node to be a control node ansible.builtin.set_fact: diff --git a/molecule/highavailabilityetcd/converge.yml b/molecule/highavailabilityetcd/converge.yml index c2d7ede..c434f13 100644 --- a/molecule/highavailabilityetcd/converge.yml +++ b/molecule/highavailabilityetcd/converge.yml @@ -11,9 +11,9 @@ secrets-encryption: true k3s_agent: node-ip: "{{ ansible_default_ipv4.address }}" - snapshotter: native + # snapshotter: native k3s_skip_validation: "{{ k3s_service_handler[ansible_service_mgr] == 'service' }}" - k3s_skip_post_checks: true + k3s_skip_post_checks: "{{ ansible_os_family | lower == 'redhat' }}" pre_tasks: - name: Set each node to be a control node ansible.builtin.set_fact: diff --git a/molecule/nodeploy/converge.yml b/molecule/nodeploy/converge.yml index 0d78fba..d016b35 100644 --- a/molecule/nodeploy/converge.yml +++ b/molecule/nodeploy/converge.yml @@ -8,6 +8,5 @@ k3s_agent: "{{ lookup('file', 'k3s_agent.yml') | from_yaml }}" k3s_airgap: true k3s_release_version: latest - k3s_skip_post_checks: true roles: - role: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}" diff --git a/molecule/nodeploy/k3s_agent.yml b/molecule/nodeploy/k3s_agent.yml index 4ffc1ec..cf1e355 100644 --- a/molecule/nodeploy/k3s_agent.yml +++ b/molecule/nodeploy/k3s_agent.yml @@ -6,4 +6,4 @@ node-label: kubelet-arg: - "cloud-provider=external" - "provider-id=azure" -snapshotter: native +# snapshotter: native