From b464d76126b400f921b7fb53044c5dee72f64156 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 24 Apr 2020 15:57:10 +1000
Subject: nixos/cri-o: share registries with nixos/containers

---
 nixos/modules/virtualisation/cri-o.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'nixos/modules/virtualisation/cri-o.nix')

diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix
index a8ea611f624b..89ba9c3c6636 100644
--- a/nixos/modules/virtualisation/cri-o.nix
+++ b/nixos/modules/virtualisation/cri-o.nix
@@ -6,6 +6,10 @@ let
   cfg = config.virtualisation.cri-o;
 in
 {
+  imports = [
+    (mkRenamedOptionModule [ "virtualisation" "cri-o" "registries" ] [ "virtualisation" "containers" "registries" "search" ])
+  ];
+
   meta = {
     maintainers = lib.teams.podman.members;
   };
@@ -36,12 +40,6 @@ in
       default = "/pause";
       description = "Pause command to be executed";
     };
-
-    registries = mkOption {
-      type = types.listOf types.str;
-      default = [ "docker.io" "quay.io" ];
-      description = "Registries to be configured for unqualified image pull";
-    };
   };
 
   config = mkIf cfg.enable {
@@ -57,9 +55,6 @@ in
       [crio.image]
       pause_image = "${cfg.pauseImage}"
       pause_command = "${cfg.pauseCommand}"
-      registries = [
-        ${concatMapStringsSep ", " (x: "\"" + x + "\"") cfg.registries}
-      ]
 
       [crio.network]
       plugin_dirs = ["${pkgs.cni-plugins}/bin/"]
-- 
cgit 1.4.1