Skip to content

Commit

Permalink
feat(containerd): auth support (#7868)
Browse files Browse the repository at this point in the history
* feat(containerd): auth support

* fix(registry-auth): rename variable
  • Loading branch information
faust64 authored and mmelyp committed Nov 15, 2021
1 parent 3422bbd commit 25c7afb
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 0 deletions.
5 changes: 5 additions & 0 deletions inventory/sample/group_vars/all/containerd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,8 @@
# "docker.io": "https://registry-1.docker.io"

# containerd_max_container_log_line_size: -1

# containerd_registry_auth:
# - registry: 10.0.0.2:5000
# username: user
# password: pass
6 changes: 6 additions & 0 deletions roles/container-engine/containerd/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,9 @@ containerd_fedora_repo_component: "stable"

# Extra config to be put in {{ containerd_cfg_dir }}/config.toml literally
containerd_extra_args: ''

# Configure registry auth (if applicable to secure/insecure registries)
containerd_registry_auth: []
# - registry: 10.0.0.2:5000
# username: user
# password: pass
11 changes: 11 additions & 0 deletions roles/container-engine/containerd/templates/config.toml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,17 @@ oom_score = {{ containerd_oom_score }}
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{ registry }}"]
endpoint = ["{{ ([ addr ] | flatten ) | join('","') }}"]
{% endfor %}
{% for registry in containerd_registry_auth if registry['registry'] is defined %}
{% if (registry['username'] is defined and registry['password'] is defined) or registry['auth'] is defined %}
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ registry['registry'] }}".auth]
{% if registry['username'] is defined and registry['password'] is defined %}
password = "{{ registry['password'] }}"
username = "{{ registry['username'] }}"
{% else %}
auth = "{{ registry['auth'] }}"
{% endif %}
{% endif %}
{% endfor %}

{% if containerd_extra_args is defined %}
{{ containerd_extra_args }}
Expand Down

0 comments on commit 25c7afb

Please sign in to comment.