github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108054 from bobbypage/issue_107830

Browse Source 
cluster/ - Configure containerd only if necessary
This commit is contained in:
Kubernetes Prow Robot 2022-02-11 06:07:05 -08:00 committed by GitHub
commit 8472892a9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/gce/gci/configure-helper.sh
View File

@ -3442,7 +3442,12 @@ function main() {
# stop docker if it is present as we want to use just containerd
log-wrap 'StopDocker' systemctl stop docker || echo "unable to stop docker"
fi
log-wrap 'SetupContainerd' setup-containerd
if [[ ! -e "/etc/profile.d/containerd_env.sh" ]]; then
log-wrap 'SetupContainerd' setup-containerd
else
echo "Skipping SetupContainerd step because containerd has already been setup by containerd's configure.sh script"
fi
log-start 'SetupKubePodLogReadersGroupDir'
if [[ -n "${KUBE_POD_LOG_READERS_GROUP:-}" ]]; then