Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/v1.3] Remove holding containerd / docker #1590

Merged
merged 1 commit into from
Oct 26, 2021
Merged

[release/v1.3] Remove holding containerd / docker #1590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions pkg/scripts/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,7 @@ var (
sudo apt-get update
{{ end }}

{{- if or .FORCE .UPGRADE }}
sudo apt-mark unhold docker-ce docker-ce-cli containerd.io || true
{{- end }}

{{- $DOCKER_VERSION_TO_INSTALL := "%s" }}
{{- if semverCompare "< 1.17" .KUBERNETES_VERSION }}
{{ $DOCKER_VERSION_TO_INSTALL = "%s" }}
Expand Down Expand Up @@ -95,9 +92,7 @@ var (
),

"yum-docker-ce-amzn": heredoc.Docf(`
{{- if or .FORCE .UPGRADE }}
sudo yum versionlock delete docker cri-tools containerd
{{- end }}

{{- $CRICTL_VERSION_TO_INSTALL := "%s" }}
{{- $DOCKER_VERSION_TO_INSTALL := "%s" }}
Expand Down Expand Up @@ -137,9 +132,7 @@ var (
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true >/dev/null
{{- end }}

{{- if or .FORCE .UPGRADE }}
sudo yum versionlock delete docker-ce docker-ce-cli containerd.io
{{- end }}

{{- $DOCKER_VERSION_TO_INSTALL := "%s" }}
{{- if semverCompare "< 1.17" .KUBERNETES_VERSION }}
Expand Down Expand Up @@ -192,10 +185,7 @@ var (
sudo add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
{{ end }}

{{ if or .FORCE .UPGRADE }}
sudo apt-mark unhold containerd.io || true
{{ end }}

sudo apt-get install -y containerd.io=%s
sudo apt-mark hold containerd.io

Expand All @@ -215,10 +205,7 @@ var (
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
{{ end }}

{{ if or .FORCE .UPGRADE }}
sudo yum versionlock delete containerd.io
{{- end }}

sudo yum install -y containerd.io-%s
sudo yum versionlock add containerd.io

Expand All @@ -228,10 +215,7 @@ var (
),

"yum-containerd-amzn": heredoc.Docf(`
{{- if or .FORCE .UPGRADE }}
sudo yum versionlock delete containerd cri-tools
{{- end }}

sudo yum install -y containerd-%s cri-tools-%s
sudo yum versionlock add containerd cri-tools

Expand Down
1 change: 0 additions & 1 deletion pkg/scripts/testdata/TestKubeadmAmazonLinux-force.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
}
EOF


sudo yum versionlock delete docker cri-tools containerd

sudo yum install -y \
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
}
EOF


sudo yum versionlock delete docker cri-tools containerd

sudo yum install -y \
docker-19.03.* \
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry_insecure.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
}
EOF


sudo yum versionlock delete docker cri-tools containerd

sudo yum install -y \
docker-19.03.* \
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmAmazonLinux-proxy.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
}
EOF


sudo yum versionlock delete docker cri-tools containerd

sudo yum install -y \
docker-19.03.* \
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmAmazonLinux-simple.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
}
EOF


sudo yum versionlock delete docker cri-tools containerd

sudo yum install -y \
docker-19.03.* \
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmAmazonLinux-v1.16.1.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
}
EOF


sudo yum versionlock delete docker cri-tools containerd


sudo yum install -y \
Expand Down
3 changes: 1 addition & 2 deletions pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ sudo yum install -y \





sudo yum versionlock delete containerd cri-tools
sudo yum install -y containerd-1.4.* cri-tools-1.13.0
sudo yum versionlock add containerd cri-tools

Expand Down
3 changes: 1 addition & 2 deletions pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd_with_insecure_registry.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ sudo yum install -y \





sudo yum versionlock delete containerd cri-tools
sudo yum install -y containerd-1.4.* cri-tools-1.13.0
sudo yum versionlock add containerd cri-tools

Expand Down
1 change: 1 addition & 0 deletions pkg/scripts/testdata/TestKubeadmCentOS-force.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ EOF
sudo yum install -y yum-utils
sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true >/dev/null

sudo yum versionlock delete docker-ce docker-ce-cli containerd.io

sudo yum install -y \
Expand Down
2 changes: 2 additions & 0 deletions pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ sudo yum install -y yum-utils
sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true >/dev/null

sudo yum versionlock delete docker-ce docker-ce-cli containerd.io

sudo yum install -y \
docker-ce-19.03.* \
docker-ce-cli-19.03.* \
Expand Down
2 changes: 2 additions & 0 deletions pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry_insecure.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ sudo yum install -y yum-utils
sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true >/dev/null

sudo yum versionlock delete docker-ce docker-ce-cli containerd.io

sudo yum install -y \
docker-ce-19.03.* \
docker-ce-cli-19.03.* \
Expand Down
2 changes: 2 additions & 0 deletions pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ sudo yum install -y yum-utils
sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true >/dev/null

sudo yum versionlock delete docker-ce docker-ce-cli containerd.io

