From 211e92ec40e268833c89fd4cd9004ce62b00d604 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Fri, 14 Feb 2020 21:40:13 +0000 Subject: [PATCH] crio: add missing registries.conf This change fixes recent cri-o test failure because of a missing registries.conf file. Change-Id: Ieb2efa0e097cc76dc9b67389e86c2646dfc0c00d --- roles/install-kubernetes/tasks/crio.yaml | 12 ++++++++++++ .../registry/buildset-registry-k8s-crio.yaml | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/roles/install-kubernetes/tasks/crio.yaml b/roles/install-kubernetes/tasks/crio.yaml index 3a5482fb3..bede49e46 100644 --- a/roles/install-kubernetes/tasks/crio.yaml +++ b/roles/install-kubernetes/tasks/crio.yaml @@ -19,6 +19,18 @@ group: root state: link become: true +- name: Fix missing registries.conf + # See: https://github.com/containers/podman.io/issues/127 + copy: + content: | + [registries.search] + registries = [] + [registries.insecure] + registries = [] + [registries.block] + registries = [] + dest: /etc/containers/registries.conf + become: true - name: Set crio cgroup driver ini_file: path: /etc/crio/crio.conf diff --git a/test-playbooks/registry/buildset-registry-k8s-crio.yaml b/test-playbooks/registry/buildset-registry-k8s-crio.yaml index ca2db66a7..7bfabf644 100644 --- a/test-playbooks/registry/buildset-registry-k8s-crio.yaml +++ b/test-playbooks/registry/buildset-registry-k8s-crio.yaml @@ -24,7 +24,7 @@ shell: "kubectl logs pod/quaytest | grep 'Zuul container test'" - name: Run a remote test pod - command: kubectl run --generator=run-pod/v1 --image=debian:testing upstream-dockertest --command -- /bin/bash -c 'echo Upstream; sleep infinity' + command: kubectl run --generator=run-pod/v1 --image=docker.io/debian:testing upstream-dockertest --command -- /bin/bash -c 'echo Upstream; sleep infinity' - name: Wait for the pod to be ready command: kubectl wait --for=condition=Ready pod/upstream-dockertest --timeout=60s - name: Check the output of the pod