From 075ef165c5dbc0b88d054229d4bc764e06fc6c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=89=E5=AE=B6?= Date: Fri, 7 May 2021 18:29:01 +0800 Subject: [PATCH] fix(k3s): fix k3s's private-registry configuration not exist fix k3s's private-registry configuration not exist --- tasks/state-installed.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tasks/state-installed.yml b/tasks/state-installed.yml index 0538715..81595f5 100644 --- a/tasks/state-installed.yml +++ b/tasks/state-installed.yml @@ -29,15 +29,6 @@ - ('docker' in k3s_runtime_config and k3s_runtime_config.docker) - ('rootless' not in k3s_runtime_config or not k3s_runtime_config.rootless) - -- name: Ensure containerd installation tasks are run - block: - - include_tasks: build/containerd/registries.yml - when: - - k3s_registries is defined - - (k3s_runtime_config.docker is not defined or not k3s_runtime_config.docker) - - ('rootless' not in k3s_runtime_config or not k3s_runtime_config.rootless) - - name: Flush Handlers meta: flush_handlers @@ -50,6 +41,14 @@ - import_tasks: build/install-k3s.yml +- name: Ensure containerd installation tasks are run + block: + - include_tasks: build/containerd/registries.yml + when: + - k3s_registries is defined + - (k3s_runtime_config.docker is not defined or not k3s_runtime_config.docker) + - ('rootless' not in k3s_runtime_config or not k3s_runtime_config.rootless) + - include_tasks: validate/configuration/cluster-init.yml when: - k3s_control_delegate is defined