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

Allow-downgrades for dockerce and containerd #1073

Merged
merged 1 commit into from
Oct 15, 2021
Merged

Allow-downgrades for dockerce and containerd #1073

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/containerruntime/containerd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Restart=always
EnvironmentFile=-/etc/environment
EOF

apt-get install -y containerd.io={{ .ContainerdVersion }}*
apt-get install -y --allow-downgrades containerd.io={{ .ContainerdVersion }}*
apt-mark hold containerd.io

systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/containerruntime/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ Restart=always
EnvironmentFile=-/etc/environment
EOF

apt-get install -y \
apt-get install --allow-downgrades -y \
{{- if .ContainerdVersion }}
containerd.io={{ .ContainerdVersion }}* \
docker-ce-cli=5:{{ .DockerVersion }}* \
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/ubuntu/testdata/containerd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ write_files:
EnvironmentFile=-/etc/environment
EOF

apt-get install -y containerd.io=1.4*
apt-get install -y --allow-downgrades containerd.io=1.4*
apt-mark hold containerd.io

systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ write_files:
EnvironmentFile=-/etc/environment
EOF

apt-get install -y \
apt-get install --allow-downgrades -y \
containerd.io=1.4* \
docker-ce-cli=5:19.03* \
docker-ce=5:19.03*
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/ubuntu/testdata/kubelet-version-without-v-prefix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ write_files:
EnvironmentFile=-/etc/environment
EOF

apt-get install -y \
apt-get install --allow-downgrades -y \
containerd.io=1.4* \
docker-ce-cli=5:19.03* \
docker-ce=5:19.03*
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/ubuntu/testdata/multiple-dns-servers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ write_files:
EnvironmentFile=-/etc/environment
EOF

apt-get install -y \
apt-get install --allow-downgrades -y \
containerd.io=1.4* \
docker-ce-cli=5:19.03* \
docker-ce=5:19.03*
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/ubuntu/testdata/multiple-ssh-keys.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ write_files:
EnvironmentFile=-/etc/environment
EOF

apt-get install -y \
apt-get install --allow-downgrades -y \
containerd.io=1.4* \
docker-ce-cli=5:19.03* \
docker-ce=5:19.03*
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/ubuntu/testdata/openstack-overwrite-cloud-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ write_files:
EnvironmentFile=-/etc/environment
EOF

apt-get install -y \
apt-get install --allow-downgrades -y \
containerd.io=1.4* \
docker-ce-cli=5:19.03* \
docker-ce=5:19.03*
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/ubuntu/testdata/openstack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ write_files:
EnvironmentFile=-/etc/environment
EOF

apt-get install -y \
apt-get install --allow-downgrades -y \
containerd.io=1.4* \
docker-ce-cli=5:19.03* \
docker-ce=5:19.03*
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/ubuntu/testdata/version-1.17.16.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ write_files:
EnvironmentFile=-/etc/environment
EOF

apt-get install -y \
apt-get install --allow-downgrades -y \
containerd.io=1.4* \
docker-ce-cli=5:19.03* \
docker-ce=5:19.03*
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/ubuntu/testdata/version-1.18.14.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ write_files:
EnvironmentFile=-/etc/environment
EOF

apt-get install -y \
apt-get install --allow-downgrades -y \
containerd.io=1.4* \
docker-ce-cli=5:19.03* \
docker-ce=5:19.03*
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/ubuntu/testdata/version-1.19.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ write_files:
EnvironmentFile=-/etc/environment
EOF

apt-get install -y \
apt-get install --allow-downgrades -y \
containerd.io=1.4* \
docker-ce-cli=5:19.03* \
docker-ce=5:19.03*
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/ubuntu/testdata/version-1.20.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ write_files:
EnvironmentFile=-/etc/environment
EOF

apt-get install -y \
apt-get install --allow-downgrades -y \
containerd.io=1.4* \
docker-ce-cli=5:19.03* \
docker-ce=5:19.03*
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/ubuntu/testdata/vsphere-mirrors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ write_files:
EnvironmentFile=-/etc/environment
EOF

apt-get install -y \
apt-get install --allow-downgrades -y \
containerd.io=1.4* \
docker-ce-cli=5:19.03* \
docker-ce=5:19.03*
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/ubuntu/testdata/vsphere-proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ write_files:
EnvironmentFile=-/etc/environment
EOF

apt-get install -y \
apt-get install --allow-downgrades -y \
containerd.io=1.4* \
docker-ce-cli=5:19.03* \
docker-ce=5:19.03*
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/ubuntu/testdata/vsphere.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ write_files:
EnvironmentFile=-/etc/environment
EOF

apt-get install -y \
apt-get install --allow-downgrades -y \
containerd.io=1.4* \
docker-ce-cli=5:19.03* \
docker-ce=5:19.03*
Expand Down