Skip to content

Commit d140769

Browse files
authored
Merge pull request kubernetes#92344 from jherrera123/restore-docker-focal-version
Restore docker focal version in gci nodes
2 parents 656a01f + 9714f3a commit d140769

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

cluster/gce/gci/configure.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -432,12 +432,7 @@ function install-docker {
432432
software-properties-common \
433433
lsb-release
434434

435-
# focal repo for docker is not yet available, so we use bonic for now
436-
# https://github.com/kubernetes/kubernetes/issues/90709
437435
release=$(lsb_release -cs)
438-
if [ "$release" == "focal" ]; then
439-
release="bionic";
440-
fi
441436

442437
# Add the Docker apt-repository
443438
curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg \
@@ -478,12 +473,7 @@ function install-containerd-ubuntu {
478473
software-properties-common \
479474
lsb-release
480475

481-
# focal repo for docker is not yet available, so we use bonic for now
482-
# https://github.com/kubernetes/kubernetes/issues/90709
483476
release=$(lsb_release -cs)
484-
if [ "$release" == "focal" ]; then
485-
release="bionic";
486-
fi
487477

488478
# Add the Docker apt-repository (as we install containerd from there)
489479
curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg \

0 commit comments

Comments
 (0)