From 980eae4a86cbc2f414e06e6e8d8d0a13a10fbbad Mon Sep 17 00:00:00 2001
From: Shuicheng Lin <shuicheng.lin@intel.com>
Date: Mon, 17 Feb 2020 10:59:24 +0800
Subject: [PATCH] Remove docker registry default setting in containerd config
file
Docker registry is configured as secure registry in default in
config.toml. User may config docker registry as insecure registry
in localhost.yml, and lead to configuration conflict. Remove the
default setting in config.toml to solve it.
Closes-Bug: 1863144
Change-Id: I4b3b3e1095f10a9ce2e92a3c84330dab1af3f895
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
puppet-manifests/src/modules/platform/templates/config.toml.erb | 2 --
1 file changed, 2 deletions(-)
diff --git a/puppet-manifests/src/modules/platform/templates/config.toml.erb b/puppet-manifests/src/modules/platform/templates/config.toml.erb
index da9f15516..3f63dffb6 100644
--- a/puppet-manifests/src/modules/platform/templates/config.toml.erb
+++ b/puppet-manifests/src/modules/platform/templates/config.toml.erb
@@ -78,8 +78,6 @@ oom_score = 0
conf_template = ""
[plugins.cri.registry]
[plugins.cri.registry.mirrors]
- [plugins.cri.registry.mirrors."docker.io"]
- endpoint = ["https://registry-1.docker.io"]
# Begin of insecure registries
<%- @insecure_registries.each do |insecure_registry| -%>
[plugins.cri.registry.mirrors."<%= insecure_registry %>"]