Skip to content

Commit

Permalink
fix containerd config toml
Browse files Browse the repository at this point in the history
  • Loading branch information
1eedaegon committed Jan 19, 2023
1 parent a98ab40 commit 77a9423
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
4 changes: 4 additions & 0 deletions pipeline.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,7 @@ RUN wget https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAG
dpkg -i vagrant_${VAGRANT_VERSION}_x86_64.deb && \
rm vagrant_${VAGRANT_VERSION}_x86_64.deb && \
vagrant plugin install vagrant-libvirt

# Install Kubernetes collections
RUN pip3 install kubernetes \
&& ansible-galaxy collection install kubernetes.core
4 changes: 2 additions & 2 deletions roles/container-engine/containerd/templates/config.toml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ oom_score = {{ containerd_oom_score }}
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{ registry }}"]
endpoint = ["{{ ([ addr ] | flatten ) | join('","') }}"]
{% endfor %}
{% for addr in containerd_insecure_registries.values() | flatten | unique %}
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ addr }}".tls]
{% for registry in containerd_insecure_registries.keys() %}
[plugins."io.containerd.grpc.v1.cri".registry.configs."{{ registry }}".tls]
insecure_skip_verify = true
{% endfor %}
{% endif %}
Expand Down
15 changes: 7 additions & 8 deletions tests/cloud_playbooks/roles/packet-ci/tasks/create-vms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,19 @@
mode: 0755

- name: Template vm files for CI job
template:
src: "vm.yml.j2"
dest: "/tmp/{{ test_name }}/instance-{{ vm_id }}.yml"
mode: 0644
set_fact:
vms_files: "{{ vms_files }} + [{{ lookup('ansible.builtin.template', 'vm.yml.j2') | from_yaml }}]"
vars:
vms_files: []
loop: "{{ range(1, vm_count|int + 1, 1) | list }}"
loop_control:
index_var: vm_id

- name: Start vms for CI job
command: "kubectl apply -f /tmp/{{ test_name }}/instance-{{ vm_id }}.yml"
kubernetes.core.k8s:
definition: "{{ item }}"
changed_when: false
loop: "{{ range(1, vm_count|int + 1, 1) | list }}"
loop_control:
index_var: vm_id
loop: "{{ vms_files }}"

- name: Wait for vms to have ipaddress assigned
shell: "set -o pipefail && kubectl get vmis -n {{ test_name }} instance-{{ vm_id }} -o json | jq '.status.interfaces[].ipAddress' | tr -d '\"'"
Expand Down

0 comments on commit 77a9423

Please sign in to comment.