Merge pull request #12862 from matejvasek/fix-info-ep

Add IndexConfigs info to compat /info endpoint
This commit is contained in:
OpenShift Merge Robot
2022-01-19 09:29:05 -05:00
committed by GitHub
3 changed files with 49 additions and 11 deletions

View File

@ -42,16 +42,19 @@ class Podman(object):
os.environ["CONTAINERS_REGISTRIES_CONF"] = os.path.join(
self.anchor_directory, "registry.conf"
)
p = configparser.ConfigParser()
p.read_dict(
{
"registries.search": {"registries": "['quay.io', 'docker.io']"},
"registries.insecure": {"registries": "[]"},
"registries.block": {"registries": "[]"},
}
)
conf = """unqualified-search-registries = ["docker.io", "quay.io"]
[[registry]]
location="localhost:5000"
insecure=true
[[registry.mirror]]
location = "mirror.localhost:5000"
"""
with open(os.environ["CONTAINERS_REGISTRIES_CONF"], "w") as w:
p.write(w)
w.write(conf)
os.environ["CNI_CONFIG_PATH"] = os.path.join(
self.anchor_directory, "cni", "net.d"

View File

@ -54,7 +54,10 @@ class TestSystem(unittest.TestCase):
return super().tearDownClass()
def test_Info(self):
self.assertIsNotNone(self.client.info())
info = self.client.info()
self.assertIsNotNone(info)
self.assertEqual(info["RegistryConfig"]["IndexConfigs"]["localhost:5000"]["Secure"], False)
self.assertEqual(info["RegistryConfig"]["IndexConfigs"]["localhost:5000"]["Mirrors"], ["mirror.localhost:5000"])
def test_info_container_details(self):
info = self.client.info()