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

Fix wrong legacy docker version on RPM systems #1191

Merged
merged 1 commit into from
Dec 14, 2020
Merged

Fix wrong legacy docker version on RPM systems #1191

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
2 changes: 1 addition & 1 deletion pkg/scripts/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ var (
sudo systemctl daemon-reload
sudo systemctl enable --now docker
`,
defaultLegacyDockerVersion,
defaultDockerVersion,
defaultLegacyDockerVersion,
),

"containerd-github": heredoc.Docf(`
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmCentOS-force.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ sudo yum versionlock delete docker-ce docker-ce-cli || true



sudo yum install -y docker-ce-18.09.9* docker-ce-cli-18.09.9*
sudo yum install -y docker-ce-19.03.14* docker-ce-cli-19.03.14*
sudo yum versionlock add docker-ce docker-ce-cli
sudo systemctl daemon-reload
sudo systemctl enable --now docker
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ sudo sed -i 's/\$releasever/7/g' /etc/yum.repos.d/docker-ce.repo



sudo yum install -y docker-ce-18.09.9* docker-ce-cli-18.09.9*
sudo yum install -y docker-ce-19.03.14* docker-ce-cli-19.03.14*
sudo yum versionlock add docker-ce docker-ce-cli
sudo systemctl daemon-reload
sudo systemctl enable --now docker
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -101,7 +101,7 @@ sudo sed -i 's/\$releasever/7/g' /etc/yum.repos.d/docker-ce.repo



sudo yum install -y docker-ce-18.09.9* docker-ce-cli-18.09.9*
sudo yum install -y docker-ce-19.03.14* docker-ce-cli-19.03.14*
sudo yum versionlock add docker-ce docker-ce-cli
sudo systemctl daemon-reload
sudo systemctl enable --now docker
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ sudo sed -i 's/\$releasever/7/g' /etc/yum.repos.d/docker-ce.repo



sudo yum install -y docker-ce-18.09.9* docker-ce-cli-18.09.9*
sudo yum install -y docker-ce-19.03.14* docker-ce-cli-19.03.14*
sudo yum versionlock add docker-ce docker-ce-cli
sudo systemctl daemon-reload
sudo systemctl enable --now docker
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmCentOS-simple.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ sudo sed -i 's/\$releasever/7/g' /etc/yum.repos.d/docker-ce.repo



sudo yum install -y docker-ce-18.09.9* docker-ce-cli-18.09.9*
sudo yum install -y docker-ce-19.03.14* docker-ce-cli-19.03.14*
sudo yum versionlock add docker-ce docker-ce-cli
sudo systemctl daemon-reload
sudo systemctl enable --now docker
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -100,7 +100,7 @@ sudo sed -i 's/\$releasever/7/g' /etc/yum.repos.d/docker-ce.repo



sudo yum install -y docker-ce-19.03.14* docker-ce-cli-19.03.14*
sudo yum install -y docker-ce-18.09.9* docker-ce-cli-18.09.9*
sudo yum versionlock add docker-ce docker-ce-cli
sudo systemctl daemon-reload
sudo systemctl enable --now docker
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ sudo yum versionlock delete docker-ce docker-ce-cli || true



sudo yum install -y docker-ce-18.09.9* docker-ce-cli-18.09.9*
sudo yum install -y docker-ce-19.03.14* docker-ce-cli-19.03.14*
sudo yum versionlock add docker-ce docker-ce-cli
sudo systemctl daemon-reload
sudo systemctl enable --now docker
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ sudo yum versionlock delete docker-ce docker-ce-cli || true



sudo yum install -y docker-ce-18.09.9* docker-ce-cli-18.09.9*
sudo yum install -y docker-ce-19.03.14* docker-ce-cli-19.03.14*
sudo yum versionlock add docker-ce docker-ce-cli
sudo systemctl daemon-reload
sudo systemctl enable --now docker
Expand Down