Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support k3s private registry configuration #114

Merged
merged 4 commits into from
May 13, 2021
Merged

Support k3s private registry configuration #114

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21fa8b0
build(gitignore): modify .gitignore
anjia0532 May 7, 2021
c9e2b61
feat(k3s): support k3s's private-registry configuration
anjia0532 May 7, 2021
075ef16
fix(k3s): fix k3s's private-registry configuration not exist
anjia0532 May 7, 2021
d563dcc
style(k3s): change code style
anjia0532 May 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(k3s): fix k3s's private-registry configuration not exist 
fix k3s's private-registry configuration not exist
  • Loading branch information
@anjia0532
anjia0532 committed May 7, 2021
commit 075ef165c5dbc0b88d054229d4bc764e06fc6c7f
17 changes: 8 additions & 9 deletions tasks/state-installed.yml
View file
Open in desktop
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
anjia0532 marked this conversation as resolved.
Show resolved Hide resolved
- (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