github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update gce configure.sh to use registry config_path

Browse Source 
Signed-off-by: Aditi Sharma <adi.sky17@gmail.com>
This commit is contained in:
Aditi Sharma 2024-02-07 10:56:47 +05:30
parent 2f807b606a
commit d9b95ab686
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/gce/configure.sh
View File

@ -190,6 +190,7 @@ rm -f "${CONTAINERD_HOME}/etc/crictl.yaml"
# Generate containerd config # Generate containerd config
config_path="${CONTAINERD_CONFIG_PATH:-"/etc/containerd/config.toml"}" config_path="${CONTAINERD_CONFIG_PATH:-"/etc/containerd/config.toml"}"
registry_config_path="${CONTAINERD_REGISTRY_CONFIG_PATH:-"/etc/containerd/certs.d"}"
mkdir -p $(dirname ${config_path}) mkdir -p $(dirname ${config_path})
cni_bin_dir="${CONTAINERD_HOME}/opt/cni/bin" cni_bin_dir="${CONTAINERD_HOME}/opt/cni/bin"
cni_template_path="${CONTAINERD_HOME}/opt/containerd/cluster/gce/cni.template" cni_template_path="${CONTAINERD_HOME}/opt/containerd/cluster/gce/cni.template"
@ -223,8 +224,8 @@ disabled_plugins = ["io.containerd.internal.v1.restart"]
bin_dir = "${cni_bin_dir}" bin_dir = "${cni_bin_dir}"
conf_dir = "/etc/cni/net.d" conf_dir = "/etc/cni/net.d"
conf_template = "${cni_template_path}" conf_template = "${cni_template_path}"
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] [plugins."io.containerd.grpc.v1.cri".registry]
endpoint = ["https://mirror.gcr.io","https://registry-1.docker.io"] config_path = "${registry_config_path}"
[plugins."io.containerd.grpc.v1.cri".containerd] [plugins."io.containerd.grpc.v1.cri".containerd]
default_runtime_name = "${CONTAINERD_DEFAULT_RUNTIME:-"runc"}" default_runtime_name = "${CONTAINERD_DEFAULT_RUNTIME:-"runc"}"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
@ -235,6 +236,17 @@ disabled_plugins = ["io.containerd.internal.v1.restart"]
EOF EOF
chmod 644 "${config_path}" chmod 644 "${config_path}"
docker_registry_host_namespace="${registry_config_path}/docker.io/hosts.toml"
mkdir -p $(dirname ${docker_registry_host_namespace})
cat > ${docker_registry_host_namespace} <<EOF
server = "https://registry-1.docker.io"
[host."https://mirror.gcr.io"]
capabilities = ["pull", "resolve"]
EOF
chmod 644 "${docker_registry_host_namespace}"
# containerd_extra_runtime_handler is the extra runtime handler to install. # containerd_extra_runtime_handler is the extra runtime handler to install.
containerd_extra_runtime_handler=${CONTAINERD_EXTRA_RUNTIME_HANDLER:-""} containerd_extra_runtime_handler=${CONTAINERD_EXTRA_RUNTIME_HANDLER:-""}
if [[ -n "${containerd_extra_runtime_handler}" ]]; then if [[ -n "${containerd_extra_runtime_handler}" ]]; then