sudo yum install -y \
docker-ce-19.03.* \
docker-ce-cli-19.03.* \
Expand Down
2 changes: 2 additions & 0 deletions pkg/scripts/testdata/TestKubeadmCentOS-simple.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ sudo yum install -y yum-utils
sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true >/dev/null

sudo yum versionlock delete docker-ce docker-ce-cli containerd.io

sudo yum install -y \
docker-ce-19.03.* \
docker-ce-cli-19.03.* \
Expand Down
2 changes: 2 additions & 0 deletions pkg/scripts/testdata/TestKubeadmCentOS-v1.16.1.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ EOF
sudo yum install -y yum-utils
sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true >/dev/null

sudo yum versionlock delete docker-ce docker-ce-cli containerd.io
# Docker provides two different apt repos for CentOS, 7 and 8. The 8 repo currently
# contains only Docker 19.03.14, which is not validated for all Kubernetes version.
# Therefore, we use 7 repo which has all Docker versions.
Expand Down
3 changes: 1 addition & 2 deletions pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/dock
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true




sudo yum versionlock delete containerd.io
sudo yum install -y containerd.io-1.4.*
sudo yum versionlock add containerd.io

Expand Down
3 changes: 1 addition & 2 deletions pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/dock
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true




sudo yum versionlock delete containerd.io
sudo yum install -y containerd.io-1.4.*
sudo yum versionlock add containerd.io

Expand Down
2 changes: 2 additions & 0 deletions pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ echo "deb https://download.docker.com/linux/ubuntu bionic stable" |
sudo apt-get update


sudo apt-mark unhold docker-ce docker-ce-cli containerd.io || true

sudo DEBIAN_FRONTEND=noninteractive apt-get install \
--option "Dpkg::Options::=--force-confold" \
--no-install-recommends \
Expand Down
2 changes: 2 additions & 0 deletions pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry_insecure.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ echo "deb https://download.docker.com/linux/ubuntu bionic stable" |
sudo apt-get update


sudo apt-mark unhold docker-ce docker-ce-cli containerd.io || true

sudo DEBIAN_FRONTEND=noninteractive apt-get install \
--option "Dpkg::Options::=--force-confold" \
--no-install-recommends \
Expand Down
2 changes: 2 additions & 0 deletions pkg/scripts/testdata/TestKubeadmDebian-simple.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ echo "deb https://download.docker.com/linux/ubuntu bionic stable" |
sudo apt-get update


sudo apt-mark unhold docker-ce docker-ce-cli containerd.io || true

sudo DEBIAN_FRONTEND=noninteractive apt-get install \
--option "Dpkg::Options::=--force-confold" \
--no-install-recommends \
Expand Down
3 changes: 1 addition & 2 deletions pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ curl -fsSL https://download.docker.com/linux/ubuntu/gpg |
sudo add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"




sudo apt-mark unhold containerd.io || true
sudo apt-get install -y containerd.io=1.4.*
sudo apt-mark hold containerd.io

Expand Down
3 changes: 1 addition & 2 deletions pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ curl -fsSL https://download.docker.com/linux/ubuntu/gpg |
sudo add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"




sudo apt-mark unhold containerd.io || true
sudo apt-get install -y containerd.io=1.4.*
sudo apt-mark hold containerd.io

Expand Down
1 change: 0 additions & 1 deletion pkg/scripts/testdata/TestUpgradeKubeadmAndCNIAmazonLinux.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
}
EOF


sudo yum versionlock delete docker cri-tools containerd

sudo yum install -y \
Expand Down
1 change: 1 addition & 0 deletions pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ EOF
sudo yum install -y yum-utils
sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true >/dev/null

sudo yum versionlock delete docker-ce docker-ce-cli containerd.io

sudo yum install -y \
Expand Down
1 change: 1 addition & 0 deletions pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ echo "deb https://download.docker.com/linux/ubuntu bionic stable" |
sudo tee /etc/apt/sources.list.d/docker.list
sudo apt-get update


sudo apt-mark unhold docker-ce docker-ce-cli containerd.io || true

sudo DEBIAN_FRONTEND=noninteractive apt-get install \
Expand Down
1 change: 0 additions & 1 deletion pkg/scripts/testdata/TestUpgradeKubeletAndKubectlAmazonLinux.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
}
EOF


sudo yum versionlock delete docker cri-tools containerd

sudo yum install -y \
Expand Down
1 change: 1 addition & 0 deletions pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ EOF
sudo yum install -y yum-utils
sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true >/dev/null

sudo yum versionlock delete docker-ce docker-ce-cli containerd.io

sudo yum install -y \
Expand Down
1 change: 1 addition & 0 deletions pkg/scripts/testdata/TestUpgradeKubeletAndKubectlDebian.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ echo "deb https://download.docker.com/linux/ubuntu bionic stable" |
sudo tee /etc/apt/sources.list.d/docker.list
sudo apt-get update


sudo apt-mark unhold docker-ce docker-ce-cli containerd.io || true

sudo DEBIAN_FRONTEND=noninteractive apt-get install \
Expand Down