Skip to content

Commit

Permalink
fix(k3s): fix k3s's private-registry configuration not exist
Browse files Browse the repository at this point in the history
fix k3s's private-registry configuration not exist
  • Loading branch information
anjia0532 committed May 7, 2021
1 parent c9e2b61 commit 075ef16
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions tasks/state-installed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down

0 comments on commit 075ef16

Please sign in to comment.