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

nerdctl insecure registry config #8339

Merged
merged 13 commits into from
Jan 5, 2022
Merged

nerdctl insecure registry config #8339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
90faa90
Update prep_download.yml
mircyb Dec 25, 2021
08c0f32
Update prep_download.yml
mircyb Dec 25, 2021
9d64df5
Update prep_download.yml
mircyb Jan 2, 2022
10b36f5
Update prep_download.yml
mircyb Jan 2, 2022
d9441ae
Update prep_download.yml
mircyb Jan 2, 2022
ec832d0
Update prep_download.yml
mircyb Jan 2, 2022
5843d5e
Update prep_download.yml
mircyb Jan 2, 2022
351d8a1
Update prep_download.yml
mircyb Jan 2, 2022
6de4b58
Update prep_download.yml
mircyb Jan 5, 2022
b61b1cf
Update main.yml
mircyb Jan 5, 2022
30392bb
Update main.yml
mircyb Jan 5, 2022
5f2fe77
Update prep_download.yml
mircyb Jan 5, 2022
121d091
Update prep_download.yml
mircyb Jan 5, 2022
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
3 changes: 3 additions & 0 deletions roles/download/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ download_delegate: "{% if download_localhost %}localhost{% else %}{{ groups['kub
# Arch of Docker images and needed packages
image_arch: "{{host_architecture | default('amd64')}}"

# Nerdctl insecure flag set
nerdctl_extra_flags: '{%- if containerd_insecure_registries is defined and containerd_insecure_registries|length>0 -%}\" --insecure-registry"{%- else -%}{%- endif -%}'

# Versions
kubeadm_version: "{{ kube_version }}"
etcd_version: v3.5.0
Expand Down
4 changes: 2 additions & 2 deletions roles/download/tasks/prep_download.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
- name: prep_download | Set image pull/info command for containerd
set_fact:
image_info_command: "{{ bin_dir }}/nerdctl -n k8s.io images --format '{% raw %}{{ '{{' }} .Repository {{ '}}' }}:{{ '{{' }} .Tag {{ '}}' }}{% endraw %}' 2>/dev/null | grep -v ^:$ | tr '\n' ','"
image_pull_command: "{{ bin_dir }}/nerdctl -n k8s.io pull --quiet"
image_pull_command: "{{ bin_dir }}/nerdctl -n k8s.io pull --quiet{{ nerdctl_extra_flags }}"
when: container_manager == 'containerd'

- name: prep_download | Set image pull/info command for crio
Expand All @@ -34,7 +34,7 @@
- name: prep_download | Set image pull/info command for containerd on localhost
set_fact:
image_info_command_on_localhost: "{{ bin_dir }}/nerdctl -n k8s.io images --format '{% raw %}{{ '{{' }} .Repository {{ '}}' }}:{{ '{{' }} .Tag {{ '}}' }}{% endraw %}' 2>/dev/null | grep -v ^:$ | tr '\n' ','"
image_pull_command_on_localhost: "{{ bin_dir }}/nerdctl -n k8s.io pull --quiet"
image_pull_command_on_localhost: "{{ bin_dir }}/nerdctl -n k8s.io pull --quiet{{ nerdctl_extra_flags }}"
when: container_manager_on_localhost == 'containerd'

- name: prep_download | Set image pull/info command for crio on localhost
Expand Down