Skip to content

Commit c8c399c

Browse files
Yakul GargYakul Garg
authored andcommitted
Allow-downgrades for dockerce and containerd
If dockerce or/and containerd is/are already present on the machine, then the setup script will not install them if the version installed is already higher than what we require, so I have added a allow-downgrades flag to the installation script Signed-off-by: Yakul Garg <[email protected]>
1 parent fa0c9e3 commit c8c399c

16 files changed

+16
-16
lines changed

pkg/containerruntime/containerd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ Restart=always
144144
EnvironmentFile=-/etc/environment
145145
EOF
146146
147-
apt-get install -y containerd.io={{ .ContainerdVersion }}*
147+
apt-get install -y --allow-downgrades containerd.io={{ .ContainerdVersion }}*
148148
apt-mark hold containerd.io
149149
150150
systemctl daemon-reload

pkg/containerruntime/docker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Restart=always
151151
EnvironmentFile=-/etc/environment
152152
EOF
153153
154-
apt-get install -y \
154+
apt-get install --allow-downgrades -y \
155155
{{- if .ContainerdVersion }}
156156
containerd.io={{ .ContainerdVersion }}* \
157157
docker-ce-cli=5:{{ .DockerVersion }}* \

pkg/userdata/ubuntu/testdata/containerd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ write_files:
105105
EnvironmentFile=-/etc/environment
106106
EOF
107107
108-
apt-get install -y containerd.io=1.4*
108+
apt-get install -y --allow-downgrades containerd.io=1.4*
109109
apt-mark hold containerd.io
110110
111111
systemctl daemon-reload

pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ write_files:
102102
EnvironmentFile=-/etc/environment
103103
EOF
104104
105-
apt-get install -y \
105+
apt-get install --allow-downgrades -y \
106106
containerd.io=1.4* \
107107
docker-ce-cli=5:19.03* \
108108
docker-ce=5:19.03*

pkg/userdata/ubuntu/testdata/kubelet-version-without-v-prefix.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ write_files:
100100
EnvironmentFile=-/etc/environment
101101
EOF
102102
103-
apt-get install -y \
103+
apt-get install --allow-downgrades -y \
104104
containerd.io=1.4* \
105105
docker-ce-cli=5:19.03* \
106106
docker-ce=5:19.03*

pkg/userdata/ubuntu/testdata/multiple-dns-servers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ write_files:
100100
EnvironmentFile=-/etc/environment
101101
EOF
102102
103-
apt-get install -y \
103+
apt-get install --allow-downgrades -y \
104104
containerd.io=1.4* \
105105
docker-ce-cli=5:19.03* \
106106
docker-ce=5:19.03*

pkg/userdata/ubuntu/testdata/multiple-ssh-keys.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ write_files:
102102
EnvironmentFile=-/etc/environment
103103
EOF
104104
105-
apt-get install -y \
105+
apt-get install --allow-downgrades -y \
106106
containerd.io=1.4* \
107107
docker-ce-cli=5:19.03* \
108108
docker-ce=5:19.03*

pkg/userdata/ubuntu/testdata/openstack-overwrite-cloud-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ write_files:
100100
EnvironmentFile=-/etc/environment
101101
EOF
102102
103-
apt-get install -y \
103+
apt-get install --allow-downgrades -y \
104104
containerd.io=1.4* \
105105
docker-ce-cli=5:19.03* \
106106
docker-ce=5:19.03*

pkg/userdata/ubuntu/testdata/openstack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ write_files:
100100
EnvironmentFile=-/etc/environment
101101
EOF
102102
103-
apt-get install -y \
103+
apt-get install --allow-downgrades -y \
104104
containerd.io=1.4* \
105105
docker-ce-cli=5:19.03* \
106106
docker-ce=5:19.03*

pkg/userdata/ubuntu/testdata/version-1.17.16.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ write_files:
100100
EnvironmentFile=-/etc/environment
101101
EOF
102102
103-
apt-get install -y \
103+
apt-get install --allow-downgrades -y \
104104
containerd.io=1.4* \
105105
docker-ce-cli=5:19.03* \
106106
docker-ce=5:19.03*

0 commit comments

Comments
 (0)