diff --git a/k8s/files/containerd-config.toml b/k8s/files/containerd-config.toml index 35d0670..3f137d5 100644 --- a/k8s/files/containerd-config.toml +++ b/k8s/files/containerd-config.toml @@ -12,9 +12,9 @@ version = 2 path = "/var/lib/containerd/opt" [plugins."io.containerd.grpc.v1.cri".registry] [plugins."io.containerd.grpc.v1.cri".registry.mirrors] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker-registry.lan"] - endpoint = ["http://docker-registry.lan"] + [plugins."io.containerd.grpc.v1.cri".registry.mirrors."cr.lan"] + endpoint = ["http://cr.lan"] [plugins."io.containerd.grpc.v1.cri".registry.configs] - [plugins."io.containerd.grpc.v1.cri".registry.configs."docker-registry.lan".tls] + [plugins."io.containerd.grpc.v1.cri".registry.configs."cr.lan".tls] insecure_skip_verify = true diff --git a/k8s/files/etc_containers_registries.conf b/k8s/files/etc_containers_registries.conf index 88c02f7..f190453 100644 --- a/k8s/files/etc_containers_registries.conf +++ b/k8s/files/etc_containers_registries.conf @@ -18,7 +18,7 @@ # of these registries, it should be added at the end of the list. # # # An array of host[:port] registries to try when pulling an unqualified image, in order. -# unqualified-search-registries = ["example.com"] +unqualified-search-registries = ["dr-mirror.lan"] # [[registry]] # # The "prefix" field is used to choose the relevant [[registry]] TOML table; @@ -26,7 +26,7 @@ # # (taking into account namespace/repo/tag/digest separators) is used. # # # # If the prefix field is missing, it defaults to be the same as the "location" field. - prefix = "docker-registry.lan" +# prefix = "cr.lan" # # # If true, unencrypted HTTP as well as TLS connections with untrusted # # certificates are allowed. @@ -45,7 +45,7 @@ insecure = true # # location = "internal-registry-for-example.net/bar" # # requests for the image example.com/foo/myimage:latest will actually work with the # # internal-registry-for-example.net/bar/myimage:latest image. -location = "docker-registry.lan" +location = "cr.lan" # # # (Possibly-partial) mirrors for the "prefix"-rooted namespace. @@ -69,3 +69,5 @@ location = "docker-registry.lan" # # 2. example-mirror-1.local/mirrors/foo/image:latest # # 3. internal-registry-for-example.net/bar/image:latest # # in order, and use the first one that exists. +[[registry.mirror]] +location = dr-mirror.lan diff --git a/k8s/files/etc_docker_daemon.json b/k8s/files/etc_docker_daemon.json index d39e5b1..d5cb977 100644 --- a/k8s/files/etc_docker_daemon.json +++ b/k8s/files/etc_docker_daemon.json @@ -2,9 +2,9 @@ "exec-opts": ["native.cgroupdriver=systemd"], "log-level": "warn", "storage-driver": "overlay2", - "registry-mirrors": ["https://docker-registry.lan"], + "registry-mirrors": ["https://cr.lan"], "insecure-registries" : [ - "docker-registry.lan" + "cr.lan" ] }