Browse Source

feat(containerd): auth support (#7868)

* feat(containerd): auth support

* fix(registry-auth): rename variable
pull/7901/head
Samuel 3 years ago
committed by GitHub
parent
commit
a040e521b4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 0 deletions
  1. 5
      inventory/sample/group_vars/all/containerd.yml
  2. 6
      roles/container-engine/containerd/defaults/main.yml
  3. 11
      roles/container-engine/containerd/templates/config.toml.j2

5
inventory/sample/group_vars/all/containerd.yml

@ -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
roles/container-engine/containerd/defaults/main.yml

@ -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
roles/container-engine/containerd/templates/config.toml.j2

@ -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 }}

Loading…
Cancel
Save